Merge pull request #9979 from wmontwe/bump-gradle

rafaeltonholo · web-flow · commit 4c4025f5e326 · 2025-10-21T10:22:15.000-03:00
chore(deps): bump Gradle from 8.14.3 to 9.1.0
diff --git a/build-plugin/src/main/kotlin/AndroidExtension.kt b/build-plugin/src/main/kotlin/AndroidExtension.kt
@@ -28,12 +28,6 @@ internal fun CommonExtension<*, *, *, *, *, *>.configureSharedConfig(project: Pr
         checkReleaseBuilds = System.getenv("CI_CHECK_RELEASE_BUILDS")?.toBoolean() ?: true
     }
 
-    testOptions {
-        unitTests {
-            isIncludeAndroidResources = true
-        }
-    }
-
     packaging {
         resources {
             excludes += listOf(
diff --git a/build-plugin/src/main/kotlin/thunderbird.library.android.gradle.kts b/build-plugin/src/main/kotlin/thunderbird.library.android.gradle.kts
@@ -15,12 +15,6 @@ android {
     kotlinOptions {
         jvmTarget = ThunderbirdProjectConfig.Compiler.javaCompatibility.toString()
     }
-
-    testOptions {
-        unitTests {
-            isIncludeAndroidResources = true
-        }
-    }
 }
 
 kotlin {
diff --git a/core/ui/compose/common/build.gradle.kts b/core/ui/compose/common/build.gradle.kts
@@ -5,6 +5,12 @@ plugins {
 android {
     namespace = "app.k9mail.core.ui.compose.common"
     resourcePrefix = "core_ui_common_"
+
+    testOptions {
+        unitTests {
+            isIncludeAndroidResources = true
+        }
+    }
 }
 
 dependencies {
diff --git a/core/ui/compose/designsystem/build.gradle.kts b/core/ui/compose/designsystem/build.gradle.kts
@@ -6,6 +6,12 @@ plugins {
 android {
     namespace = "app.k9mail.core.ui.compose.designsystem"
     resourcePrefix = "designsystem_"
+
+    testOptions {
+        unitTests {
+            isIncludeAndroidResources = true
+        }
+    }
 }
 
 dependencies {
diff --git a/feature/account/edit/build.gradle.kts b/feature/account/edit/build.gradle.kts
@@ -5,6 +5,12 @@ plugins {
 android {
     namespace = "app.k9mail.feature.account.edit"
     resourcePrefix = "account_edit_"
+
+    testOptions {
+        unitTests {
+            isIncludeAndroidResources = true
+        }
+    }
 }
 
 dependencies {
diff --git a/feature/account/oauth/build.gradle.kts b/feature/account/oauth/build.gradle.kts
@@ -5,6 +5,12 @@ plugins {
 android {
     namespace = "app.k9mail.feature.account.oauth"
     resourcePrefix = "account_oauth_"
+
+    testOptions {
+        unitTests {
+            isIncludeAndroidResources = true
+        }
+    }
 }
 
 dependencies {
diff --git a/feature/account/server/settings/build.gradle.kts b/feature/account/server/settings/build.gradle.kts
@@ -5,6 +5,12 @@ plugins {
 android {
     namespace = "app.k9mail.feature.account.server.settings"
     resourcePrefix = "account_server_settings_"
+
+    testOptions {
+        unitTests {
+            isIncludeAndroidResources = true
+        }
+    }
 }
 
 dependencies {
diff --git a/feature/account/server/validation/build.gradle.kts b/feature/account/server/validation/build.gradle.kts
@@ -5,6 +5,12 @@ plugins {
 android {
     namespace = "app.k9mail.feature.account.server.validation"
     resourcePrefix = "account_server_validation_"
+
+    testOptions {
+        unitTests {
+            isIncludeAndroidResources = true
+        }
+    }
 }
 
 dependencies {
diff --git a/feature/account/settings/impl/build.gradle.kts b/feature/account/settings/impl/build.gradle.kts
@@ -5,6 +5,12 @@ plugins {
 android {
     namespace = "net.thunderbird.feature.account.settings"
     resourcePrefix = "account_settings_"
+
+    testOptions {
+        unitTests {
+            isIncludeAndroidResources = true
+        }
+    }
 }
 
 dependencies {
diff --git a/feature/account/setup/build.gradle.kts b/feature/account/setup/build.gradle.kts
@@ -5,6 +5,12 @@ plugins {
 android {
     namespace = "app.k9mail.feature.account.setup"
     resourcePrefix = "account_setup_"
+
+    testOptions {
+        unitTests {
+            isIncludeAndroidResources = true
+        }
+    }
 }
 
 dependencies {
diff --git a/feature/funding/googleplay/build.gradle.kts b/feature/funding/googleplay/build.gradle.kts
@@ -5,6 +5,12 @@ plugins {
 android {
     namespace = "app.k9mail.feature.funding.googleplay"
     resourcePrefix = "funding_googleplay_"
+
+    testOptions {
+        unitTests {
+            isIncludeAndroidResources = true
+        }
+    }
 }
 
 dependencies {
diff --git a/feature/migration/qrcode/build.gradle.kts b/feature/migration/qrcode/build.gradle.kts
@@ -5,6 +5,12 @@ plugins {
 android {
     namespace = "app.k9mail.feature.migration.qrcode"
     resourcePrefix = "migration_qrcode_"
+
+    testOptions {
+        unitTests {
+            isIncludeAndroidResources = true
+        }
+    }
 }
 
 dependencies {
diff --git a/feature/navigation/drawer/dropdown/build.gradle.kts b/feature/navigation/drawer/dropdown/build.gradle.kts
@@ -5,6 +5,12 @@ plugins {
 android {
     namespace = "net.thunderbird.feature.navigation.drawer.dropdown"
     resourcePrefix = "navigation_drawer_dropdown_"
+
+    testOptions {
+        unitTests {
+            isIncludeAndroidResources = true
+        }
+    }
 }
 
 dependencies {
diff --git a/feature/navigation/drawer/siderail/build.gradle.kts b/feature/navigation/drawer/siderail/build.gradle.kts
@@ -5,6 +5,12 @@ plugins {
 android {
     namespace = "net.thunderbird.feature.navigation.drawer.siderail"
     resourcePrefix = "navigation_drawer_siderail_"
+
+    testOptions {
+        unitTests {
+            isIncludeAndroidResources = true
+        }
+    }
 }
 
 dependencies {
diff --git a/feature/notification/api/build.gradle.kts b/feature/notification/api/build.gradle.kts
@@ -40,6 +40,7 @@ kotlin {
 
 android {
     namespace = "net.thunderbird.feature.notification.api"
+
     testOptions {
         unitTests {
             isIncludeAndroidResources = true
diff --git a/feature/onboarding/migration/thunderbird/build.gradle.kts b/feature/onboarding/migration/thunderbird/build.gradle.kts
@@ -5,6 +5,12 @@ plugins {
 android {
     namespace = "app.k9mail.feature.onboarding.migration.thunderbird"
     resourcePrefix = "onboarding_migration_thunderbird_"
+
+    testOptions {
+        unitTests {
+            isIncludeAndroidResources = true
+        }
+    }
 }
 
 dependencies {
diff --git a/feature/widget/unread/build.gradle.kts b/feature/widget/unread/build.gradle.kts
@@ -16,4 +16,10 @@ dependencies {
 
 android {
     namespace = "app.k9mail.feature.widget.unread"
+
+    testOptions {
+        unitTests {
+            isIncludeAndroidResources = true
+        }
+    }
 }
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -61,7 +61,7 @@ detektPluginCompose = "0.4.27"
 fastAdapter = "5.7.0"
 forkhandlesBom = "2.23.0.0"
 glide = "4.16.0"
-gradle = "8.14.2"
+gradle = "9.1.0"
 icu4j = "77.1"
 javaDiffUtils = "4.16"
 jcipAnnotations = "1.0"
@@ -79,7 +79,7 @@ koinBom = "4.1.1"
 konsist = "0.17.3"
 kotlinBom = "2.2.20"
 # Needs to match the version used by Gradle, just check with `./gradlew --version`
-kotlinGradleBom = "2.0.21"
+kotlinGradleBom = "2.2.0"
 kotlinKsp = "2.2.20-2.0.4"
 kotlinxCoroutines = "1.10.2"
 kotlinxCollectionsImmutable = "0.4.0"
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.1.0-all.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/gradlew b/gradlew
diff --git a/gradlew.bat b/gradlew.bat
diff --git a/legacy/core/build.gradle.kts b/legacy/core/build.gradle.kts
@@ -73,4 +73,10 @@ android {
     buildFeatures {
         buildConfig = true
     }
+
+    testOptions {
+        unitTests {
+            isIncludeAndroidResources = true
+        }
+    }
 }
diff --git a/legacy/storage/build.gradle.kts b/legacy/storage/build.gradle.kts
@@ -27,4 +27,10 @@ dependencies {
 
 android {
     namespace = "com.fsck.k9.storage"
+
+    testOptions {
+        unitTests {
+            isIncludeAndroidResources = true
+        }
+    }
 }
diff --git a/legacy/ui/legacy/build.gradle.kts b/legacy/ui/legacy/build.gradle.kts
@@ -96,4 +96,10 @@ android {
     buildFeatures {
         buildConfig = true
     }
+
+    testOptions {
+        unitTests {
+            isIncludeAndroidResources = true
+        }
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -15,12 +15,6 @@ android {`
`15`	`15`	`kotlinOptions {`
`16`	`16`	`jvmTarget = ThunderbirdProjectConfig.Compiler.javaCompatibility.toString()`
`17`	`17`	`}`
`18`		`-`
`19`		`- testOptions {`
`20`		`- unitTests {`
`21`		`- isIncludeAndroidResources = true`
`22`		`- }`
`23`		`- }`
`24`	`18`	`}`
`25`	`19`
`26`	`20`	`kotlin {`