Fix CI by updating project based on Radiography

square · Dec 9, 2024 · c28640c · c28640c
1 parent 4a1b159
commit c28640c
Show file tree

Hide file tree

Showing 21 changed files with 148 additions and 216 deletions.
diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml
@@ -19,7 +19,7 @@ jobs:
       - uses: actions/checkout@v3
       - uses: actions/setup-java@v3
         with:
-          java-version: 8
+          java-version: 17
           distribution: 'zulu'
       - uses: gradle/gradle-build-action@v2
       - name: Build project
@@ -70,7 +70,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-java@v4
         with:
-          java-version: 11
+          java-version: 17
           distribution: 'zulu'
       - uses: gradle/gradle-build-action@v2
       - name: Instrumentation Tests
@@ -105,7 +105,7 @@ jobs:
       - uses: actions/checkout@v3
       - uses: actions/setup-java@v3
         with:
-          java-version: 8
+          java-version: 17
           distribution: 'zulu'
       - uses: gradle/gradle-build-action@v2
       - name: Deploy snapshot

diff --git a/.github/workflows/publish-release.yml b/.github/workflows/publish-release.yml
@@ -13,7 +13,7 @@ jobs:
         uses: actions/setup-java@v3
         with:
           distribution: 'zulu'
-          java-version: '8'
+          java-version: 17
       - name: Build with Gradle
         run: ./gradlew build --stacktrace
       - name: Publish to Sonatype

diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
@@ -5,7 +5,3 @@ plugins {
 repositories {
   mavenCentral()
 }
-
-kotlinDslPluginOptions {
-  experimentalWarning.set(false)
-}
diff --git a/buildSrc/src/main/java/Dependencies.kt b/buildSrc/src/main/java/Dependencies.kt
@@ -3,38 +3,38 @@ object Versions {
    * To change this in the IDE, use `systemProp.square.kotlinVersion=x.y.z` in your
    * `~/.gradle/gradle.properties` file.
    */
-  val KotlinCompiler = System.getProperty("square.kotlinVersion") ?: "1.6.0"
+  val KotlinCompiler = System.getProperty("square.kotlinVersion") ?: "1.9.10"
 
-  const val AndroidXTest = "1.3.0"
+  const val AndroidXTest = "1.5.0"
 }
 
 object Dependencies {
   object Build {
-    const val Android = "com.android.tools.build:gradle:4.2.0"
-    const val MavenPublish = "com.vanniktech:gradle-maven-publish-plugin:0.18.0"
+    const val Android = "com.android.tools.build:gradle:8.1.2"
+    const val MavenPublish = "com.vanniktech:gradle-maven-publish-plugin:0.25.3"
     val Kotlin = "org.jetbrains.kotlin:kotlin-gradle-plugin:${Versions.KotlinCompiler}"
-    const val Ktlint = "org.jlleitschuh.gradle:ktlint-gradle:9.2.1"
+    const val Ktlint = "org.jlleitschuh.gradle:ktlint-gradle:11.6.1"
     const val AndroidXAnnotation = "androidx.annotation:annotation:1.1.0"
-    const val BinaryCompatibility = "org.jetbrains.kotlinx:binary-compatibility-validator:0.8.0"
+    const val BinaryCompatibility = "org.jetbrains.kotlinx:binary-compatibility-validator:0.16.3"
     val KotlinStbLib = "org.jetbrains.kotlin:kotlin-stdlib-jdk8:${Versions.KotlinCompiler}"
   }
 
   const val AppCompat = "androidx.appcompat:appcompat:1.2.0"
   const val Curtains = "com.squareup.curtains:curtains:1.2.5"
   const val JUnit = "junit:junit:4.13"
   const val Mockito = "org.mockito:mockito-core:3.4.6"
-  const val Robolectric = "org.robolectric:robolectric:4.3.1"
+  const val Robolectric = "org.robolectric:robolectric:4.10.1"
   const val Truth = "com.google.truth:truth:1.0.1"
   const val AndroidXCore = "androidx.core:core:1.6.0"
   const val AndroidXTracing = "androidx.tracing:tracing-ktx:1.1.0"
-  const val Radiography = "com.squareup.radiography:radiography:2.4.1"
+  const val Radiography = "com.squareup.radiography:radiography:2.7"
   const val JankStat = "androidx.metrics:metrics-performance:1.0.0-alpha01"
   const val Material = "com.google.android.material:material:1.6.0"
 
   object InstrumentationTests {
     const val Core = "androidx.test:core:${Versions.AndroidXTest}"
-    const val Espresso = "androidx.test.espresso:espresso-core:3.3.0"
-    const val JUnit = "androidx.test.ext:junit:1.1.2"
+    const val Espresso = "androidx.test.espresso:espresso-core:3.5.1"
+    const val JUnit = "androidx.test.ext:junit:1.1.5"
     const val Orchestrator = "androidx.test:orchestrator:${Versions.AndroidXTest}"
     const val Rules = "androidx.test:rules:${Versions.AndroidXTest}"
     const val Runner = "androidx.test:runner:${Versions.AndroidXTest}"

diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists