Updated to AGP 8.2.2

Author: LachlanMcKee

.github/workflows/ci.yml

@@ -9,16 +9,14 @@ jobs:
         name: Assemble
         runs-on: ubuntu-latest
         timeout-minutes: 25
-        env:
-            JAVA_TOOL_OPTIONS: -Xmx6g
-            GRADLE_OPTS: -Dorg.gradle.daemon=false -Dorg.gradle.workers.max=2 -Dkotlin.incremental=false -Dkotlin.compiler.execution.strategy=in-process
         steps:
-            - uses: actions/checkout@v2
-            - uses: gradle/wrapper-validation-action@v1
-            - uses: actions/setup-java@v1
+            - uses: actions/checkout@v4
+            - uses: gradle/wrapper-validation-action@v2
+            - uses: actions/setup-java@v4
               with:
-                  java-version: 11
-            - uses: actions/cache@v2
+                distribution: 'zulu'
+                java-version: '17'
+            - uses: actions/cache@v4
               with:
                 path: |
                   ~/.gradle/caches
@@ -38,34 +36,33 @@ jobs:
         runs-on: ubuntu-latest
         timeout-minutes: 10
         steps:
-            - uses: actions/checkout@v2
-            - uses: gradle/wrapper-validation-action@v1
-            - uses: actions/setup-java@v1
+            - uses: actions/checkout@v4
+            - uses: gradle/wrapper-validation-action@v2
+            - uses: actions/setup-java@v4
               with:
-                  java-version: 11
+                distribution: 'zulu'
+                java-version: '17'
             - name: Detekt
               run: ./gradlew detekt --stacktrace
               working-directory: .
             - name: Upload failure reports
               if: failure()
-              uses: actions/upload-artifact@v2
+              uses: actions/upload-artifact@v4
               with:
                 path: '**/build/reports'
 
     unit-tests:
         name: Unit tests
         runs-on: ubuntu-latest
         timeout-minutes: 20
-        env:
-            JAVA_TOOL_OPTIONS: -Xmx4g
-            GRADLE_OPTS: -Dorg.gradle.daemon=false -Dorg.gradle.workers.max=2 -Dkotlin.incremental=false -Dkotlin.compiler.execution.strategy=in-process
         steps:
-            - uses: actions/checkout@v2
-            - uses: gradle/wrapper-validation-action@v1
-            - uses: actions/setup-java@v1
+            - uses: actions/checkout@v4
+            - uses: gradle/wrapper-validation-action@v2
+            - uses: actions/setup-java@v4
               with:
-                  java-version: 11
-            - uses: actions/cache@v2
+                distribution: 'zulu'
+                java-version: '17'
+            - uses: actions/cache@v4
               with:
                 path: |
                   ~/.gradle/caches
@@ -78,7 +75,7 @@ jobs:
               working-directory: .
             - name: Upload failure reports
               if: failure()
-              uses: actions/upload-artifact@v2
+              uses: actions/upload-artifact@v4
               with:
                 name: unit-test-reports
                 path: '**/build/reports'
@@ -88,60 +85,70 @@ jobs:
                 rm -f ~/.gradle/caches/modules-2/gc.properties
 
     instrumentation-tests:
-        runs-on: macOS-latest
-        timeout-minutes: 60
-        env:
-            JAVA_TOOL_OPTIONS: -Xmx4g
-            GRADLE_OPTS: -Dorg.gradle.daemon=false -Dorg.gradle.workers.max=2 -Dkotlin.incremental=false -Dkotlin.compiler.execution.strategy=in-process
-        strategy:
-            fail-fast: false
-            matrix:
-                api-level: [22,25,29]
-        name: Instrumentation tests [API=${{ matrix.api-level }}]
+        name: Instrumentation tests
+        runs-on: macos-13
+        timeout-minutes: 30
         steps:
-            - uses: actions/checkout@v2
-            - uses: gradle/wrapper-validation-action@v1
-            - uses: actions/setup-java@v1
+            - uses: actions/checkout@v4
+            - uses: actions/setup-java@v4
               with:
-                  java-version: 11
-            - uses: actions/cache@v2
+                distribution: 'zulu'
+                java-version: '17'
+            - uses: gradle/wrapper-validation-action@v1
+            - uses: gradle/gradle-build-action@v2
+            - name: Pre build sources before launching emulator
+              run: ./gradlew compileDebugAndroidTestSources
+            - name: AVD cache
+              uses: actions/cache@v4
+              id: avd-cache
               with:
                 path: |
-                  ~/.gradle/caches
-                  ~/.gradle/wrapper
-                key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
-                restore-keys: |
-                  ${{ runner.os }}-gradle-
+                  ~/.android/avd/*
+                  ~/.android/adb*
+                key: avd-29
+            - name: Create AVD and generate snapshot for caching
+              if: steps.avd-cache.outputs.cache-hit != 'true'
+              uses: reactivecircus/android-emulator-runner@v2
+              with:
+                  # Use API 29 https://github.com/ReactiveCircus/android-emulator-runner/issues/222
+                  api-level: 29
+                  arch: x86_64
+                  force-avd-creation: false
+                  emulator-options: -no-window -gpu swiftshader_indirect -noaudio -no-boot-anim -camera-back none
+                  disable-animations: false
+                  script: echo "Generated AVD snapshot for caching."
             - name: Instrumentation tests
               uses: reactivecircus/android-emulator-runner@v2
               with:
-                  api-level: ${{ matrix.api-level }}
-                  arch: x86
-                  script: ./gradlew connectedCheck
-
-            - name: Upload failure reports
+                  # Use API 29 https://github.com/ReactiveCircus/android-emulator-runner/issues/222
+                  api-level: 29
+                  arch: x86_64
+                  force-avd-creation: false
+                  emulator-options: -no-snapshot-save -no-window -gpu swiftshader_indirect -noaudio -no-boot-anim -camera-back none
+                  disable-animations: true
+                  script: |
+                    adb logcat > logcat.out &
+                    ./gradlew connectedCheck
+            - name: Upload failed instrumentation artifacts
               if: failure()
-              uses: actions/upload-artifact@v2
+              uses: actions/upload-artifact@v4
               with:
-                name: instrumentation-reports-api-${{ matrix.api-level }}
-                path: '**/build/reports'
-
-            - name: Cleanup Gradle Cache
-              run: |
-                rm -f ~/.gradle/caches/modules-2/modules-2.lock
-                rm -f ~/.gradle/caches/modules-2/gc.properties
-
+                name: instrumentation-failures
+                path: |
+                  **/build/reports
+                  logcat.out
     verify-publication:
       name: Verify publication
       runs-on: ubuntu-latest
       timeout-minutes: 10
       steps:
-        - uses: actions/checkout@v2
-        - uses: gradle/wrapper-validation-action@v1
-        - uses: actions/setup-java@v1
+        - uses: actions/checkout@v4
+        - uses: gradle/wrapper-validation-action@v2
+        - uses: actions/setup-java@v4
           with:
-            java-version: 11
-        - uses: actions/cache@v2
+            distribution: 'zulu'
+            java-version: '17'
+        - uses: actions/cache@v4
           with:
             path: |
               ~/.gradle/caches

build.gradle

@@ -1,3 +1,6 @@
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
+import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
+
 buildscript {
     apply from: 'gradle/dependencies.gradle'
 
@@ -40,13 +43,14 @@ subprojects {
         maven { url "https://www.jitpack.io" }
     }
 
-    configurations.all {
+    configurations.configureEach {
         resolutionStrategy.eachDependency {
         }
     }
-    tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).all {
-        kotlinOptions {
-            jvmTarget = JavaVersion.VERSION_11.name
+    tasks.withType(KotlinCompile).configureEach {
+        compilerOptions {
+            jvmTarget = JvmTarget.JVM_11
+            freeCompilerArgs.add("-Xopt-in=com.badoo.ribs.annotation.ExperimentalApi")
         }
     }
 }

gradle.properties

@@ -10,7 +10,7 @@
 # When configured, Gradle will run in incubating parallel mode.
 # This option should only be used with decoupled projects. More details, visit
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
-org.gradle.jvmargs=-Xmx4g -XX:MaxPermSize=512M
+org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8
 org.gradle.caching=true
 org.gradle.parallel=true
 
@@ -28,3 +28,6 @@ POM_DEVELOPER_ID=badoo
 POM_DEVELOPER_NAME=Badoo Trading Limited
 
 android.useAndroidX=true
+android.defaults.buildfeatures.buildconfig=true
+android.nonTransitiveRClass=false
+android.nonFinalResIds=false

gradle/code-coverage.gradle

@@ -2,7 +2,7 @@ apply plugin: 'jacoco'
 
 jacoco {
     toolVersion = deps.versions.jacoco
-    reportsDir = file("$buildDir/codeCoverageReports")
+    reportsDirectory = file("$buildDir/codeCoverageReports")
 }
 
 tasks.withType(Test) {
@@ -52,10 +52,6 @@ task debugCombinedCodeCoverageReport(type: JacocoReport, dependsOn: ['testDebugU
     group = "Code coverage"
     description = "Generate coverage reports that combine both Unit and UI tests for debug builds"
 
-    reports {
-        html.enabled = true
-    }
-
     classDirectories.setFrom(files([javaClasses, kotlinClasses]))
     sourceDirectories.setFrom(files([javaSourceDirectory, kotlinSourceDirectory]))
     executionData(files([unitTestsData, androidTestsData]))
@@ -66,10 +62,6 @@ task debugUnitTestCodeCoverageReport(type: JacocoReport, dependsOn: ['testDebugU
     group = "Code coverage"
     description = "Generate coverage reports on Unit tests for debug builds"
 
-    reports {
-        html.enabled = true
-    }
-
     classDirectories.setFrom(files([javaClasses, kotlinClasses]))
     sourceDirectories.setFrom(files([javaSourceDirectory, kotlinSourceDirectory]))
     executionData(files([unitTestsData]))
@@ -80,10 +72,6 @@ task debugUiTestCodeCoverageReport(type: JacocoReport, dependsOn: ['createDebugC
     group = "Code coverage"
     description = "Generate coverage reports on UI tests for debug builds"
 
-    reports {
-        html.enabled = true
-    }
-
     classDirectories.setFrom(files([javaClasses, kotlinClasses]))
     sourceDirectories.setFrom(files([javaSourceDirectory, kotlinSourceDirectory]))
     executionData(files([androidTestsData]))

gradle/dependencies.gradle

@@ -13,7 +13,7 @@ def versions = [
         intellij_kotlin                : '212-1.6.21-release-334-AS5457.46',
         kotlin                         : kotlinVersion,
         mviCore                        : '1.4.0',
-        robolectric                    : '4.8.1',
+        robolectric                    : '4.10.3',
         composeBom                     : '2022.12.00',
         composeCompiler                : '1.4.4',
 
@@ -54,17 +54,17 @@ def apt = [
         javaxInject   : "javax.inject:javax.inject:1",
 ]
 
-def agp = 'com.android.tools.build:gradle:7.2.2'
+def agp = 'com.android.tools.build:gradle:8.2.2'
 
 def build = [
         compileSdk      : 33,
         gradlePluginsUrl: "https://plugins.gradle.org/m2/",
         ci              : 'true' == System.getenv('CI'),
         minSdk          : 21,
-        targetSdk       : 32,
+        targetSdk       : 33,
         guava           : "com.google.guava:guava:20.0",
         commonsLang     : "commons-lang:commons-lang:2.6",
-        intellijPlugin  : "org.jetbrains.intellij:org.jetbrains.intellij.gradle.plugin:1.1.4",
+        intellijPlugin  : "org.jetbrains.intellij:org.jetbrains.intellij.gradle.plugin:1.13.3",
         kotlinIdeaPlugin: "org.jetbrains.kotlin:${versions.intellij_kotlin}",
         gradlePlugins   : [
                 android     : agp,

gradle/utils.gradle

@@ -79,6 +79,11 @@ private def configureAndroidModule(Project project) {
             }
         }
 
+        compileOptions {
+            sourceCompatibility = JavaVersion.VERSION_11
+            targetCompatibility = JavaVersion.VERSION_11
+        }
+
         project.afterEvaluate {
             project.android.kotlinOptions.freeCompilerArgs += "-Xopt-in=com.badoo.ribs.annotation.ExperimentalApi"
         }

gradle/wrapper/gradle-wrapper.properties

@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-all.zip

internal/junitextensions/build.gradle

@@ -8,7 +8,15 @@ dependencies {
 }
 
 android {
+    namespace 'com.badoo.ribs.internal.junitextensions'
+
     packagingOptions {
-        exclude 'META-INF/LICENSE*.*'
+        jniLibs {
+            excludes += ['META-INF/LICENSE*.*']
+        }
+        resources {
+            excludes += ['META-INF/LICENSE*.*']
+        }
     }
 }
+

internal/junitextensions/src/main/AndroidManifest.xml

@@ -1,6 +1,8 @@
 configureAndroidLibrary(project)
 
 android {
+    namespace 'com.badoo.ribs.test.activity'
+
     defaultConfig {
         versionCode 1
         versionName '1.0'