Clean up build scripts and use common extension to setup the defaults

Jonnathanjaquez · Oct 14, 2023 · 8bb8b00 · 8bb8b00
1 parent e863e1e
commit 8bb8b00
Show file tree

Hide file tree

Showing 8 changed files with 7 additions and 66 deletions.
diff --git a/app-common-io/build.gradle.kts b/app-common-io/build.gradle.kts
@@ -10,14 +10,8 @@ apply(plugin = "dagger.hilt.android.plugin")
 
 android {
     namespace = "${ProjectConfig.packageName}.common.io"
-    compileSdk = ProjectConfig.compileSdk
 
-    defaultConfig {
-        minSdk = ProjectConfig.minSdk
-        targetSdk = ProjectConfig.targetSdk
-
-        consumerProguardFiles("consumer-rules.pro")
-    }
+    setupLibraryDefaults()
 
     setupModuleBuildTypes()
 

diff --git a/app-common-pkgs/build.gradle.kts b/app-common-pkgs/build.gradle.kts
@@ -10,12 +10,8 @@ apply(plugin = "dagger.hilt.android.plugin")
 
 android {
     namespace = "${ProjectConfig.packageName}.common.pkgs"
-    compileSdk = ProjectConfig.compileSdk
 
-    defaultConfig {
-        minSdk = ProjectConfig.minSdk
-        targetSdk = ProjectConfig.targetSdk
-    }
+    setupLibraryDefaults()
 
     setupModuleBuildTypes()
 

diff --git a/app-common-root/build.gradle.kts b/app-common-root/build.gradle.kts
@@ -10,12 +10,8 @@ apply(plugin = "dagger.hilt.android.plugin")
 
 android {
     namespace = "${ProjectConfig.packageName}.common.root"
-    compileSdk = ProjectConfig.compileSdk
 
-    defaultConfig {
-        minSdk = ProjectConfig.minSdk
-        targetSdk = ProjectConfig.targetSdk
-    }
+    setupLibraryDefaults()
 
     setupModuleBuildTypes()
 

diff --git a/app-common-shell/build.gradle.kts b/app-common-shell/build.gradle.kts
@@ -10,12 +10,8 @@ apply(plugin = "dagger.hilt.android.plugin")
 
 android {
     namespace = "${ProjectConfig.packageName}.common.shell"
-    compileSdk = ProjectConfig.compileSdk
 
-    defaultConfig {
-        minSdk = ProjectConfig.minSdk
-        targetSdk = ProjectConfig.targetSdk
-    }
+    setupLibraryDefaults()
 
     setupModuleBuildTypes()
 

diff --git a/app-common-shizuku/build.gradle.kts b/app-common-shizuku/build.gradle.kts
@@ -10,12 +10,8 @@ apply(plugin = "dagger.hilt.android.plugin")
 
 android {
     namespace = "${ProjectConfig.packageName}.common.shizuku"
-    compileSdk = ProjectConfig.compileSdk
 
-    defaultConfig {
-        minSdk = ProjectConfig.minSdk
-        targetSdk = ProjectConfig.targetSdk
-    }
+    setupLibraryDefaults()
 
     setupModuleBuildTypes()
 

diff --git a/app-common-test/build.gradle.kts b/app-common-test/build.gradle.kts
@@ -7,12 +7,8 @@ plugins {
 
 android {
     namespace = "eu.darken.sdmse.common"
-    compileSdk = ProjectConfig.compileSdk
 
-    defaultConfig {
-        minSdk = ProjectConfig.minSdk
-        targetSdk = ProjectConfig.targetSdk
-    }
+    setupLibraryDefaults()
 
     setupModuleBuildTypes()
 

diff --git a/app-common/build.gradle.kts b/app-common/build.gradle.kts
@@ -10,12 +10,8 @@ apply(plugin = "dagger.hilt.android.plugin")
 
 android {
     namespace = "${ProjectConfig.packageName}.common"
-    compileSdk = ProjectConfig.compileSdk
 
-    defaultConfig {
-        minSdk = ProjectConfig.minSdk
-        targetSdk = ProjectConfig.targetSdk
-    }
+    setupLibraryDefaults()
 
     setupModuleBuildTypes()
 

diff --git a/buildSrc/src/main/java/ProjectConfig.kt b/buildSrc/src/main/java/ProjectConfig.kt
@@ -53,36 +53,7 @@ fun LibraryExtension.setupLibraryDefaults() {
 
     defaultConfig {
         minSdk = ProjectConfig.minSdk
-
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
-        consumerProguardFiles("consumer-rules.pro")
-    }
-
-    buildTypes {
-        release {
-            isMinifyEnabled = false
-            proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro")
-        }
-    }
-
-    compileOptions {
-        isCoreLibraryDesugaringEnabled = true
-        sourceCompatibility = JavaVersion.VERSION_17
-        targetCompatibility = JavaVersion.VERSION_17
-    }
-
-    kotlinOptions {
-        jvmTarget = "17"
-        freeCompilerArgs = freeCompilerArgs + listOf(
-            "-Xopt-in=kotlinx.coroutines.ExperimentalCoroutinesApi",
-            "-Xopt-in=kotlinx.coroutines.FlowPreview",
-            "-Xopt-in=kotlin.time.ExperimentalTime",
-            "-Xopt-in=kotlin.RequiresOptIn"
-        )
-    }
-
-    fun Packaging.() {
-        resources.excludes += "DebugProbesKt.bin"
     }
 }