Update resource configuration.

ReactiveCircus · Sep 26, 2024 · 1c4fea8 · 1c4fea8
1 parent 9b428a3
commit 1c4fea8
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 18 deletions.
diff --git a/...gic/src/main/kotlin/io/github/reactivecircus/kstreamlined/buildlogic/androidBuildLogic.kt b/...gic/src/main/kotlin/io/github/reactivecircus/kstreamlined/buildlogic/androidBuildLogic.kt
@@ -7,10 +7,12 @@ import com.android.build.api.variant.HasUnitTestBuilder
 import com.android.build.api.variant.LibraryAndroidComponentsExtension
 import com.android.build.gradle.TestExtension
 import com.android.build.gradle.TestedExtension
+import com.android.build.gradle.internal.dsl.BaseAppModuleExtension
 import org.gradle.accessors.dm.LibrariesForLibs
 import org.gradle.api.JavaVersion
 import org.gradle.api.Project
 import org.gradle.kotlin.dsl.the
+import java.io.File
 
 /**
  * Apply baseline configurations on an Application or Library project.
@@ -22,9 +24,6 @@ internal fun TestedExtension.configureCommonAndroidExtension(project: Project) {
     defaultConfig {
         minSdk = AndroidSdk.minSdk
         targetSdk = AndroidSdk.targetSdk
-
-        // only support English for now
-        resourceConfigurations.add("en")
     }
 
     testOptions.animationsDisabled = true
@@ -51,6 +50,27 @@ internal fun TestedExtension.configureCommonAndroidExtension(project: Project) {
     }
 }
 
+/**
+ * Apply baseline configurations on an Application project.
+ */
+internal fun BaseAppModuleExtension.configureAndroidApplicationExtension(project: Project) {
+    androidResources {
+        @Suppress("UnstableApiUsage")
+        localeFilters += "en"
+    }
+
+    lint {
+        quiet = false
+        ignoreWarnings = false
+        htmlReport = true
+        xmlReport = true
+        htmlOutput = File("${project.layout.buildDirectory.get()}/reports/lint/lint-reports.html")
+        xmlOutput = File("${project.layout.buildDirectory.get()}/reports/lint/lint-reports.xml")
+        checkDependencies = true
+        ignoreTestSources = true
+    }
+}
+
 /**
  * Apply baseline configurations on an Android Test project.
  */
@@ -61,9 +81,6 @@ internal fun TestExtension.configureAndroidTestExtension() {
     defaultConfig {
         minSdk = AndroidSdk.minSdk
         targetSdk = AndroidSdk.targetSdk
-
-        // only support English for now
-        resourceConfigurations.add("en")
     }
 
     compileOptions {

diff --git a/...b/reactivecircus/kstreamlined/buildlogic/convention/AndroidApplicationConventionPlugin.kt b/...b/reactivecircus/kstreamlined/buildlogic/convention/AndroidApplicationConventionPlugin.kt
@@ -2,6 +2,7 @@ package io.github.reactivecircus.kstreamlined.buildlogic.convention
 
 import com.android.build.api.variant.ApplicationAndroidComponentsExtension
 import com.android.build.gradle.internal.dsl.BaseAppModuleExtension
+import io.github.reactivecircus.kstreamlined.buildlogic.configureAndroidApplicationExtension
 import io.github.reactivecircus.kstreamlined.buildlogic.configureAndroidApplicationVariants
 import io.github.reactivecircus.kstreamlined.buildlogic.configureCommonAndroidExtension
 import io.github.reactivecircus.kstreamlined.buildlogic.configureDetekt
@@ -12,7 +13,6 @@ import org.gradle.api.Plugin
 import org.gradle.api.Project
 import org.gradle.kotlin.dsl.configure
 import org.jetbrains.kotlin.gradle.dsl.KotlinAndroidProjectExtension
-import java.io.File
 
 internal class AndroidApplicationConventionPlugin : Plugin<Project> {
     override fun apply(target: Project) = with(target) {
@@ -27,17 +27,7 @@ internal class AndroidApplicationConventionPlugin : Plugin<Project> {
 
         extensions.configure<BaseAppModuleExtension> {
             configureCommonAndroidExtension(target)
-
-            lint {
-                quiet = false
-                ignoreWarnings = false
-                htmlReport = true
-                xmlReport = true
-                htmlOutput = File("${project.layout.buildDirectory.get()}/reports/lint/lint-reports.html")
-                xmlOutput = File("${project.layout.buildDirectory.get()}/reports/lint/lint-reports.xml")
-                checkDependencies = true
-                ignoreTestSources = true
-            }
+            configureAndroidApplicationExtension(target)
         }
 
         extensions.configure<ApplicationAndroidComponentsExtension> {