Upgrade gradle to 8.1.2 and add support for kotlin and kapt

.github/workflows/archive.yml

@@ -7,7 +7,7 @@ jobs:
     steps:
       - uses: actions/setup-java@v2
         with:
-          java-version: '11'
+          java-version: '17'
           distribution: 'temurin'
       - name: checkout
         uses: actions/checkout@v2

.github/workflows/build.yml

@@ -12,7 +12,7 @@ jobs:
     steps:
     - uses: actions/setup-java@v2
       with:
-        java-version: '11'
+        java-version: '17'
         distribution: 'temurin'
     - name: checkout
       uses: actions/checkout@v2

.github/workflows/emulator.yml

@@ -17,7 +17,7 @@ jobs:
     steps:
     - uses: actions/setup-java@v2
       with:
-        java-version: '11'
+        java-version: '17'
         distribution: 'temurin'
     - name: checkout
       uses: actions/checkout@v2

.github/workflows/test.yml

@@ -7,7 +7,7 @@ jobs:
     steps:
       - uses: actions/setup-java@v2
         with:
-          java-version: '11'
+          java-version: '17'
           distribution: 'temurin'
       - name: checkout
         uses: actions/checkout@v2

app/build.gradle

@@ -1,6 +1,7 @@
 plugins {
     id 'com.android.application'
-    id 'org.jetbrains.kotlin.android'
+    id 'kotlin-android'
+    id 'kotlin-kapt'
 }
 apply from: 'jacoco.gradle'
 
@@ -85,8 +86,11 @@ android {
         }
     }
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility JavaVersion.VERSION_17
+        targetCompatibility JavaVersion.VERSION_17
+    }
+    kotlinOptions {
+        jvmTarget = JavaVersion.VERSION_17
     }
     buildFeatures {
         viewBinding = true
@@ -111,7 +115,7 @@ dependencies {
     implementation libs.google.gson
 
 // Third-party
-    annotationProcessor libs.dbflow.processor
+    kapt libs.dbflow.processor
     implementation libs.dbflow.core
     implementation libs.dbflow.lib
 
@@ -136,7 +140,7 @@ dependencies {
 
 // Dependency Injection
     implementation libs.google.dagger
-    annotationProcessor libs.google.dagger.compiler
+    kapt libs.google.dagger.compiler
 
 // Logger
     implementation project(':applogger')
@@ -153,7 +157,7 @@ dependencies {
     testImplementation libs.robolectric
     testImplementation libs.faker
     testImplementation libs.ooni.oonimkall
-    testAnnotationProcessor libs.google.dagger.compiler
+    kaptTest libs.google.dagger.compiler
 
     // Instrumentation Testing
 	androidTestImplementation project(':shared-test')
@@ -166,7 +170,7 @@ dependencies {
     androidTestImplementation libs.androidx.espresso.contrib
     androidTestImplementation libs.androidx.espresso.core
     androidTestImplementation libs.barista
-    androidTestAnnotationProcessor libs.google.dagger.compiler
+    kaptAndroidTest libs.google.dagger.compiler
 }
 
 static def versionCodeDate() {

app/jacoco.gradle

@@ -48,13 +48,19 @@ task jacocoAndroidTestReport(type: JacocoReport) {
     executionData.from += fileTree(dir: codeCoverageDataLocation, includes: ['**/*.ec'])
   }
 
-  reports {
-    html.enabled true
-    html.destination file("${buildDir}/reports/coverage")
-    xml.enabled true
-    xml.destination file("${buildDir}/reports/coverage.xml")
-    csv.enabled false
-  }
+    reports {
+        html {
+            enabled true
+            destination file("${buildDir}/reports/coverage")
+        }
+        xml {
+            enabled true
+            destination file("${buildDir}/reports/coverage.xml")
+        }
+        csv {
+            enabled false
+        }
+    }
 
   doLast {
     println "Wrote HTML coverage report to ${reports.html.destination}/index.html"

gradle.properties

@@ -6,7 +6,10 @@
 # http://www.gradle.org/docs/current/userguide/build_environment.html
 # Specifies the JVM arguments used for the daemon process.
 # The setting is particularly useful for tweaking memory settings.
+android.defaults.buildfeatures.buildconfig=true
 android.enableJetifier=true
+android.nonFinalResIds=false
+android.nonTransitiveRClass=false
 android.useAndroidX=true
 org.gradle.jvmargs=-Xmx1536m
 # When configured, Gradle will run in incubating parallel mode.

gradle/libs.versions.toml

@@ -1,16 +1,16 @@
 [versions]
-androidGradlePlugin = "7.4.1"
+androidGradlePlugin = "8.1.2"
 barista = "3.9.0"
 countlySdk = "23.6.0"
 faker = "1.2.8"
 mockitoCore = "5.3.1"
 mockitoInline = "4.6.1"
-robolectric = "4.6.1"
+robolectric = "4.10.3"
 fastlaneScreengrab = "2.0.0"
 sentryAndroid = "6.3.0"
 xanscaleLocalhostToolkit = "19.05.01"
 commonsIo = "2.6"
-jacoco = "0.8.5"
+jacoco = "0.8.7"
 kotlin = "1.8.0"
 
 # Android X
@@ -29,7 +29,7 @@ androidxEspressoCore = "3.5.1"
 googleGson = "2.8.9"
 googleGuava = "30.1.1-android"
 googleMaterial = "1.6.1"
-googleDagger = "2.36"
+googleDagger = "2.45"
 googleFirebaseBon = "26.3.0"
 googlePlaycore = "1.10.3"
 

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

shared-test/build.gradle

@@ -1,18 +1,22 @@
 plugins {
     id 'com.android.library'
+    id 'kotlin-android'
+    id 'kotlin-kapt'
 }
 
 android {
     namespace 'org.openobservatory.ooniprobe.shared.test'
-    compileSdk 33
+    compileSdk libs.versions.compileSdk.get().toInteger()
 
     defaultConfig {
-        minSdk 21
+        minSdk libs.versions.minSdk.get().toInteger()
     }
-
-    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
+	compileOptions {
+		sourceCompatibility JavaVersion.VERSION_17
+		targetCompatibility JavaVersion.VERSION_17
+	}
+    kotlinOptions {
+        jvmTarget = JavaVersion.VERSION_17
     }
     flavorDimensions = ['testing', 'license']
     productFlavors {
@@ -41,12 +45,12 @@ dependencies {
 
     // Dependency Injection (https://dagger.dev/)
 	implementation libs.google.dagger
-	annotationProcessor libs.google.dagger.compiler
+    kapt libs.google.dagger.compiler
 
     // Database Library (https://github.com/agrosner/DBFlow)
 	implementation libs.dbflow.core
 	implementation libs.dbflow.lib
-	annotationProcessor libs.dbflow.processor
+    kapt libs.dbflow.processor
 
     // Gson Serialization Library (https://github.com/google/gson)
 	implementation libs.google.gson
@@ -60,6 +64,7 @@ dependencies {
 	implementation libs.retrofit.logging.interceptor
 
 	implementation libs.androidx.appcompat
+	implementation libs.xanscale.localhost.toolkit
 
     testImplementation libs.junit4
     androidTestImplementation libs.androidx.junit