diff --git a/.github/workflows/android_test.yml b/.github/workflows/android_test.yml index 39755f6aaf..9dbc2afbd9 100644 --- a/.github/workflows/android_test.yml +++ b/.github/workflows/android_test.yml @@ -34,7 +34,7 @@ jobs: run: mkdir -p ~/.gradle ; cp .github/ci-gradle.properties ~/.gradle/gradle.properties - name: set up JDK - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: distribution: 'zulu' java-version: 17 diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 35c0f3f092..f77706fea4 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -27,7 +27,7 @@ jobs: run: mkdir -p ~/.gradle ; cp .github/ci-gradle.properties ~/.gradle/gradle.properties - name: set up JDK - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: distribution: 'zulu' java-version: 17 @@ -89,7 +89,7 @@ jobs: run: mkdir -p ~/.gradle ; cp .github/ci-gradle.properties ~/.gradle/gradle.properties - name: set up JDK - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: distribution: 'zulu' java-version: 17 @@ -115,7 +115,7 @@ jobs: run: mkdir -p ~/.gradle ; cp .github/ci-gradle.properties ~/.gradle/gradle.properties - name: set up JDK - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: distribution: 'zulu' java-version: 17 diff --git a/.github/workflows/build_nightly.yml b/.github/workflows/build_nightly.yml index 5dcb15f1c8..2cf7103754 100644 --- a/.github/workflows/build_nightly.yml +++ b/.github/workflows/build_nightly.yml @@ -19,7 +19,7 @@ jobs: run: mkdir -p ~/.gradle ; cp .github/ci-gradle.properties ~/.gradle/gradle.properties - name: set up JDK - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: distribution: 'zulu' java-version: 17 diff --git a/.github/workflows/fixup.yml b/.github/workflows/fixup.yml index 1f769f505d..28bc7c9205 100644 --- a/.github/workflows/fixup.yml +++ b/.github/workflows/fixup.yml @@ -17,7 +17,7 @@ jobs: run: mkdir -p ~/.gradle ; cp .github/ci-gradle.properties ~/.gradle/gradle.properties - name: set up JDK - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: distribution: 'zulu' java-version: 17 diff --git a/.github/workflows/macrobenchmark.yml b/.github/workflows/macrobenchmark.yml index aa71bf8f78..baa99e22d5 100644 --- a/.github/workflows/macrobenchmark.yml +++ b/.github/workflows/macrobenchmark.yml @@ -19,7 +19,7 @@ jobs: run: mkdir -p ~/.gradle ; cp .github/ci-gradle.properties ~/.gradle/gradle.properties - name: set up JDK - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: distribution: 'zulu' java-version: 17 diff --git a/.github/workflows/publish-docs.yml b/.github/workflows/publish-docs.yml index 782d2b700b..ce1ba901a7 100644 --- a/.github/workflows/publish-docs.yml +++ b/.github/workflows/publish-docs.yml @@ -21,7 +21,7 @@ jobs: run: mkdir -p ~/.gradle ; cp .github/ci-gradle.properties ~/.gradle/gradle.properties - name: set up JDK - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: distribution: 'zulu' java-version: 17 diff --git a/auth/sample/shared/build.gradle.kts b/auth/sample/shared/build.gradle.kts index cd6c2d8725..b2b6ec78ff 100644 --- a/auth/sample/shared/build.gradle.kts +++ b/auth/sample/shared/build.gradle.kts @@ -81,7 +81,7 @@ protobuf { artifact = "com.google.protobuf:protoc-gen-javalite:3.0.0" } create("grpc") { - artifact = "io.grpc:protoc-gen-grpc-java:1.59.0" + artifact = "io.grpc:protoc-gen-grpc-java:1.59.1" } create("grpckt") { artifact = "io.grpc:protoc-gen-grpc-kotlin:1.3.0:jdk8@jar" diff --git a/datalayer/grpc/build.gradle.kts b/datalayer/grpc/build.gradle.kts index fc42348bc9..3d7eef36a8 100644 --- a/datalayer/grpc/build.gradle.kts +++ b/datalayer/grpc/build.gradle.kts @@ -96,7 +96,7 @@ protobuf { artifact = "com.google.protobuf:protoc-gen-javalite:3.0.0" } create("grpc") { - artifact = "io.grpc:protoc-gen-grpc-java:1.59.0" + artifact = "io.grpc:protoc-gen-grpc-java:1.59.1" } create("grpckt") { artifact = "io.grpc:protoc-gen-grpc-kotlin:1.3.0:jdk8@jar" diff --git a/datalayer/sample/shared/build.gradle.kts b/datalayer/sample/shared/build.gradle.kts index 6600cd765f..ee24662968 100644 --- a/datalayer/sample/shared/build.gradle.kts +++ b/datalayer/sample/shared/build.gradle.kts @@ -81,7 +81,7 @@ protobuf { artifact = "com.google.protobuf:protoc-gen-javalite:3.0.0" } create("grpc") { - artifact = "io.grpc:protoc-gen-grpc-java:1.59.0" + artifact = "io.grpc:protoc-gen-grpc-java:1.59.1" } create("grpckt") { artifact = "io.grpc:protoc-gen-grpc-kotlin:1.3.0:jdk8@jar" diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index d9a61cf7f3..f290115e86 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,18 +1,18 @@ [versions] accompanist = "0.32.0" androidx-benchmark = "1.2.1" -androidx-complications-data = "1.2.0-rc01" +androidx-complications-data = "1.2.0" androidx-compose-material = "1.5.4" androidx-concurrent = "1.1.0" androidx-datastore = "1.0.0" androidx-health-services = "1.0.0-rc01" androidx-hilt = "1.1.0" androidx-media3 = "1.2.0" -androidx-test-espresso = "3.6.0-alpha01" -androidx-test-ext = "1.2.0-alpha01" +androidx-test-espresso = "3.6.0-alpha02" +androidx-test-ext = "1.2.0-alpha02" androidx-tracingPerfetto = "1.0.0" androidx-tracingPerfettoBinary = "1.0.0" -androidx-wear-watchface = "1.2.0-rc01" +androidx-wear-watchface = "1.2.0" androidxActivity = "1.8.1" androidxCore = "1.12.0" androidxLifecycle = "2.6.2" @@ -20,16 +20,16 @@ androidxNavigation = "2.7.5" androidxPhoneInteractions = "1.1.0-alpha03" androidxRemoteInteractions = "1.0.0" androidxStartup = "1.1.1" -androidxTracing = "1.2.0-rc01" +androidxTracing = "1.2.0" androidxWear = "1.3.0" -androidxWork = "2.8.1" +androidxWork = "2.9.0" androidxprotolayout = "1.0.0" androidxtiles = "1.2.0" annotation = "1.0.1" app-cash-turbine = "1.0.0" com-squareup-okhttp3 = "4.12.0" com-squareup-retrofit2 = "2.9.0" -compose = "1.6.0-beta01" +compose = "1.6.0-beta02" compose-compiler = "1.5.3" composesnapshot = "-" dependencyAnalysis = "1.26.0" @@ -50,13 +50,13 @@ okio = "3.6.0" org-robolectric = "4.11.1" playServicesAuth = "20.7.0" protobuf = "3.25.1" -room = "2.6.0" -runtimeTracing = "1.0.0-alpha05" +room = "2.6.1" +runtimeTracing = "1.0.0-beta01" snapshot-android = "1.0.4" -spotless = "6.22.0" +spotless = "6.23.2" truth = "1.1.5" wearcompose = "1.3.0-beta01" -wearToolingPreview = "1.0.0-rc01" +wearToolingPreview = "1.0.0" [libraries] accompanist-testharness = { module = "com.google.accompanist:accompanist-testharness", version.ref = "accompanist" } @@ -161,7 +161,7 @@ gradleMavenPublishPlugin = { module = "com.vanniktech:gradle-maven-publish-plugi hilt-ext-compiler = { module = "androidx.hilt:hilt-compiler", version.ref = "androidx-hilt" } hilt-ext-work = { module = "androidx.hilt:hilt-work", version.ref = "androidx-hilt" } hilt-navigationcompose = { module = "androidx.hilt:hilt-navigation-compose", version.ref = "androidx-hilt" } -io-grpc-protobuf-lite = "io.grpc:grpc-protobuf-lite:1.59.0" +io-grpc-protobuf-lite = "io.grpc:grpc-protobuf-lite:1.59.1" io-grpc-grpc-kotlin = "io.grpc:grpc-kotlin-stub:1.4.1" junit = { module = "junit:junit", version.ref = "junit" } kotlin-gradlePlugin = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.ref = "kotlin" } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 8838ba97ba..e6aba2515d 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.4-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-all.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME