From ac7b7a9af83ef574dc9329d990f6327b282969b0 Mon Sep 17 00:00:00 2001
From: tobiasKaminsky <tobias@kaminsky.me>
Date: Fri, 16 Jan 2026 12:20:36 +0100
Subject: [PATCH 1/2] Bump to Gradle 9

Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
---
 app/build.gradle.kts             | 13 ++++++-------
 gradle.properties                | 10 ++++++++++
 gradle/verification-metadata.xml | 10 ++++++++++
 3 files changed, 26 insertions(+), 7 deletions(-)

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index a665df2c229a..5ac1c28b0cd4 100644
--- a/app/build.gradle.kts
+++ b/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}"
diff --git a/gradle.properties b/gradle.properties
index 50cc48359122..36960b3445b8 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -20,6 +20,16 @@ org.gradle.configureondemand=true
 kapt.incremental.apt=true
 org.gradle.daemon=true
 org.gradle.configuration-cache=true
+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
diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml
index 4ccf5082aae2..0cf8d594a911 100644
--- a/gradle/verification-metadata.xml
+++ b/gradle/verification-metadata.xml
@@ -14061,6 +14061,16 @@
             <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"/>

From 28d9a6cbb77fb4ba25ff8771d48236abd9fee4ba Mon Sep 17 00:00:00 2001
From: tobiasKaminsky <tobias@kaminsky.me>
Date: Mon, 19 Jan 2026 08:31:05 +0100
Subject: [PATCH 2/2] lint

Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
---
 .../main/java/com/nextcloud/client/assistant/task/TaskView.kt   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/java/com/nextcloud/client/assistant/task/TaskView.kt b/app/src/main/java/com/nextcloud/client/assistant/task/TaskView.kt
index d0792f6b08df..cedd198eeee2 100644
--- a/app/src/main/java/com/nextcloud/client/assistant/task/TaskView.kt
+++ b/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,