Merge pull request #13036 from nextcloud/feature/kotlin-2.0

Upgrade to Kotlin 2.0 🎉

app/build.gradle

@@ -28,14 +28,15 @@ buildscript {
 }
 
 plugins {
+    id "org.jetbrains.kotlin.plugin.compose" version "2.0.0"
     id "com.diffplug.spotless" version "6.20.0"
-    id 'com.google.devtools.ksp' version '1.9.23-1.0.20' apply false
+    id "org.jetbrains.kotlin.kapt" version "2.0.0"
+    id 'com.google.devtools.ksp' version '2.0.0-1.0.21' apply false
 }
 
 apply plugin: 'com.android.application'
 
 apply plugin: 'kotlin-android'
-apply plugin: 'kotlin-kapt'
 apply plugin: 'kotlin-parcelize'
 apply plugin: 'checkstyle'
 apply plugin: 'pmd'
@@ -261,10 +262,6 @@ android {
         // Adds exported schema location as test app assets.
         androidTest.assets.srcDirs += files("$projectDir/schemas".toString())
     }
-
-    composeOptions {
-        kotlinCompilerExtensionVersion = "1.5.13"
-    }
 }
 
 dependencies {

app/src/main/java/com/owncloud/android/operations/RemoveRemoteEncryptedFileOperation.kt

@@ -52,7 +52,7 @@ class RemoveRemoteEncryptedFileOperation internal constructor(
     @Deprecated("Deprecated in Java")
     @Suppress("TooGenericExceptionCaught")
     override fun run(client: OwnCloudClient): RemoteOperationResult<Void> {
-        val result: RemoteOperationResult<Void>
+        var result: RemoteOperationResult<Void>
         var delete: DeleteMethod? = null
         var token: String? = null
         val e2eVersion = CapabilityUtils.getCapability(context).endToEndEncryptionApiVersion

app/src/main/java/com/owncloud/android/ui/trashbin/TrashbinActivity.kt

@@ -150,9 +150,9 @@ class TrashbinActivity :
         recyclerView.setHasFooter(true)
         recyclerView.layoutManager = LinearLayoutManager(this)
 
-        viewThemeUtils.androidx.themeSwipeRefreshLayout(binding.swipeContainingList)
+        viewThemeUtils?.androidx?.themeSwipeRefreshLayout(binding.swipeContainingList)
         binding.swipeContainingList.setOnRefreshListener { loadFolder() }
-        viewThemeUtils.material.colorMaterialTextButton(findViewById(R.id.sort_button))
+        viewThemeUtils?.material?.colorMaterialTextButton(findViewById(R.id.sort_button))
 
         findViewById<View>(R.id.sort_button).setOnClickListener {
             DisplayUtils.openSortingOrderDialogFragment(

build.gradle

@@ -21,7 +21,7 @@ buildscript {
         espressoVersion = "3.5.1"
         fidoVersion = "4.1.0-patch2"
         jacoco_version = '0.8.12'
-        kotlin_version = '1.9.23'
+        kotlin_version = '2.0.0'
         markwonVersion = "4.6.2"
         mockitoVersion = "4.11.0"
         mockitoKotlinVersion = "4.1.0"

gradle/verification-metadata.xml

@@ -175,6 +175,7 @@
          <trusted-key id="6F7E5ACBCD02DB60DFD232E45E1F79A7C298661E" group="com.google.auto"/>
          <trusted-key id="720746177725A89207A7075BFD5DEA07FCB690A8" group="org.codehaus.mojo" name="mojo-parent" version="50"/>
          <trusted-key id="7488FE3E7E31E325FFDF6F1DA0E8A2E551EE7606" group="com.thoughtworks.paranamer"/>
+         <trusted-key id="7615AD56144DF2376F49D98B1669C4BB543E0445" group="com.google.errorprone"/>
          <trusted-key id="7616EB882DAF57A11477AAF559A252FB1199D873" group="com.google.code.findbugs"/>
          <trusted-key id="796737EDB7CB2E2904E2BFA447B25FE8A3702A09" group="^org[.]jbundle($|([.].*))" regex="true"/>
          <trusted-key id="7B121B76A7ED6CE6E60AD51784E913A8E3A748C0" group="org.bouncycastle"/>
@@ -1020,6 +1021,9 @@
          </artifact>
       </component>
       <component group="androidx.coordinatorlayout" name="coordinatorlayout" version="1.0.0">
+         <artifact name="coordinatorlayout-1.0.0.aar">
+            <sha256 value="e508c695489493374d942bf7b4ee02abf7571d25aac4c622e57d6cd5cd29eb73" origin="Generated by Gradle" reason="Artifact is not signed"/>
+         </artifact>
          <artifact name="coordinatorlayout-1.0.0.pom">
             <sha256 value="3e44e4de2fee6debc33d23626ee906e54e1bb3c1749b19e02bb667b614ab9392" origin="Generated by Gradle" reason="Artifact is not signed"/>
          </artifact>
@@ -1033,6 +1037,9 @@
          </artifact>
       </component>
       <component group="androidx.core" name="core" version="1.0.0">
+         <artifact name="core-1.0.0.aar">
+            <sha256 value="d7672358fc0d46de678968bcddfd3bdfe1618574299a753477b16116cfec74f5" origin="Generated by Gradle" reason="Artifact is not signed"/>
+         </artifact>
          <artifact name="core-1.0.0.pom">
             <sha256 value="384d529ad668ada4808de29b29a6348f0007c2841ad79cae9a5a089bd68810f5" origin="Generated by Gradle" reason="Artifact is not signed"/>
          </artifact>
@@ -1912,6 +1919,11 @@
             <sha256 value="a4cbb01a42d07047bd8d870017c96a1b0b7b4673320e86b66317a13be2ec10c7" origin="Generated by Gradle" reason="Artifact is not signed"/>
          </artifact>
       </component>
+      <component group="androidx.lifecycle" name="lifecycle-runtime" version="2.7.0">
+         <artifact name="lifecycle-runtime-2.7.0.aar">
+            <sha256 value="81c6fb1dbb6a3cd7dc827d7b08e1c8142ed3a400a3422441108480e22f8937c4" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="androidx.lifecycle" name="lifecycle-runtime-ktx" version="2.3.1">
          <artifact name="lifecycle-runtime-ktx-2.3.1.aar">
             <sha256 value="7ad2987dd7f4075c0871a72cf07e9649d9cd790fc23dfab1972eca4710373873" origin="Generated by Gradle" reason="Artifact is not signed"/>
@@ -2906,6 +2918,9 @@
          </artifact>
       </component>
       <component group="androidx.versionedparcelable" name="versionedparcelable" version="1.0.0">
+         <artifact name="versionedparcelable-1.0.0.aar">
+            <sha256 value="f6438a93ed8016ccddca0e140a70be0b0110e0424edaa1472f84f98fed2e1ce3" origin="Generated by Gradle" reason="Artifact is not signed"/>
+         </artifact>
          <artifact name="versionedparcelable-1.0.0.pom">
             <sha256 value="47ee7c5543239a651f8fb81310cadeeaab8e38a2d844d7bb92dd086e4ffbb320" origin="Generated by Gradle" reason="Artifact is not signed"/>
          </artifact>
@@ -6476,6 +6491,11 @@
             <sha256 value="95cdb173bfec237b371fb96661c5d5246d63257c099b410d0ee3ce28a4f768fb" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="com.google.devtools.ksp" name="com.google.devtools.ksp.gradle.plugin" version="2.0.0-1.0.21">
+         <artifact name="com.google.devtools.ksp.gradle.plugin-2.0.0-1.0.21.pom">
+            <sha256 value="928463bbb3239e5b47aa58dc06938a60cd4ef442357b83735a74ad92031697a0" origin="Generated by Gradle" reason="Artifact is not signed"/>
+         </artifact>
+      </component>
       <component group="com.google.devtools.ksp" name="symbol-processing" version="1.8.22-1.0.11">
          <artifact name="symbol-processing-1.8.22-1.0.11.jar">
             <sha256 value="adc19bf800cc8c160042b64ecd1475e63b184504de5c9c37798f7b77fb1c998f" origin="Generated by Gradle"/>
@@ -6508,6 +6528,14 @@
             <sha256 value="1975c1975ff89d0bfc2db129bffd3d9a10fa3eb2f7a07840d6b6d3df94ae3e7c" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="com.google.devtools.ksp" name="symbol-processing-api" version="2.0.0-1.0.21">
+         <artifact name="symbol-processing-api-2.0.0-1.0.21.jar">
+            <sha256 value="e866d6481751e839683f86bb689e92dc943e5d63de7fcc8e69b734dbd3315663" origin="Generated by Gradle" reason="Artifact is not signed"/>
+         </artifact>
+         <artifact name="symbol-processing-api-2.0.0-1.0.21.module">
+            <sha256 value="e7a42ea78dbd6f67062a0a0d75dae491b59fe861fa2c48b3c07a7eb6b6c2def2" origin="Generated by Gradle" reason="Artifact is not signed"/>
+         </artifact>
+      </component>
       <component group="com.google.devtools.ksp" name="symbol-processing-cmdline" version="1.8.22-1.0.11">
          <artifact name="symbol-processing-cmdline-1.8.22-1.0.11.jar">
             <sha256 value="1a521bdcf37aade3df1d6c8d69663edcc406a2eaebd30bfd776c78b96c5aa836" origin="Generated by Gradle"/>
@@ -9315,6 +9343,11 @@
             <sha256 value="c8d794eb761888d34369e677de8eaba0b01f9e8a756cfbff53215ccfa5c58c3f" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="org.jetbrains.kotlin" name="kotlin-build-tools-api" version="2.0.0">
+         <artifact name="kotlin-build-tools-api-2.0.0.pom">
+            <sha256 value="cc39e9e0c9bbeec5a0ccfe0a78734c541c00fca3027c6de8ebc13bade0f5400b" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.jetbrains.kotlin" name="kotlin-compiler" version="1.8.22">
          <artifact name="kotlin-compiler-1.8.22.jar">
             <sha256 value="05dba96d67add6d39c3d5c47a9d729d64adca20354fae5a6729b90748e14c391" origin="Generated by Gradle"/>
@@ -9347,6 +9380,11 @@
             <sha256 value="97faabf00494570f03ab785a0f6bfa13be0d35c0769109ca988d40238958ad46" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="org.jetbrains.kotlin" name="kotlin-compiler-runner" version="2.0.0">
+         <artifact name="kotlin-compiler-runner-2.0.0.pom">
+            <sha256 value="42e6632358fa62be99bb8e4a278707e6b810dfc71ad3e5eea17e54ae39c83aac" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.jetbrains.kotlin" name="kotlin-daemon-client" version="1.8.22">
          <artifact name="kotlin-daemon-client-1.8.22.jar">
             <sha256 value="ceb1a04b93fafb8b5f14cf8185a014fee8d7a362b33ad8794fb157dfa8c808cc" origin="Generated by Gradle"/>
@@ -9355,6 +9393,11 @@
             <sha256 value="128170ada25ef69da41c5978c083aac3b472328f87ee3f37955880a4721d9b88" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="org.jetbrains.kotlin" name="kotlin-daemon-client" version="2.0.0">
+         <artifact name="kotlin-daemon-client-2.0.0.pom">
+            <sha256 value="dbbc417fbbe94efab6a05a081d0f6336dacffa9d0426375e2a1781c57c5c2991" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.jetbrains.kotlin" name="kotlin-daemon-embeddable" version="1.8.22">
          <artifact name="kotlin-daemon-embeddable-1.8.22.jar">
             <sha256 value="567e5c902cb0302dc8444fbf1f8fc0e0f76a95077ce607943ec503270ee4470d" origin="Generated by Gradle"/>
@@ -9430,6 +9473,11 @@
             <sha256 value="9b3be3a14d1d23dc115a9d9074ba63777fc4ef28b6d5ff31d5c4c284675f9124" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="org.jetbrains.kotlin" name="kotlin-gradle-plugins-bom" version="2.0.0">
+         <artifact name="kotlin-gradle-plugins-bom-2.0.0.pom">
+            <sha256 value="c4a0586af77f0fb4f7e367033a02ac718beff0d0193cc7989583a982aa2752f2" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.jetbrains.kotlin" name="kotlin-klib-commonizer-api" version="1.8.22">
          <artifact name="kotlin-klib-commonizer-api-1.8.22.jar">
             <sha256 value="1745cb0a3c1f71ab4e499677b3b1cc4bf94e684e0b112ace865b4e5fc5fac31f" origin="Generated by Gradle"/>
@@ -9899,6 +9947,16 @@
             <sha256 value="1daf64ddd8e90a6aa8a831f3e649b4b094e72fe91df0dfd91b5b1ba1dcd54d54" origin="Generated by Gradle" reason="Artifact is not signed"/>
          </artifact>
       </component>
+      <component group="org.jetbrains.kotlin.kapt" name="org.jetbrains.kotlin.kapt.gradle.plugin" version="2.0.0">
+         <artifact name="org.jetbrains.kotlin.kapt.gradle.plugin-2.0.0.pom">
+            <sha256 value="9fd220e8fc86ba331eedc96d5f880380e84788137500688e9f032c2f33f65f6a" origin="Generated by Gradle" reason="Artifact is not signed"/>
+         </artifact>
+      </component>
+      <component group="org.jetbrains.kotlin.plugin.compose" name="org.jetbrains.kotlin.plugin.compose.gradle.plugin" version="2.0.0">
+         <artifact name="org.jetbrains.kotlin.plugin.compose.gradle.plugin-2.0.0.pom">
+            <sha256 value="38e76d688eddcf2d92ab20838c0adf28d8fd5de2cc965edcd273a9b4f7d636de" origin="Generated by Gradle" reason="Artifact is not signed"/>
+         </artifact>
+      </component>
       <component group="org.jetbrains.kotlinx" name="atomicfu" version="0.16.1">
          <artifact name="atomicfu-0.16.1.module">
             <sha256 value="fdcf04fc25f6a43f557f341ee0053caa25e759f591169c86566f1dad37fc77a6" origin="Generated by Gradle"/>