Merge pull request #7936 from vector-im/feature/bma/kotlin1_8

Feature/bma/kotlin1 8

build.gradle

@@ -45,7 +45,7 @@ plugins {
     // Detekt
     id "io.gitlab.arturbosch.detekt" version "1.22.0"
     // Ksp
-    id "com.google.devtools.ksp" version "1.7.22-1.0.8"
+    id "com.google.devtools.ksp" version "1.8.0-1.0.8"
 
     // Dependency Analysis
     id 'com.autonomousapps.dependency-analysis' version "1.18.0"

changelog.d/7936.misc

@@ -0,0 +1 @@
+Upgrade to Kotlin 1.8

coverage.gradle

@@ -80,12 +80,12 @@ task generateCoverageReport(type: JacocoReport) {
 
 task unitTestsWithCoverage(type: GradleBuild) {
     // the 7.1.3 android gradle plugin has a bug where enableTestCoverage generates invalid coverage
-    startParameter.projectProperties.coverage = [enableTestCoverage: false]
+    startParameter.projectProperties.coverage = "false"
     tasks = ['testDebugUnitTest']
 }
 
 task instrumentationTestsWithCoverage(type: GradleBuild) {
-    startParameter.projectProperties.coverage = [enableTestCoverage: true]
+    startParameter.projectProperties.coverage = "true"
     startParameter.projectProperties['android.testInstrumentationRunnerArguments.notPackage'] = 'im.vector.app.ui'
     tasks = [':vector-app:connectedGplayDebugAndroidTest', ':vector:connectedDebugAndroidTest', 'matrix-sdk-android:connectedDebugAndroidTest']
 }

dependencies.gradle

@@ -8,7 +8,7 @@ ext.versions = [
 
 def gradle = "7.3.1"
 // Ref: https://kotlinlang.org/releases.html
-def kotlin = "1.7.22"
+def kotlin = "1.8.0"
 def kotlinCoroutines = "1.6.4"
 def dagger = "2.44.2"
 def firebaseBom = "31.1.1"
@@ -28,11 +28,12 @@ def jjwt = "0.11.5"
 // the whole commit which set version 0.16.0-SNAPSHOT
 def vanniktechEmoji = "0.16.0-SNAPSHOT"
 def sentry = "6.11.0"
-def fragment = "1.5.5"
+// Use 1.6.0 alpha to fix issue with test
+def fragment = "1.6.0-alpha04"
 // Testing
 def mockk = "1.12.3" // We need to use 1.12.3 to have mocking in androidTest until a new version is released: https://github.com/mockk/mockk/issues/819
-def espresso = "3.4.0"
+def espresso = "3.5.1"
-def androidxTest = "1.4.0"
+def androidxTest = "1.5.0"
 def androidxOrchestrator = "1.4.2"
 def paparazzi = "1.1.0"
 
@@ -56,6 +57,7 @@ ext.libs = [
                 'exifinterface'           : "androidx.exifinterface:exifinterface:1.3.5",
                 'fragmentKtx'             : "androidx.fragment:fragment-ktx:$fragment",
                 'fragmentTesting'         : "androidx.fragment:fragment-testing:$fragment",
+                'fragmentTestingManifest' : "androidx.fragment:fragment-testing-manifest:$fragment",
                 'constraintLayout'        : "androidx.constraintlayout:constraintlayout:2.1.4",
                 'work'                    : "androidx.work:work-runtime-ktx:2.7.1",
                 'autoFill'                : "androidx.autofill:autofill:1.1.0",

matrix-sdk-android/build.gradle

@@ -81,7 +81,7 @@ android {
     buildTypes {
         debug {
             if (project.hasProperty("coverage")) {
-                testCoverageEnabled = coverage.enableTestCoverage
+                testCoverageEnabled = coverage == "true"
             }
             // Set to true to log privacy or sensible data, such as token
             buildConfigField "boolean", "LOG_PRIVATE_DATA", project.property("vector.debugPrivateData")

vector-app/build.gradle

@@ -232,7 +232,7 @@ android {
             resValue "color", "launcher_background", "#0DBD8B"
 
             if (project.hasProperty("coverage")) {
-                testCoverageEnabled = coverage.enableTestCoverage
+                testCoverageEnabled = coverage == "true"
             }
         }
 
@@ -403,8 +403,8 @@ dependencies {
     androidTestImplementation libs.mockk.mockkAndroid
     androidTestUtil libs.androidx.orchestrator
     androidTestImplementation libs.androidx.fragmentTesting
-    androidTestImplementation "org.jetbrains.kotlin:kotlin-reflect:1.7.22"
+    androidTestImplementation "org.jetbrains.kotlin:kotlin-reflect:1.8.0"
-    debugImplementation libs.androidx.fragmentTesting
+    debugImplementation libs.androidx.fragmentTestingManifest
     debugImplementation 'com.squareup.leakcanary:leakcanary-android:2.10'
 }
 

vector/build.gradle

@@ -69,7 +69,7 @@ android {
     buildTypes {
         debug {
             if (project.hasProperty("coverage")) {
-                testCoverageEnabled = coverage.enableTestCoverage
+                testCoverageEnabled = coverage == "true"
             }
         }
     }
@@ -330,6 +330,7 @@ dependencies {
     }
     androidTestImplementation libs.mockk.mockkAndroid
     androidTestUtil libs.androidx.orchestrator
-    debugImplementation libs.androidx.fragmentTesting
+    debugImplementation libs.androidx.fragmentTestingManifest
-    androidTestImplementation "org.jetbrains.kotlin:kotlin-reflect:1.7.22"
+    androidTestImplementation libs.androidx.fragmentTesting
+    androidTestImplementation "org.jetbrains.kotlin:kotlin-reflect:1.8.0"
 }