Merge pull request #16306 from nextcloud/gradle9

chore(agp): Android Gradle plugin 9.0.0

Author: alperozturk96

app/build.gradle.kts

@@ -93,6 +93,12 @@ android {
     androidResources.generateLocaleConfig = true
 
     defaultConfig {
+        testInstrumentationRunnerArguments += mapOf(
+            "TEST_SERVER_URL" to "ncTestServerBaseUrl.toString()",
+            "TEST_SERVER_USERNAME" to "ncTestServerUsername.toString()",
+            "TEST_SERVER_PASSWORD" to "ncTestServerPassword.toString()",
+            "disableAnalytics" to "true"
+        )
         applicationId = "com.nextcloud.client"
         minSdk = 28
         targetSdk = 36
@@ -109,13 +115,6 @@ android {
         testInstrumentationRunner = if (shotTest) "com.karumi.shot.ShotTestRunner"
         else "com.nextcloud.client.TestRunner"
 
-        testInstrumentationRunnerArguments += mapOf(
-            "TEST_SERVER_URL" to ncTestServerBaseUrl.toString(),
-            "TEST_SERVER_USERNAME" to ncTestServerUsername.toString(),
-            "TEST_SERVER_PASSWORD" to ncTestServerPassword.toString()
-        )
-        testInstrumentationRunnerArguments["disableAnalytics"] = "true"
-
         versionCode = versionMajor * 10000000 + versionMinor * 10000 + versionPatch * 100 + versionBuild
         versionName = when {
             versionBuild > 89 -> "${versionMajor}.${versionMinor}.${versionPatch}"

app/src/main/java/com/nextcloud/client/assistant/task/TaskView.kt

@@ -133,7 +133,7 @@ private fun TaskViewPreview() {
             TaskInput("What about other promising tokens like"),
             TaskOutput(
                 "Several tokens show promise for future growth in the" +
-                    "cryptocurrency market"
+                    " cryptocurrency market"
             ),
             1707692337,
             1707692337,

gradle.properties

@@ -21,5 +21,19 @@ kapt.incremental.apt=true
 org.gradle.daemon=true
 org.gradle.configuration-cache=true
 
+# automatically aded via AGP migration
+# see https://developer.android.com/build/releases/agp-9-0-0-release-notes
+# should be changed with https://github.com/nextcloud/android/issues/15993
+android.defaults.buildfeatures.resvalues=true
+android.sdk.defaultTargetSdkToCompileSdkIfUnset=false
+android.enableAppCompileTimeRClass=false
+android.usesSdkInManifest.disallowed=false
+android.uniquePackageNames=false
+android.dependency.useConstraints=true
+android.r8.strictFullModeForKeepRules=false
+android.r8.optimizedResourceShrinking=false
+android.builtInKotlin=false
+android.newDsl=false
+
 # Needed for local libs
 # org.gradle.dependency.verification=lenient

gradle/libs.versions.toml

@@ -6,7 +6,7 @@ androidCommonLibraryVersion = "4fc0f29981"
 androidGifDrawableVersion = "1.2.30"
 androidImageCropperVersion = "4.7.0"
 androidLibraryVersion ="839366c261c52437425cde740c9e5a4ab8c8bace"
-androidPluginVersion = '8.13.2'
+androidPluginVersion = "9.0.0"
 androidsvgVersion = "1.4"
 androidxMediaVersion = "1.5.1"
 androidxTestVersion = "1.7.0"

gradle/verification-metadata.xml

@@ -101,7 +101,10 @@
          <trusted-key id="190D5A957FF22273E601F7A7C92C5FEC70161C62" group="org.apache" name="apache"/>
          <trusted-key id="19BEAB2D799C020F17C69126B16698A4ADF4D638" group="org.checkerframework"/>
          <trusted-key id="1A55F091AD28C07F831FA44D7905DE25C78AD456" group="com.google.protobuf"/>
-         <trusted-key id="1BD97A6A154E7810EE0BC832E2F38302C8075E3D" group="gradle" name="gradle" version="9.2.1"/>
+         <trusted-key id="1BD97A6A154E7810EE0BC832E2F38302C8075E3D">
+            <trusting group="gradle" name="gradle"/>
+            <trusting group="gradle" name="gradle" version="9.2.1"/>
+         </trusted-key>
          <trusted-key id="1D0A8B5E77C678A7C724445ABF984B4145EA13F7" group="com.squareup" name="javapoet" version="1.13.0"/>
          <trusted-key id="1D217F8475EEE9F19AB8DD6B793FD5751A0F0780" group="^com[.]squareup($|([.].*))" regex="true"/>
          <trusted-key id="1D2C7EF8ADA0F794B58C7C63436902AF59EDF60E">
@@ -14066,6 +14069,14 @@
             <sha256 value="5c4df7b2e31f17f20e4b8dbd62a2b7865a09a49a1fd2931a359fd394ecb9b5a5" origin="Generated by Gradle" reason="Artifact is not signed"/>
          </artifact>
       </component>
+      <component group="com.android.tools.build" name="bundletool" version="1.18.3">
+         <artifact name="bundletool-1.18.3.jar">
+            <sha256 value="ccad18514fd97db010856b2bbed40f481f8ba9349368c97ae54d72e3567d0171" origin="Generated by Gradle" reason="Artifact is not signed"/>
+         </artifact>
+         <artifact name="bundletool-1.18.3.pom">
+            <sha256 value="fa674b39b96cae98015f3850f366cfeb00fe6c7aea2d90b20c017b90e0996dae" origin="Generated by Gradle" reason="Artifact is not signed"/>
+         </artifact>
+      </component>
       <component group="com.android.tools.build" name="gradle" version="8.11.0">
          <artifact name="gradle-8.11.0.jar">
             <sha256 value="364d999e6e7b4b33413ca631caadc848159ed0cd571f6b70944a0536b741c100" origin="Generated by Gradle"/>
@@ -26206,6 +26217,11 @@
             <sha256 value="173ff3f4e6a019e25e553b1915b80a1a6fa93eb59b760da7f55ed3684ec0a6e1" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="gradle" name="gradle" version="9.3.0">
+         <artifact name="gradle-9.3.0-src.zip">
+            <sha256 value="a2a8ffc8b0ff8bab269ec41e29cd9d800382d558aef23a2bace1bd1bb19e2a95"/>
+         </artifact>
+      </component>
       <component group="id.zelory" name="compressor" version="3.0.1">
          <artifact name="compressor-3.0.1.aar">
             <sha256 value="27abd452db6c8bedd94d1ede04617df5cd5033427c0f91906cb71e798c67b422" origin="Generated by Gradle"/>

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.3.0-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME