From 802337a8c5ec7b189b6a8e118060cec21f3893cb Mon Sep 17 00:00:00 2001
From: youlalala <reyoula@gmail.com>
Date: Thu, 14 Dec 2023 18:24:02 +0900
Subject: [PATCH 1/2] =?UTF-8?q?refactor=20:=20kotlinOptions=20=EC=B6=94?=
 =?UTF-8?q?=EC=B6=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 android/build-logic/build.gradle.kts      | 8 ++++++++
 android/core/data/build.gradle.kts        | 4 ----
 android/core/ui/build.gradle.kts          | 4 ----
 android/feature/home/build.gradle.kts     | 4 ----
 android/feature/login/build.gradle.kts    | 3 ---
 android/feature/mypage/build.gradle.kts   | 4 ----
 android/feature/player/build.gradle.kts   | 4 ----
 android/feature/playlist/build.gradle.kts | 4 ----
 android/feature/search/build.gradle.kts   | 4 ----
 android/feature/upload/build.gradle.kts   | 4 ----
 10 files changed, 8 insertions(+), 35 deletions(-)

diff --git a/android/build-logic/build.gradle.kts b/android/build-logic/build.gradle.kts
index 461b39a..99f8fc8 100644
--- 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
index a8c4b4d..23a0d4d 100644
--- 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/ui/build.gradle.kts b/android/core/ui/build.gradle.kts
index f52498a..5cbcdfd 100644
--- 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
index d5ec7a6..66a0499 100644
--- 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
index e8c4b19..c6be47b 100644
--- 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
index 50f9ceb..9dccce4 100644
--- 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
index 60cbdc1..fcfe2d0 100644
--- 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
index 9dab8be..d3ef781 100644
--- 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
index 3473d3a..b2c0d48 100644
--- 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
index e8aeac2..693f064 100644
--- 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 {

From 776b4b45188277bc6abb0dc09ffb7a6f3bb8897b Mon Sep 17 00:00:00 2001
From: youlalala <reyoula@gmail.com>
Date: Thu, 14 Dec 2023 18:36:26 +0900
Subject: [PATCH 2/2] =?UTF-8?q?chore=20:=20junit=20=EC=82=AD=EC=A0=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 android/core/domain/build.gradle.kts | 2 --
 1 file changed, 2 deletions(-)

diff --git a/android/core/domain/build.gradle.kts b/android/core/domain/build.gradle.kts
index 084c287..a202fe3 100644
--- 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)