Merge pull request #348 from boostcampwm2023/android/feature/347

gradle kotlin options 추출
boostcampwm2023 · Dec 14, 2023 · 71e4c19 · 71e4c19
2 parents 50128e5 + 776b4b4
commit 71e4c19
Show file tree

Hide file tree

Showing 11 changed files with 8 additions and 37 deletions.
diff --git a/android/build-logic/build.gradle.kts b/android/build-logic/build.gradle.kts
@@ -1,7 +1,15 @@
+import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
+
 plugins {
     `kotlin-dsl`
 }
 
+tasks.withType<KotlinCompile>().configureEach {
+    kotlinOptions {
+        jvmTarget = "17"
+    }
+}
+
 dependencies {
     implementation(libs.android.gradlePlugin)
     implementation(libs.kotlin.gradlePlugin)

diff --git a/android/core/data/build.gradle.kts b/android/core/data/build.gradle.kts
@@ -19,10 +19,6 @@ android {
         buildConfigField("String", "BASE_URL", localProperties["server.url"] as String)
     }
 
-    kotlinOptions {
-        jvmTarget = "17"
-    }
-
     buildFeatures {
         buildConfig = true
     }

diff --git a/android/core/domain/build.gradle.kts b/android/core/domain/build.gradle.kts
@@ -20,8 +20,6 @@ dependencies {
 
     implementation(libs.inject)
 
-    // fixme : kotest 사용이 확정되면 junit 지우기
-    testImplementation(libs.junit)
     testImplementation(libs.kotest.runner)
     testImplementation(libs.kotest.property)
     testImplementation(libs.kotest.extentions.junitxml)

diff --git a/android/core/ui/build.gradle.kts b/android/core/ui/build.gradle.kts
@@ -7,10 +7,6 @@ plugins {
 android {
     namespace = "com.ohdodok.catchytape.core.ui"
 
-    kotlinOptions {
-        jvmTarget = "17"
-    }
-
     buildFeatures {
         dataBinding = true
     }

diff --git a/android/feature/home/build.gradle.kts b/android/feature/home/build.gradle.kts
@@ -5,10 +5,6 @@ plugins {
 
 android {
     namespace = "com.ohdodok.catchytape.feature.home"
-
-    kotlinOptions {
-        jvmTarget = "17"
-    }
 }
 
 dependencies {

diff --git a/android/feature/login/build.gradle.kts b/android/feature/login/build.gradle.kts
@@ -17,9 +17,6 @@ android {
         buildConfigField("String", "GOOGLE_CLIENT_ID", localProperties["google.client.id"] as String)
     }
 
-    kotlinOptions {
-        jvmTarget = "17"
-    }
     buildFeatures {
         buildConfig = true
     }

diff --git a/android/feature/mypage/build.gradle.kts b/android/feature/mypage/build.gradle.kts
@@ -5,10 +5,6 @@ plugins {
 
 android {
     namespace = "com.ohdodok.catchytape.feature.mypage"
-
-    kotlinOptions {
-        jvmTarget = "17"
-    }
 }
 
 dependencies {

diff --git a/android/feature/player/build.gradle.kts b/android/feature/player/build.gradle.kts
@@ -5,10 +5,6 @@ plugins {
 
 android {
     namespace = "com.ohdodok.catchytape.feature.player"
-
-    kotlinOptions {
-        jvmTarget = "17"
-    }
 }
 
 dependencies {

diff --git a/android/feature/playlist/build.gradle.kts b/android/feature/playlist/build.gradle.kts
@@ -5,10 +5,6 @@ plugins {
 
 android {
     namespace = "com.ohdodok.catchytape.feature.playlist"
-
-    kotlinOptions {
-        jvmTarget = "17"
-    }
 }
 
 dependencies {

diff --git a/android/feature/search/build.gradle.kts b/android/feature/search/build.gradle.kts
@@ -5,10 +5,6 @@ plugins {
 
 android {
     namespace = "com.ohdodok.catchytape.feature.search"
-
-    kotlinOptions {
-        jvmTarget = "17"
-    }
 }
 
 dependencies {

diff --git a/android/feature/upload/build.gradle.kts b/android/feature/upload/build.gradle.kts
@@ -5,10 +5,6 @@ plugins {
 
 android {
     namespace = "com.ohdodok.catchytape.catchytape.upload"
-
-    kotlinOptions {
-        jvmTarget = "17"
-    }
 }
 
 dependencies {