diff --git a/.github/workflows/linter.yml b/.github/workflows/linter.yml index c2eccbf..aa0a58c 100644 --- a/.github/workflows/linter.yml +++ b/.github/workflows/linter.yml @@ -16,7 +16,7 @@ jobs: fetch-depth: 0 - name: ktlint - uses: github/super-linter/slim@v5 + uses: github/super-linter/slim@v6 env: VALIDATE_ALL_CODEBASE: false VALIDATE_KOTLIN: true diff --git a/build.gradle.kts b/build.gradle.kts index 6bcf000..839e627 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,10 +1,10 @@ buildscript { - val compose_version by extra("1.6.4") - val wear_compose_version by extra("1.3.0") + val compose_version by extra("1.6.8") + val wear_compose_version by extra("1.3.1") } // Top-level build file where you can add configuration options common to all sub-projects/modules. plugins { - id("com.android.application") version "8.3.1" apply false - id("com.android.library") version "8.3.1" apply false - id("org.jetbrains.kotlin.android") version "1.9.23" apply false + id("com.android.application") version "8.5.1" apply false + id("com.android.library") version "8.5.1" apply false + id("org.jetbrains.kotlin.android") version "2.0.0" apply false } diff --git a/composesensors/build.gradle.kts b/composesensors/build.gradle.kts index 80b5ea8..ab244f7 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.28.0" + id("com.vanniktech.maven.publish") version "0.29.0" } android { @@ -35,18 +35,18 @@ android { compose = true } composeOptions { - kotlinCompilerExtensionVersion = "1.5.11" + kotlinCompilerExtensionVersion = "1.5.14" } } dependencies { - val coreKtxVersion = "1.12.0" - val appCompatVersion = "1.6.1" - val materialVersion = "1.11.0" + val coreKtxVersion = "1.13.1" + val appCompatVersion = "1.7.0" + val materialVersion = "1.12.0" val jUnitVersion = "4.13.2" - val androidJUnitVersion = "1.1.5" - val espressoVersion = "3.5.1" - val composeVersion = "1.6.4" + val androidJUnitVersion = "1.2.1" + val espressoVersion = "3.6.1" + val composeVersion = "1.6.8" 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 e644113..2c35211 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 b82aa23..09523c0 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.7-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/gradlew b/gradlew index 1aa94a4..f5feea6 100755 --- a/gradlew +++ b/gradlew @@ -15,6 +15,8 @@ # See the License for the specific language governing permissions and # limitations under the License. # +# SPDX-License-Identifier: Apache-2.0 +# ############################################################################## # @@ -55,7 +57,7 @@ # Darwin, MinGW, and NonStop. # # (3) This script is generated from the Groovy template -# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# https://github.com/gradle/gradle/blob/HEAD/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/. @@ -84,7 +86,8 @@ done # shellcheck disable=SC2034 APP_BASE_NAME=${0##*/} # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) -APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit +APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s +' "$PWD" ) || exit # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD=maximum diff --git a/gradlew.bat b/gradlew.bat index 7101f8e..9b42019 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -13,6 +13,8 @@ @rem See the License for the specific language governing permissions and @rem limitations under the License. @rem +@rem SPDX-License-Identifier: Apache-2.0 +@rem @if "%DEBUG%"=="" @echo off @rem ########################################################################## diff --git a/sample/build.gradle.kts b/sample/build.gradle.kts index 1d471d4..3c72ac0 100644 --- a/sample/build.gradle.kts +++ b/sample/build.gradle.kts @@ -60,7 +60,7 @@ android { compose = true } composeOptions { - kotlinCompilerExtensionVersion = "1.5.11" + kotlinCompilerExtensionVersion = "1.5.14" } packaging { resources { @@ -70,14 +70,14 @@ android { } dependencies { - val composeVersion = "1.6.4" + val composeVersion = "1.6.8" val material3Version = "1.2.1" - val lifecycleRuntimeKtxVersion = "2.7.0" - val coreKtxVersion = "1.12.0" - val activityComposeVersion = "1.8.2" + val lifecycleRuntimeKtxVersion = "2.8.3" + val coreKtxVersion = "1.13.1" + val activityComposeVersion = "1.9.0" val jUnitVersion = "4.13.2" - val androidJUnitVersion = "1.1.5" - val espressoVersion = "3.5.1" + val androidJUnitVersion = "1.2.1" + val espressoVersion = "3.6.1" val splashScreenVersion = "1.0.1" implementation(project(mapOf("path" to ":composesensors"))) diff --git a/wearablesample/build.gradle.kts b/wearablesample/build.gradle.kts index 0cca2e9..95d6bab 100644 --- a/wearablesample/build.gradle.kts +++ b/wearablesample/build.gradle.kts @@ -58,7 +58,7 @@ android { compose = true } composeOptions { - kotlinCompilerExtensionVersion = "1.5.11" + kotlinCompilerExtensionVersion = "1.5.14" } packaging { resources { @@ -70,16 +70,16 @@ android { dependencies { implementation(project(mapOf("path" to ":composesensors"))) - implementation("androidx.core:core-ktx:1.12.0") - implementation("com.google.android.gms:play-services-wearable:18.1.0") + implementation("androidx.core:core-ktx:1.13.1") + implementation("com.google.android.gms:play-services-wearable:18.2.0") implementation("androidx.percentlayout:percentlayout:1.0.0") implementation("androidx.legacy:legacy-support-v4:1.0.0") implementation("androidx.compose.ui:ui:${rootProject.extra["compose_version"]}") 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.7.0") - implementation("androidx.activity:activity-compose:1.8.2") + implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.8.3") + implementation("androidx.activity:activity-compose:1.9.0") androidTestImplementation("androidx.compose.ui:ui-test-junit4:${rootProject.extra["compose_version"]}") debugImplementation("androidx.compose.ui:ui-tooling:${rootProject.extra["compose_version"]}") debugImplementation("androidx.compose.ui:ui-test-manifest:${rootProject.extra["compose_version"]}")