Updates dependencies.

dropbox · Oct 16, 2024 · 42de49c · 42de49c
1 parent 1c2dc37
commit 42de49c
Show file tree

Hide file tree

Showing 7 changed files with 56 additions and 93 deletions.
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -11,26 +11,20 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
 
       - name: Gradle Wrapper Validation
-        uses: gradle/actions/wrapper-validation@v3
+        uses: gradle/actions/wrapper-validation@v4
 
-      - uses: actions/cache@v4
-        with:
-          path: |
-            ~/.gradle/caches
-            ~/.gradle/wrapper
-          key: ${{ runner.os }}-gradle-${{ hashFiles('**/**.gradle.kts', '**/gradle/wrapper/gradle-wrapper.properties', '**/libs.versions.toml') }}
-          restore-keys: |
-            ${{ runner.os }}-gradle
-
-      - name: Install JDK 11
-        uses: actions/setup-java@v3
+      - name: Install JDK 17
+        uses: actions/setup-java@v4
         with:
           distribution: 'zulu'
           java-version: 17
 
+      - name: Setup Gradle
+        uses: gradle/actions/setup-gradle@v4
+
       - name: Build
         run: ./gradlew assemble --stacktrace
 
@@ -39,26 +33,20 @@ jobs:
     needs: [build]
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
 
       - name: Gradle Wrapper Validation
-        uses: gradle/actions/wrapper-validation@v3
+        uses: gradle/actions/wrapper-validation@v4
 
-      - uses: actions/cache@v4
-        with:
-          path: |
-            ~/.gradle/caches
-            ~/.gradle/wrapper
-          key: ${{ runner.os }}-gradle-${{ hashFiles('**/**.gradle.kts', '**/gradle/wrapper/gradle-wrapper.properties', '**/libs.versions.toml') }}
-          restore-keys: |
-            ${{ runner.os }}-gradle
-
-      - name: Install JDK 11
-        uses: actions/setup-java@v3
+      - name: Install JDK 17
+        uses: actions/setup-java@v4
         with:
           distribution: 'zulu'
           java-version: 17
 
+      - name: Setup Gradle
+        uses: gradle/actions/setup-gradle@v4
+
       - name: Run Tests
         run: ./gradlew check --no-daemon --stacktrace
 
@@ -68,7 +56,7 @@ jobs:
 
       - name: (Fail-only) Upload the build report
         if: failure()
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4
         with:
           name: unit-test-report
           path: unit-test-build-reports.zip
@@ -107,26 +95,20 @@ jobs:
           sudo udevadm trigger --name-match=kvm
 
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
 
       - name: Gradle Wrapper Validation
-        uses: gradle/actions/wrapper-validation@v3
-
-      - uses: actions/cache@v4
-        with:
-          path: |
-            ~/.gradle/caches
-            ~/.gradle/wrapper
-          key: ${{ runner.os }}-gradle-${{ hashFiles('**/**.gradle.kts', '**/gradle/wrapper/gradle-wrapper.properties', '**/libs.versions.toml') }}
-          restore-keys: |
-            ${{ runner.os }}-gradle
+        uses: gradle/actions/wrapper-validation@v4
 
-      - name: Install JDK 11
+      - name: Install JDK 17
         uses: actions/setup-java@v4
         with:
           distribution: 'zulu'
           java-version: 17
 
+      - name: Setup Gradle
+        uses: gradle/actions/setup-gradle@v4
+
       # Retrieve the cached emulator snapshot.
       - name: AVD cache
         uses: actions/cache@v4
@@ -209,7 +191,7 @@ jobs:
 
       - name: Upload the build report
         if: always()
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4
         with:
           name: instrumentation-test-report
           path: instrumentation-test-build-reports.zip
@@ -220,37 +202,24 @@ jobs:
     needs: [unitTests]
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
 
-      - uses: actions/cache@v4
-        with:
-          path: |
-            ~/.gradle/caches
-            ~/.gradle/wrapper
-          key: ${{ runner.os }}-gradle-${{ hashFiles('**/**.gradle.kts', '**/gradle/wrapper/gradle-wrapper.properties', '**/libs.versions.toml') }}
-          restore-keys: |
-            ${{ runner.os }}-gradle
-
-      - name: Install JDK 11
-        uses: actions/setup-java@v3
+      - name: Gradle Wrapper Validation
+        uses: gradle/actions/wrapper-validation@v4
+
+      - name: Install JDK 17
+        uses: actions/setup-java@v4
         with:
           distribution: 'zulu'
           java-version: 17
 
+      - name: Setup Gradle
+        uses: gradle/actions/setup-gradle@v4
+
       - name: Upload Snapshot
-        run: ./gradlew clean publish -Pdropshots.releaseMode=true --no-daemon --no-parallel --no-configuration-cache --stacktrace
+        run: ./gradlew publish -Pdropshots.releaseMode=true --no-daemon --no-parallel --no-configuration-cache --stacktrace
         env:
           ORG_GRADLE_PROJECT_mavenCentralUsername: ${{ secrets.SONATYPE_USERNAME }}
           ORG_GRADLE_PROJECT_mavenCentralPassword: ${{ secrets.SONATYPE_PASSWORD }}
           ORG_GRADLE_PROJECT_signingInMemoryKey: ${{ secrets.SIGNING_KEY }}
           ORG_GRADLE_PROJECT_signingInMemoryKeyPassword: ${{ secrets.SIGNING_PASSWORD }}
-
-      - name: Retrieve Version
-        run: echo "VERSION_NAME=$(./gradlew -q :printVersionName)" >> $GITHUB_ENV
-
-      - name: Publish release (main only)
-        run: ./gradlew closeAndReleaseRepository --no-daemon --no-parallel
-        if: success() && !endsWith(env.VERSION_NAME, '-SNAPSHOT')
-        env:
-          ORG_GRADLE_PROJECT_mavenCentralUsername: ${{ secrets.SONATYPE_USERNAME }}
-          ORG_GRADLE_PROJECT_mavenCentralPassword: ${{ secrets.SONATYPE_PASSWORD }}
diff --git a/dropshots-gradle-plugin/build.gradle.kts b/dropshots-gradle-plugin/build.gradle.kts
@@ -70,12 +70,6 @@ tasks.withType<KotlinCompile>().configureEach {
   }
 }
 
-java {
-  toolchain {
-    languageVersion.set(JavaLanguageVersion.of(11))
-  }
-}
-
 tasks.withType<JavaCompile>().configureEach {
   options.release.set(11)
 }

diff --git a/dropshots-gradle-plugin/src/test/projects/configuration-cache-compatible/module/build.gradle b/dropshots-gradle-plugin/src/test/projects/configuration-cache-compatible/module/build.gradle
@@ -5,12 +5,12 @@ plugins {
 }
 
 android {
-  namespace = "com.dropbox.dropshots.test.configuration-cache-compatible"
-  compileSdk = 32
+  namespace = "com.dropbox.dropshots.test.configuration_cache_compatible"
+  compileSdk = 34
 
   defaultConfig {
     minSdk = 24
-    targetSdk = 32
+    targetSdk = 34
   }
   compileOptions {
     sourceCompatibility = JavaVersion.VERSION_1_8

diff --git a/...shots-gradle-plugin/src/test/projects/dropshots-before-android-plugin/module/build.gradle b/...shots-gradle-plugin/src/test/projects/dropshots-before-android-plugin/module/build.gradle
@@ -5,12 +5,12 @@ plugins {
 }
 
 android {
-  namespace = "com.dropbox.dropshots.test.configuration-cache-compatible"
-  compileSdk = 32
+  namespace = "com.dropbox.dropshots.test.configuration_cache_compatible"
+  compileSdk = 34
 
   defaultConfig {
     minSdk = 24
-    targetSdk = 32
+    targetSdk = 34
   }
   compileOptions {
     sourceCompatibility = JavaVersion.VERSION_1_8

diff --git a/dropshots-gradle-plugin/src/test/projects/prints-res-values/module/build.gradle b/dropshots-gradle-plugin/src/test/projects/prints-res-values/module/build.gradle
@@ -5,12 +5,12 @@ plugins {
 }
 
 android {
-  namespace = "com.dropbox.dropshots.test.application-project"
-  compileSdk = 32
+  namespace = "com.dropbox.dropshots.test.application_project"
+  compileSdk = 34
 
   defaultConfig {
     minSdk = 24
-    targetSdk = 32
+    targetSdk = 34
   }
   compileOptions {
     sourceCompatibility = JavaVersion.VERSION_1_8

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,22 +1,22 @@
 [versions]
-kotlin = "1.9.23"
-agp = "8.4.1"
+kotlin = "1.9.20"
+agp = "8.7.1"
 androidx-core = "1.13.1"
 
 [libraries]
 android = { module = "com.android.tools.build:gradle", version.ref = "agp" }
-androidx-activity = { module = "androidx.activity:activity-ktx", version = "1.9.0" }
-androidx-annotation = { module = "androidx.annotation:annotation", version = "1.8.0" }
-androidx-appcompat = { module = "androidx.appcompat:appcompat", version = "1.6.1" }
+androidx-activity = { module = "androidx.activity:activity-ktx", version = "1.9.2" }
+androidx-annotation = { module = "androidx.annotation:annotation", version = "1.8.2" }
+androidx-appcompat = { module = "androidx.appcompat:appcompat", version = "1.7.0" }
 androidx-constraintlayout = { module = "androidx.constraintlayout:constraintlayout", version = "2.1.4" }
 androidx-core = { module = "androidx.core:core-ktx", version.ref = "androidx-core" }
-androidx-fragment = { module = "androidx.fragment:fragment-ktx", version = "1.7.1" }
-androidx-test-core = { module = "androidx.test:core-ktx", version = "1.5.0" }
-androidx-test-ext-junit = { module = "androidx.test.ext:junit-ktx", version = "1.1.5" }
-androidx-test-rules = { module = "androidx.test:rules", version = "1.5.0" }
-androidx-test-runner = { module = "androidx.test:runner", version = "1.5.2" }
-androidx-test-uiautomator = { group = "androidx.test.uiautomator", name = "uiautomator", version = "2.3.0" }
-differ = "com.dropbox.differ:differ:0.0.1-alpha1"
+androidx-fragment = { module = "androidx.fragment:fragment-ktx", version = "1.8.4" }
+androidx-test-core = { module = "androidx.test:core-ktx", version = "1.6.1" }
+androidx-test-ext-junit = { module = "androidx.test.ext:junit-ktx", version = "1.2.1" }
+androidx-test-rules = { module = "androidx.test:rules", version = "1.6.1" }
+androidx-test-runner = { module = "androidx.test:runner", version = "1.6.2" }
+androidx-test-uiautomator = { module = "androidx.test.uiautomator:uiautomator", version = "2.3.0" }
+differ = "com.dropbox.differ:differ:0.0.2"
 junit = "junit:junit:4.13.2"
 truth = "com.google.truth:truth:1.4.2"
 kotlin-bom = { module = "org.jetbrains.kotlin:kotlin-bom", version.ref = "kotlin" }
@@ -26,10 +26,10 @@ kotlin-test = { module = "org.jetbrains.kotlin:kotlin-test", version.ref = "kotl
 [plugins]
 android-library = { id = "com.android.library", version.ref = "agp" }
 android-application = { id = "com.android.application", version.ref = "agp" }
-dokka = { id = "org.jetbrains.dokka", version = "1.7.20" }
+dokka = { id = "org.jetbrains.dokka", version = "1.9.20" }
 kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
 kotlin-jvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" }
 ktlint = { id = "org.jlleitschuh.gradle.ktlint", version = "11.4.2" }
-mavenPublish = { id = "com.vanniktech.maven.publish.base", version = "0.25.2" }
+mavenPublish = { id = "com.vanniktech.maven.publish.base", version = "0.29.0" }
 binaryCompatibilityValidator = { id = "org.jetbrains.kotlinx.binary-compatibility-validator", version = "0.13.0" }
 
diff --git 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.6-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.1-bin.zip
 networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists