5 files changed, 23 insertions, 37 deletions
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index c6ca5871..6bcfbdc6 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -22,6 +22,7 @@ crowdin {
 
 android {
   compileOptions { isCoreLibraryDesugaringEnabled = true }
+  namespace = "app.passwordstore"
 
   defaultConfig {
     applicationId = "app.passwordstore"
@@ -30,13 +31,11 @@ android {
 
   buildFeatures {
     compose = true
-    composeOptions {
-      useLiveLiterals = false
-      kotlinCompilerExtensionVersion = libs.versions.composeCompiler.get()
-    }
   }
-
-  namespace = "app.passwordstore"
+  composeOptions {
+    useLiveLiterals = false
+    kotlinCompilerExtensionVersion = libs.versions.composeCompiler.get()
+  }
 }
 
 dependencies {
diff --git a/gradle.properties b/gradle.properties
index 51c9e082..924d6591 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -31,44 +31,28 @@ kapt.include.compile.classpath=false
 kotlin.compiler.preciseCompilationResultsBackup=true
 kotlin.build.report.output=file
 
-# Use R8 instead of ProGuard for code shrinking.
-android.enableR8.fullMode=true
-
 # Enable AndroidX
 android.useAndroidX=true
 
-# Enable non-transitive R class namespacing where each library only contains
-# references to the resources it declares instead of declarations plus all
-# transitive dependency references.
-android.nonTransitiveRClass=true
-
-# Only keep the single relevant constructor for types mentioned in XML files
-# instead of using a parameter wildcard which keeps them all.
-android.useMinimalKeepRules=true
-
-# Enable resource optimizations for release build
-android.enableResourceOptimizations=true
-
-# Compatibility with Gradle 8.0
-android.experimental.legacyTransform.forceNonIncremental=true
-
-# Default Android build features
-android.defaults.buildfeatures.buildconfig=false
-android.defaults.buildfeatures.aidl=false
-android.defaults.buildfeatures.renderscript=false
+# Disable mostly unused default Android build features
 android.defaults.buildfeatures.resvalues=false
 android.defaults.buildfeatures.shaders=false
+android.library.defaults.buildfeatures.androidresources=false
+
+# Disallow resolution of dependencies at configuration time
+android.dependencyResolutionAtConfigurationTime.disallow=true
+
+# Disallow parsing the manifest too early in the build process
+android.disableEarlyManifestParsing=true
 
-# Disable warnings about unsupported features, we know what we're doing
-android.suppressUnsupportedOptionWarnings=android.enableR8.fullMode,android.enableResourceOptimizations,android.nonTransitiveRClass,android.experimental.legacyTransform.forceNonIncremental,android.suppressUnsupportedOptionWarnings,android.sdk.channel
+# Disable warnings about unsupported features
+android.suppressUnsupportedOptionWarnings=android.dependencyResolutionAtConfigurationTime.disallow,android.disableEarlyManifestParsing,android.suppressUnsupportedOptionWarnings
 
 # Maven publishing
 GROUP=com.github.android-password-store
 
 # OSSRH sometimes struggles with slow deployments, so this makes Gradle
 # more tolerant to those delays.
-systemProp.org.gradle.internal.http.connectionTimeout=500000
-systemProp.org.gradle.internal.http.socketTimeout=500000
 SONATYPE_CONNECT_TIMEOUT_SECONDS=120
 SONATYPE_CLOSE_TIMEOUT_SECONDS=1800
 
diff --git a/passgen/diceware/build.gradle.kts b/passgen/diceware/build.gradle.kts
index 01441525..f7bb2fd2 100644
--- a/passgen/diceware/build.gradle.kts
+++ b/passgen/diceware/build.gradle.kts
@@ -8,8 +8,9 @@ plugins {
 }
 
 android {
-  sourceSets { getByName("test") { resources.srcDir("src/main/res/raw") } }
   namespace = "app.passwordstore.passgen.diceware"
+  buildFeatures { androidResources = true }
+  sourceSets { getByName("test") { resources.srcDir("src/main/res/raw") } }
 }
 
 dependencies {
diff --git a/ssh/build.gradle.kts b/ssh/build.gradle.kts
index ccda4a16..bfba59f5 100644
--- a/ssh/build.gradle.kts
+++ b/ssh/build.gradle.kts
@@ -11,6 +11,7 @@ plugins {
 
 android {
   namespace = "app.passwordstore.ssh"
+  buildFeatures { androidResources = true }
   sourceSets { getByName("test") { resources.srcDir("src/main/res/raw") } }
 }
 
diff --git a/ui-compose/build.gradle.kts b/ui-compose/build.gradle.kts
index 711ffa52..21f1e469 100644
--- a/ui-compose/build.gradle.kts
+++ b/ui-compose/build.gradle.kts
@@ -10,10 +10,11 @@ plugins {
 android {
   buildFeatures {
     compose = true
-    composeOptions {
-      useLiveLiterals = false
-      kotlinCompilerExtensionVersion = libs.versions.composeCompiler.get()
-    }
+    androidResources = true
+  }
+  composeOptions {
+    useLiveLiterals = false
+    kotlinCompilerExtensionVersion = libs.versions.composeCompiler.get()
   }
   namespace = "app.passwordstore.ui.compose"
 }