diff --git a/.idea/deploymentTargetSelector.xml b/.idea/deploymentTargetSelector.xml index 59ad84b..79a09e9 100644 --- a/.idea/deploymentTargetSelector.xml +++ b/.idea/deploymentTargetSelector.xml @@ -4,6 +4,7 @@ diff --git a/androidApp/build.gradle.kts b/androidApp/build.gradle.kts index 7559cf9..98e9dc7 100644 --- a/androidApp/build.gradle.kts +++ b/androidApp/build.gradle.kts @@ -5,15 +5,13 @@ plugins { android { namespace = "com.kyant.backdrop.catalog" - compileSdk { - version = release(36) - } - buildToolsVersion = "36.1.0" + compileSdk = 37 + buildToolsVersion = "37.0.0" defaultConfig { applicationId = "com.kyant.backdrop.catalog" minSdk = 23 - targetSdk = 36 + targetSdk = 37 versionCode = 1 versionName = "1.0.0" androidResources.localeFilters += arrayOf("en") diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 1f02c39..dd63eca 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -9,9 +9,10 @@ plugins { } kotlin { - androidLibrary { + android { minSdk = 21 - compileSdk = 36 + compileSdk = 37 + buildToolsVersion = "37.0.0" namespace = "com.kyant.backdrop.catalog.common" androidResources.enable = true compilerOptions { diff --git a/backdrop/build.gradle.kts b/backdrop/build.gradle.kts index c37e249..4fd2e43 100644 --- a/backdrop/build.gradle.kts +++ b/backdrop/build.gradle.kts @@ -9,9 +9,10 @@ plugins { } kotlin { - androidLibrary { + android { minSdk = 21 - compileSdk = 36 + compileSdk = 37 + buildToolsVersion = "37.0.0" namespace = "com.kyant.backdrop" compilerOptions { jvmTarget = JvmTarget.JVM_11 @@ -84,7 +85,7 @@ mavenPublishing { publishToMavenCentral() signAllPublications() - coordinates("io.github.kyant0", "backdrop", "2.0.0-alpha04") + coordinates("io.github.kyant0", "backdrop", "2.0.0-rc01") pom { name.set("Backdrop") diff --git a/backdrop/src/skikoMain/kotlin/com/kyant/backdrop/RuntimeShader.kt b/backdrop/src/skikoMain/kotlin/com/kyant/backdrop/RuntimeShader.kt index 05e118d..ec33d6b 100644 --- a/backdrop/src/skikoMain/kotlin/com/kyant/backdrop/RuntimeShader.kt +++ b/backdrop/src/skikoMain/kotlin/com/kyant/backdrop/RuntimeShader.kt @@ -2,6 +2,7 @@ package com.kyant.backdrop import androidx.compose.ui.graphics.Color import androidx.compose.ui.graphics.Shader +import androidx.compose.ui.graphics.asComposeShader import androidx.compose.ui.graphics.colorspace.ColorSpaces import org.intellij.lang.annotations.Language import org.jetbrains.skia.RuntimeEffect @@ -13,7 +14,7 @@ actual fun RuntimeShader(@Language("AGSL") shaderString: String): RuntimeShader } actual fun RuntimeShader.asComposeShader(): Shader { - return this.asSkikoRuntimeShader().makeShader() + return this.asSkikoRuntimeShader().makeShader().asComposeShader() } fun RuntimeShader.asSkikoRuntimeShader(): RuntimeShaderBuilder { diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index aca0c35..e20e2c2 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,10 +1,10 @@ [versions] -agp = "9.0.0" -kotlin = "2.3.10" +agp = "9.2.1" +kotlin = "2.3.21" -activity = "1.12.4" -core = "1.17.0" -compose = "1.10.1" +activity = "1.13.0" +core = "1.18.0" +compose = "1.11.0" kyantShapes = "1.2.0" [libraries] diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index f8e1ee3..b1b8ef5 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 19a6bde..b52fb7e 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,7 +1,9 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-9.3.0-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.5.0-bin.zip networkTimeout=10000 +retries=0 +retryBackOffMs=500 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew index adff685..b9bb139 100644 --- a/gradlew +++ b/gradlew @@ -57,7 +57,7 @@ # Darwin, MinGW, and NonStop. # # (3) This script is generated from the Groovy template -# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# https://github.com/gradle/gradle/blob/3d91ce3b8caaf77ad09f381f43615b715b53f72c/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt # within the Gradle project. # # You can find Gradle at https://github.com/gradle/gradle/. diff --git a/gradlew.bat b/gradlew.bat index c4bdd3a..24c62d5 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -23,8 +23,8 @@ @rem @rem ########################################################################## -@rem Set local scope for the variables with windows NT shell -if "%OS%"=="Windows_NT" setlocal +@rem Set local scope for the variables, and ensure extensions are enabled +setlocal EnableExtensions set DIRNAME=%~dp0 if "%DIRNAME%"=="" set DIRNAME=. @@ -51,7 +51,7 @@ echo. 1>&2 echo Please set the JAVA_HOME variable in your environment to match the 1>&2 echo location of your Java installation. 1>&2 -goto fail +"%COMSPEC%" /c exit 1 :findJavaFromJavaHome set JAVA_HOME=%JAVA_HOME:"=% @@ -65,7 +65,7 @@ echo. 1>&2 echo Please set the JAVA_HOME variable in your environment to match the 1>&2 echo location of your Java installation. 1>&2 -goto fail +"%COMSPEC%" /c exit 1 :execute @rem Setup the command line @@ -73,21 +73,10 @@ goto fail @rem Execute Gradle -"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %* +@rem endlocal doesn't take effect until after the line is parsed and variables are expanded +@rem which allows us to clear the local environment before executing the java command +endlocal & "%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %* & call :exitWithErrorLevel -:end -@rem End local scope for the variables with windows NT shell -if %ERRORLEVEL% equ 0 goto mainEnd - -:fail -rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of -rem the _cmd.exe /c_ return code! -set EXIT_CODE=%ERRORLEVEL% -if %EXIT_CODE% equ 0 set EXIT_CODE=1 -if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% -exit /b %EXIT_CODE% - -:mainEnd -if "%OS%"=="Windows_NT" endlocal - -:omega +:exitWithErrorLevel +@rem Use "%COMSPEC%" /c exit to allow operators to work properly in scripts +"%COMSPEC%" /c exit %ERRORLEVEL%