Merge pull request #128 from THT-Team/feature/TOP-108_agp_version

TOP-108 AGP, Compose, kotlin, targetSdkVersion 등 버전 최신화
THT-Team · Dec 28, 2024 · c4e064f · c4e064f
2 parents 9a9a35b + 73bd9f3
commit c4e064f
Show file tree

Hide file tree

Showing 18 changed files with 120 additions and 100 deletions.
diff --git a/.github/workflows/android_cd.yml b/.github/workflows/android_cd.yml
@@ -10,10 +10,10 @@ jobs:
         runs-on: ubuntu-latest
         steps:
             - uses: actions/checkout@v3
-            - name: set up JDK 11
+            - name: set up JDK 17
               uses: actions/setup-java@v3
               with:
-                  java-version: '11'
+                  java-version: '17'
                   distribution: 'temurin'
                   cache: gradle
 
@@ -26,13 +26,13 @@ jobs:
                   key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties', '**/buildSrc/**/*.kt') }}
                   restore-keys: |
                       ${{ runner.os }}-gradle-
-                      
+
             - name: Grant execute permission for gradlew
               run: chmod +x gradlew
-              
+
             - name: Access APP_GOOGLE_SERVICES_JSON
               run: echo '${{ secrets.APP_GOOGLE_SERVICES_JSON }}' > ./app/google-services.json
-              
+
             - name: Access DATA_GOOGLE_SERVICES_JSON
               run: echo '${{ secrets.DATA_GOOGLE_SERVICES_JSON }}' > ./data/google-services.json
 
@@ -63,22 +63,22 @@ jobs:
         runs-on: ubuntu-latest
         steps:
             - uses: actions/checkout@v3
-            - name: set up JDK 11
+            - name: set up JDK 17
               uses: actions/setup-java@v3
               with:
-                  java-version: '11'
+                  java-version: '17'
                   distribution: 'temurin'
                   cache: gradle
 
             - name: Grant execute permission for gradlew
               run: chmod +x gradlew
-              
+
             - name: Access APP_GOOGLE_SERVICES_JSON
               run: echo '${{ secrets.APP_GOOGLE_SERVICES_JSON }}' > ./app/google-services.json
-              
+
             - name: Access DATA_GOOGLE_SERVICES_JSON
               run: echo '${{ secrets.DATA_GOOGLE_SERVICES_JSON }}' > ./data/google-services.json
-              
+
             - name: Add Key Info into local.properties
               run: |
                   touch ./local.properties
@@ -110,10 +110,10 @@ jobs:
         runs-on: ubuntu-latest
         steps:
             - uses: actions/checkout@v3
-            - name: set up JDK 11
+            - name: set up JDK 17
               uses: actions/setup-java@v3
               with:
-                  java-version: '11'
+                  java-version: '17'
                   distribution: 'temurin'
                   cache: gradle
 
@@ -151,7 +151,7 @@ jobs:
 
             - name: Access APP_GOOGLE_SERVICES_JSON
               run: echo '${{ secrets.APP_GOOGLE_SERVICES_JSON }}' > ./app/google-services.json
-              
+
             - name: Access DATA_GOOGLE_SERVICES_JSON
               run: echo '${{ secrets.DATA_GOOGLE_SERVICES_JSON }}' > ./data/google-services.json
 

diff --git a/.github/workflows/android_ci.yml b/.github/workflows/android_ci.yml
@@ -9,10 +9,10 @@ jobs:
         runs-on: ubuntu-latest
         steps:
             - uses: actions/checkout@v3
-            - name: set up JDK 11
+            - name: set up JDK 17
               uses: actions/setup-java@v3
               with:
-                  java-version: '11'
+                  java-version: '17'
                   distribution: 'temurin'
                   cache: gradle
 
@@ -62,10 +62,10 @@ jobs:
         runs-on: ubuntu-latest
         steps:
             - uses: actions/checkout@v3
-            - name: set up JDK 11
+            - name: set up JDK 17
               uses: actions/setup-java@v3
               with:
-                  java-version: '11'
+                  java-version: '17'
                   distribution: 'temurin'
                   cache: gradle
 
@@ -109,10 +109,10 @@ jobs:
         runs-on: ubuntu-latest
         steps:
             - uses: actions/checkout@v3
-            - name: set up JDK 11
+            - name: set up JDK 17
               uses: actions/setup-java@v3
               with:
-                  java-version: '11'
+                  java-version: '17'
                   distribution: 'temurin'
                   cache: gradle
 

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -41,13 +41,14 @@ android {
         }
     }
     compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_1_8
-        targetCompatibility = JavaVersion.VERSION_1_8
+        sourceCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_17
     }
     kotlinOptions {
-        jvmTarget = "1.8"
+        jvmTarget = "17"
     }
     buildFeatures {
+        buildConfig = true
         viewBinding = true
     }
 }

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -1,8 +1,8 @@
 buildscript {
     extra.apply {
-        set("compileSdk", 34)
+        set("compileSdk", 35)
         set("minSdkVersion", 26)
-        set("targetSdk", 34)
+        set("targetSdk", 35)
         set("versionCode", 1)
         set("versionName", "1.0")
     }

diff --git a/core/compose-ui/build.gradle.kts b/core/compose-ui/build.gradle.kts
@@ -24,39 +24,46 @@ android {
         }
     }
     compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_1_8
-        targetCompatibility = JavaVersion.VERSION_1_8
+        sourceCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_17
     }
     kotlinOptions {
-        jvmTarget = "1.8"
+        jvmTarget = "17"
     }
     buildFeatures {
+        buildConfig = true
         compose = true
     }
     composeOptions {
-        kotlinCompilerExtensionVersion = "1.4.3"
+        kotlinCompilerExtensionVersion = "1.5.15"
     }
 }
 
 dependencies {
     implementation(project(":core:ui"))
 
-    implementation("androidx.core:core-ktx:1.9.0")
-    implementation("androidx.appcompat:appcompat:1.6.1")
-    implementation("com.google.android.material:material:1.9.0")
-    testImplementation("junit:junit:4.13.2")
-    androidTestImplementation("androidx.test.ext:junit:1.1.5")
-    androidTestImplementation("androidx.test.espresso:espresso-core:3.5.1")
+    implementation("com.google.accompanist:accompanist-placeholder:0.30.1")
 
+    implementation(libs.androidx.core)
+    implementation(libs.androidx.appcompat)
+    implementation(libs.android.material)
+    implementation(libs.androidx.constraintlayout)
+    testImplementation(libs.junit)
+    androidTestImplementation(libs.androidx.junit)
+    androidTestImplementation(libs.androidx.espresso)
 
-    implementation("androidx.activity:activity-compose:1.9.0")
-    implementation("androidx.compose.material:material:1.4.3")
-    implementation("androidx.compose.animation:animation:1.4.3")
-    implementation("androidx.compose.ui:ui-tooling:1.4.3")
-    implementation("androidx.lifecycle:lifecycle-viewmodel-compose:2.6.1")
-    androidTestImplementation("androidx.compose.ui:ui-test-junit4:1.4.3")
+    implementation(libs.jetpack.compose.material)
+    implementation(libs.jetpack.compose.animation)
+    implementation(libs.jetpack.compose.ui.tooling)
+    testImplementation(libs.jetpack.compose.ui.tooling.test)
+    implementation(libs.jetpack.compose.navigation)
+    implementation(libs.jetpack.compose.activity)
+    implementation(libs.jetpack.compose.viewmodel)
+    implementation(libs.jetpack.compose.coil)
+    implementation(libs.jetpack.compose.foundation)
+    implementation(libs.app.compat.theme.adpater)
 
-    implementation("com.google.accompanist:accompanist-placeholder:0.30.1")
+    implementation(libs.lottie.compose)
 
-    implementation("io.coil-kt:coil-compose:2.1.0")
+    implementation(libs.renderscript.intrinsics.replacement.toolkit)
 }
diff --git a/core/navigation/build.gradle.kts b/core/navigation/build.gradle.kts
@@ -21,11 +21,14 @@ android {
         }
     }
     compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_1_8
-        targetCompatibility = JavaVersion.VERSION_1_8
+        sourceCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_17
     }
     kotlinOptions {
-        jvmTarget = "1.8"
+        jvmTarget = "17"
+    }
+    buildFeatures {
+        buildConfig = true
     }
 }
 

diff --git a/core/ui/build.gradle.kts b/core/ui/build.gradle.kts
@@ -25,13 +25,14 @@ android {
         }
     }
     compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_1_8
-        targetCompatibility = JavaVersion.VERSION_1_8
+        sourceCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_17
     }
     kotlinOptions {
-        jvmTarget = "1.8"
+        jvmTarget = "17"
     }
     buildFeatures {
+        buildConfig = true
         viewBinding = true
     }
 }

diff --git a/data/build.gradle.kts b/data/build.gradle.kts
@@ -40,14 +40,15 @@ android {
         }
     }
     compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_1_8
-        targetCompatibility = JavaVersion.VERSION_1_8
+        sourceCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_17
     }
     kotlinOptions {
-        jvmTarget = "1.8"
+        jvmTarget = "17"
     }
 
     buildFeatures {
+        buildConfig = true
         viewBinding = true
         dataBinding = true
     }

diff --git a/detekt.gradle.kts b/detekt.gradle.kts
@@ -16,7 +16,7 @@ subprojects {
     apply (plugin = "io.gitlab.arturbosch.detekt")
 
     tasks.withType(Detekt).configureEach {
-        jvmTarget = "1.8"
+        jvmTarget = "17"
     }
 }
 

diff --git a/domain/build.gradle.kts b/domain/build.gradle.kts
@@ -4,8 +4,8 @@ plugins {
 }
 
 java {
-    sourceCompatibility = JavaVersion.VERSION_1_8
-    targetCompatibility = JavaVersion.VERSION_1_8
+    sourceCompatibility = JavaVersion.VERSION_17
+    targetCompatibility = JavaVersion.VERSION_17
 }
 
 dependencies {

diff --git a/feature/chat/build.gradle.kts b/feature/chat/build.gradle.kts
@@ -30,17 +30,18 @@ android {
         }
     }
     compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_1_8
-        targetCompatibility = JavaVersion.VERSION_1_8
+        sourceCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_17
     }
     kotlinOptions {
-        jvmTarget = "1.8"
+        jvmTarget = "17"
     }
     buildFeatures {
+        buildConfig = true
         compose = true
     }
     composeOptions {
-        kotlinCompilerExtensionVersion = "1.4.3"
+        kotlinCompilerExtensionVersion = "1.5.15"
     }
 }
 

diff --git a/feature/like/build.gradle.kts b/feature/like/build.gradle.kts
@@ -28,14 +28,15 @@ android {
         }
     }
     compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_1_8
-        targetCompatibility = JavaVersion.VERSION_1_8
+        sourceCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_17
     }
     kotlinOptions {
-        jvmTarget = "1.8"
+        jvmTarget = "17"
     }
 
     buildFeatures {
+        buildConfig = true
         viewBinding = true
     }
 }

diff --git a/feature/setting/build.gradle.kts b/feature/setting/build.gradle.kts
@@ -29,17 +29,18 @@ android {
         }
     }
     compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_1_8
-        targetCompatibility = JavaVersion.VERSION_1_8
+        sourceCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_17
     }
     kotlinOptions {
-        jvmTarget = "1.8"
+        jvmTarget = "17"
     }
     buildFeatures {
+        buildConfig = true
         compose = true
     }
     composeOptions {
-        kotlinCompilerExtensionVersion = "1.4.3"
+        kotlinCompilerExtensionVersion = "1.5.15"
     }
 }
 
@@ -72,6 +73,7 @@ dependencies {
     implementation(libs.jetpack.compose.activity)
     implementation(libs.jetpack.compose.viewmodel)
     implementation(libs.jetpack.compose.coil)
+    implementation(libs.jetpack.compose.foundation)
     implementation(libs.app.compat.theme.adpater)
 
     implementation(libs.lottie.compose)

diff --git a/feature/signin/build.gradle.kts b/feature/signin/build.gradle.kts
@@ -30,18 +30,19 @@ android {
         }
     }
     compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_1_8
-        targetCompatibility = JavaVersion.VERSION_1_8
+        sourceCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_17
     }
     kotlinOptions {
-        jvmTarget = "1.8"
+        jvmTarget = "17"
     }
     buildFeatures {
+        buildConfig = true
         viewBinding = true
         compose = true
     }
     composeOptions {
-        kotlinCompilerExtensionVersion = "1.4.3"
+        kotlinCompilerExtensionVersion = "1.5.15"
     }
 }
 
@@ -87,6 +88,7 @@ dependencies {
     implementation(libs.jetpack.compose.activity)
     implementation(libs.jetpack.compose.viewmodel)
     implementation(libs.jetpack.compose.coil)
+    implementation(libs.jetpack.compose.foundation)
 
     implementation(libs.lottie.compose)