Merge pull request #331 from boostcampwm2023/androie/feature/330

gradle 더 간소화
boostcampwm2023 · Dec 12, 2023 · 7a90c14 · 7a90c14
2 parents d126752 + 951335f
commit 7a90c14
Show file tree

Hide file tree

Showing 10 changed files with 21 additions and 135 deletions.
diff --git a/android/build-logic/src/main/kotlin/gradle/plugin/AndroidLibraryPlugin.kt b/android/build-logic/src/main/kotlin/gradle/plugin/AndroidLibraryPlugin.kt
@@ -20,7 +20,23 @@ internal class AndroidLibraryPlugin : Plugin<Project> {
 
         extensions.configure<LibraryExtension> {
             compileSdk = 34
-            defaultConfig.minSdk = 26
+
+            defaultConfig {
+                testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
+                consumerProguardFiles("consumer-rules.pro")
+                minSdk = 26
+            }
+
+            buildTypes {
+                release {
+                    isMinifyEnabled = false
+                    proguardFiles(
+                        getDefaultProguardFile("proguard-android-optimize.txt"),
+                        "proguard-rules.pro"
+                    )
+                }
+            }
+
             compileOptions {
                 sourceCompatibility = JavaVersion.VERSION_17
                 targetCompatibility = JavaVersion.VERSION_17

diff --git a/android/core/data/build.gradle.kts b/android/core/data/build.gradle.kts
@@ -1,5 +1,5 @@
-import java.util.Properties
 import java.io.FileInputStream
+import java.util.Properties
 
 @Suppress("DSL_SCOPE_VIOLATION") // TODO: Remove once KTIJ-19369 is fixed
 plugins {
@@ -16,20 +16,7 @@ android {
     namespace = "com.ohdodok.catchytape.core.data"
 
     defaultConfig {
-
         buildConfigField("String", "BASE_URL", localProperties["server.url"] as String)
-        testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
-        consumerProguardFiles("consumer-rules.pro")
-    }
-
-    buildTypes {
-        release {
-            isMinifyEnabled = false
-            proguardFiles(
-                getDefaultProguardFile("proguard-android-optimize.txt"),
-                "proguard-rules.pro"
-            )
-        }
     }
 
     kotlinOptions {

diff --git a/android/core/ui/build.gradle.kts b/android/core/ui/build.gradle.kts
@@ -7,22 +7,6 @@ plugins {
 android {
     namespace = "com.ohdodok.catchytape.core.ui"
 
-    defaultConfig {
-
-        testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
-        consumerProguardFiles("consumer-rules.pro")
-    }
-
-    buildTypes {
-        release {
-            isMinifyEnabled = false
-            proguardFiles(
-                getDefaultProguardFile("proguard-android-optimize.txt"),
-                "proguard-rules.pro"
-            )
-        }
-    }
-
     kotlinOptions {
         jvmTarget = "17"
     }

diff --git a/android/feature/home/build.gradle.kts b/android/feature/home/build.gradle.kts
@@ -6,21 +6,6 @@ plugins {
 android {
     namespace = "com.ohdodok.catchytape.feature.home"
 
-    defaultConfig {
-
-        testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
-        consumerProguardFiles("consumer-rules.pro")
-    }
-
-    buildTypes {
-        release {
-            isMinifyEnabled = false
-            proguardFiles(
-                getDefaultProguardFile("proguard-android-optimize.txt"),
-                "proguard-rules.pro"
-            )
-        }
-    }
     kotlinOptions {
         jvmTarget = "17"
     }

diff --git a/android/feature/login/build.gradle.kts b/android/feature/login/build.gradle.kts
@@ -1,5 +1,5 @@
-import java.util.Properties
 import java.io.FileInputStream
+import java.util.Properties
 
 @Suppress("DSL_SCOPE_VIOLATION") // TODO: Remove once KTIJ-19369 is fixed
 plugins {
@@ -14,21 +14,9 @@ android {
     namespace = "com.ohdodok.catchytape.feature.login"
 
     defaultConfig {
-
         buildConfigField("String", "GOOGLE_CLIENT_ID", localProperties["google.client.id"] as String)
-        testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
-        consumerProguardFiles("consumer-rules.pro")
     }
 
-    buildTypes {
-        release {
-            isMinifyEnabled = false
-            proguardFiles(
-                getDefaultProguardFile("proguard-android-optimize.txt"),
-                "proguard-rules.pro"
-            )
-        }
-    }
     kotlinOptions {
         jvmTarget = "17"
     }

diff --git a/android/feature/mypage/build.gradle.kts b/android/feature/mypage/build.gradle.kts
@@ -6,24 +6,8 @@ plugins {
 android {
     namespace = "com.ohdodok.catchytape.feature.mypage"
 
-    defaultConfig {
-        testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
-        consumerProguardFiles("consumer-rules.pro")
-    }
-
-    buildTypes {
-        buildTypes {
-            release {
-                isMinifyEnabled = false
-                proguardFiles(
-                    getDefaultProguardFile("proguard-android-optimize.txt"),
-                    "proguard-rules.pro"
-                )
-            }
-        }
-        kotlinOptions {
-            jvmTarget = "17"
-        }
+    kotlinOptions {
+        jvmTarget = "17"
     }
 }
 

diff --git a/android/feature/player/build.gradle.kts b/android/feature/player/build.gradle.kts
@@ -6,20 +6,6 @@ plugins {
 android {
     namespace = "com.ohdodok.catchytape.feature.player"
 
-    defaultConfig {
-        testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
-        consumerProguardFiles("consumer-rules.pro")
-    }
-
-    buildTypes {
-        release {
-            isMinifyEnabled = false
-            proguardFiles(
-                getDefaultProguardFile("proguard-android-optimize.txt"),
-                "proguard-rules.pro"
-            )
-        }
-    }
     kotlinOptions {
         jvmTarget = "17"
     }

diff --git a/android/feature/playlist/build.gradle.kts b/android/feature/playlist/build.gradle.kts
@@ -6,21 +6,6 @@ plugins {
 android {
     namespace = "com.ohdodok.catchytape.feature.playlist"
 
-    defaultConfig {
-
-        testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
-        consumerProguardFiles("consumer-rules.pro")
-    }
-
-    buildTypes {
-        release {
-            isMinifyEnabled = false
-            proguardFiles(
-                getDefaultProguardFile("proguard-android-optimize.txt"),
-                "proguard-rules.pro"
-            )
-        }
-    }
     kotlinOptions {
         jvmTarget = "17"
     }

diff --git a/android/feature/search/build.gradle.kts b/android/feature/search/build.gradle.kts
@@ -6,20 +6,6 @@ plugins {
 android {
     namespace = "com.ohdodok.catchytape.feature.search"
 
-    defaultConfig {
-        testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
-        consumerProguardFiles("consumer-rules.pro")
-    }
-
-    buildTypes {
-        release {
-            isMinifyEnabled = false
-            proguardFiles(
-                getDefaultProguardFile("proguard-android-optimize.txt"),
-                "proguard-rules.pro"
-            )
-        }
-    }
     kotlinOptions {
         jvmTarget = "17"
     }

diff --git a/android/feature/upload/build.gradle.kts b/android/feature/upload/build.gradle.kts
@@ -6,21 +6,6 @@ plugins {
 android {
     namespace = "com.ohdodok.catchytape.catchytape.upload"
 
-    defaultConfig {
-
-        testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
-        consumerProguardFiles("consumer-rules.pro")
-    }
-
-    buildTypes {
-        release {
-            isMinifyEnabled = false
-            proguardFiles(
-                getDefaultProguardFile("proguard-android-optimize.txt"),
-                "proguard-rules.pro"
-            )
-        }
-    }
     kotlinOptions {
         jvmTarget = "17"
     }