diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index f4c9218..c951d64 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -25,7 +25,7 @@ jobs: run: chmod +x gradlew - name: Build with Gradle - uses: gradle/gradle-build-action@v2 + uses: gradle/gradle-build-action@v3 with: arguments: build diff --git a/build.gradle.kts b/build.gradle.kts index 232300f..bce90e1 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,10 +1,10 @@ buildscript { - val compose_version by extra("1.5.4") - val wear_compose_version by extra("1.2.1") + val compose_version by extra("1.6.3") + val wear_compose_version by extra("1.3.0") } // Top-level build file where you can add configuration options common to all sub-projects/modules. plugins { - id("com.android.application") version "8.2.0" apply false - id("com.android.library") version "8.2.0" apply false - id("org.jetbrains.kotlin.android") version "1.9.21" apply false + id("com.android.application") version "8.3.0" apply false + id("com.android.library") version "8.3.0" apply false + id("org.jetbrains.kotlin.android") version "1.9.23" apply false } diff --git a/composesensors/build.gradle.kts b/composesensors/build.gradle.kts index cce7826..96c8d36 100644 --- a/composesensors/build.gradle.kts +++ b/composesensors/build.gradle.kts @@ -1,7 +1,7 @@ plugins { id("com.android.library") id("org.jetbrains.kotlin.android") - id("com.vanniktech.maven.publish") version "0.26.0" + id("com.vanniktech.maven.publish") version "0.28.0" } android { @@ -35,7 +35,7 @@ android { compose = true } composeOptions { - kotlinCompilerExtensionVersion = "1.5.7" + kotlinCompilerExtensionVersion = "1.5.10" } } @@ -46,7 +46,7 @@ dependencies { val jUnitVersion = "4.13.2" val androidJUnitVersion = "1.1.5" val espressoVersion = "3.5.1" - val composeVersion = "1.5.4" + val composeVersion = "1.6.3" implementation("androidx.compose.runtime:runtime:$composeVersion") implementation("androidx.compose.ui:ui:$composeVersion") diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 7f93135..d64cd49 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 1af9e09..a80b22c 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/gradlew.bat b/gradlew.bat index 6689b85..7101f8e 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -43,11 +43,11 @@ set JAVA_EXE=java.exe %JAVA_EXE% -version >NUL 2>&1 if %ERRORLEVEL% equ 0 goto execute -echo. -echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. +echo. 1>&2 +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2 +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 @@ -57,11 +57,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe if exist "%JAVA_EXE%" goto execute -echo. -echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. +echo. 1>&2 +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2 +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 diff --git a/sample/build.gradle.kts b/sample/build.gradle.kts index 94ad054..d757231 100644 --- a/sample/build.gradle.kts +++ b/sample/build.gradle.kts @@ -60,7 +60,7 @@ android { compose = true } composeOptions { - kotlinCompilerExtensionVersion = "1.5.7" + kotlinCompilerExtensionVersion = "1.5.10" } packaging { resources { @@ -70,9 +70,9 @@ android { } dependencies { - val composeVersion = "1.5.4" - val material3Version = "1.1.2" - val lifecycleRuntimeKtxVersion = "2.6.2" + val composeVersion = "1.6.3" + val material3Version = "1.2.1" + val lifecycleRuntimeKtxVersion = "2.7.0" val coreKtxVersion = "1.12.0" val activityComposeVersion = "1.8.2" val jUnitVersion = "4.13.2" diff --git a/wearablesample/build.gradle.kts b/wearablesample/build.gradle.kts index de96694..488ca76 100644 --- a/wearablesample/build.gradle.kts +++ b/wearablesample/build.gradle.kts @@ -58,7 +58,7 @@ android { compose = true } composeOptions { - kotlinCompilerExtensionVersion = "1.5.7" + kotlinCompilerExtensionVersion = "1.5.10" } packaging { resources { @@ -78,7 +78,7 @@ dependencies { implementation("androidx.wear.compose:compose-material:${rootProject.extra["wear_compose_version"]}") implementation("androidx.wear.compose:compose-foundation:${rootProject.extra["wear_compose_version"]}") implementation("androidx.compose.ui:ui-tooling-preview:${rootProject.extra["compose_version"]}") - implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.6.2") + implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.7.0") implementation("androidx.activity:activity-compose:1.8.2") androidTestImplementation("androidx.compose.ui:ui-test-junit4:${rootProject.extra["compose_version"]}") debugImplementation("androidx.compose.ui:ui-tooling:${rootProject.extra["compose_version"]}")