Merge branch 'main' into kotlinUuid

hfhbd · Aug 17, 2024 · 4ddc381 · 4ddc381
2 parents e103b2c + 8fb3b3d
commit 4ddc381
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 12 deletions.
diff --git a/.github/workflows/AndroidIntegrationTest.yml b/.github/workflows/AndroidIntegrationTest.yml
@@ -24,8 +24,6 @@ jobs:
         with:
           distribution: 'temurin'
           java-version: 21
-      - uses: gradle/actions/setup-gradle@v3
-        with:
-          gradle-home-cache-cleanup: true
+      - uses: gradle/actions/setup-gradle@v4
       - name: Run Android integration tests
         run: ./gradlew :kotlinx-uuid-core:allDevicesCheck -Pandroid.testoptions.manageddevices.emulator.gpu=swiftshader_indirect
diff --git a/.github/workflows/CD.yml b/.github/workflows/CD.yml
@@ -26,7 +26,7 @@ jobs:
         with:
           distribution: 'temurin'
           java-version: 21
-      - uses: gradle/actions/setup-gradle@v3
+      - uses: gradle/actions/setup-gradle@v4
       - name: Publish
         run: ./gradlew -Pversion=$version -Dorg.gradle.parallel=false --no-configuration-cache publish :closeAndReleaseStagingRepositories
         env:

diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
@@ -22,10 +22,7 @@ jobs:
         with:
           distribution: 'temurin'
           java-version: 21
-      - uses: gradle/actions/setup-gradle@v3
-        with:
-          validate-wrappers: true
-          gradle-home-cache-cleanup: true
+      - uses: gradle/actions/setup-gradle@v4
       - name: Build with Gradle
         run: ./gradlew build
       - name: Upload SARIF to Github using the upload-sarif action

diff --git a/.github/workflows/Docs.yml b/.github/workflows/Docs.yml
@@ -27,7 +27,7 @@ jobs:
         with:
           distribution: 'temurin'
           java-version: 21
-      - uses: gradle/actions/setup-gradle@v3
+      - uses: gradle/actions/setup-gradle@v4
       - name: Generate Docs
         run: ./gradlew :dokkaHtmlMultiModule
       - name: Upload Docs

diff --git a/.github/workflows/dependencies.yml b/.github/workflows/dependencies.yml
@@ -21,7 +21,7 @@ jobs:
           distribution: 'temurin'
           java-version: 21
       - name: Generate and submit dependency graph
-        uses: gradle/actions/dependency-submission@v3
+        uses: gradle/actions/dependency-submission@v4
 
   dependency-review:
     runs-on: ubuntu-latest

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -18,8 +18,8 @@ androidx-test-runner = { module = "androidx.test:runner", version = "1.6.1" }
 kotlin-jvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" }
 kotlin-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin" }
 kotlin-parcelize = { id = "org.jetbrains.kotlin.plugin.parcelize", version.ref = "kotlin" }
-android = { id = "com.android.application", version = "8.5.0" }
-binary = { id = "org.jetbrains.kotlinx.binary-compatibility-validator", version = "0.14.0" }
+android = { id = "com.android.application", version = "8.5.1" }
+binary = { id = "org.jetbrains.kotlinx.binary-compatibility-validator", version = "0.16.3" }
 publish = { id = "io.github.gradle-nexus.publish-plugin", version = "2.0.0" }
 dokka = { id = "org.jetbrains.dokka", version = "1.9.20" }
 licensee = { id = "app.cash.licensee", version = "1.11.0" }