From 928d5407d8949eae9798ced2163b7d7d9a8bd26e Mon Sep 17 00:00:00 2001
From: stevenyomi <95685115+stevenyomi@users.noreply.github.com>
Date: Wed, 21 Feb 2024 16:56:32 +0000
Subject: [PATCH] Adjust build features (#1436)

---
 buildSrc/src/main/kotlin/lib-android.gradle.kts  | 3 +--
 buildSrc/src/main/kotlin/lib-multisrc.gradle.kts | 9 ---------
 common.gradle                                    | 6 ------
 gradle.properties                                | 6 ++++--
 4 files changed, 5 insertions(+), 19 deletions(-)

diff --git a/buildSrc/src/main/kotlin/lib-android.gradle.kts b/buildSrc/src/main/kotlin/lib-android.gradle.kts
index 2bacfb8d3..9907ce7f0 100644
--- a/buildSrc/src/main/kotlin/lib-android.gradle.kts
+++ b/buildSrc/src/main/kotlin/lib-android.gradle.kts
@@ -14,8 +14,7 @@ android {
     namespace = "eu.kanade.tachiyomi.lib.${project.name}"
 
     buildFeatures {
-        resValues = false
-        shaders = false
+        androidResources = false
     }
 }
 
diff --git a/buildSrc/src/main/kotlin/lib-multisrc.gradle.kts b/buildSrc/src/main/kotlin/lib-multisrc.gradle.kts
index 3f6a77ba8..4193fd1ea 100644
--- a/buildSrc/src/main/kotlin/lib-multisrc.gradle.kts
+++ b/buildSrc/src/main/kotlin/lib-multisrc.gradle.kts
@@ -23,11 +23,6 @@ android {
         }
     }
 
-    buildFeatures {
-        resValues = false
-        shaders = false
-    }
-
     kotlinOptions {
         freeCompilerArgs += "-opt-in=kotlinx.serialization.ExperimentalSerializationApi"
     }
@@ -41,10 +36,6 @@ kotlinter {
     )
 }
 
-repositories {
-    mavenCentral()
-}
-
 // TODO: use versionCatalogs.named("libs") in Gradle 8.5
 val libs = project.extensions.getByType<VersionCatalogsExtension>().named("libs")
 dependencies {
diff --git a/common.gradle b/common.gradle
index 1cdcd23f8..73abf50c4 100644
--- a/common.gradle
+++ b/common.gradle
@@ -71,8 +71,6 @@ android {
     }
 
     buildFeatures {
-        resValues false
-        shaders false
         buildConfig true
     }
 
@@ -95,10 +93,6 @@ android {
     }
 }
 
-repositories {
-    mavenCentral()
-}
-
 dependencies {
     if (theme != null) implementation(theme) // Overrides core launcher icons
     implementation(project(":core"))
diff --git a/gradle.properties b/gradle.properties
index 57d471ce1..fd00c0bce 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -21,5 +21,7 @@ org.gradle.caching=true
 
 # Enable AndroidX dependencies
 android.useAndroidX=true
-android.nonTransitiveRClass=false
-android.nonFinalResIds=false
+
+android.enableBuildConfigAsBytecode=true
+android.defaults.buildfeatures.resvalues=false
+android.defaults.buildfeatures.shaders=false