Skip to content

Commit c4e064f

Browse files
cwj-ccwj-c
authored
Merge pull request #128 from THT-Team/feature/TOP-108_agp_version
TOP-108 AGP, Compose, kotlin, targetSdkVersion 등 버전 최신화
2 parents 9a9a35b + 73bd9f3 commit c4e064f

18 files changed

Lines changed: 120 additions & 100 deletions

‎.github/workflows/android_cd.yml‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@ jobs:
1010
runs-on: ubuntu-latest
1111
steps:
1212
- uses: actions/checkout@v3
13-
- name: set up JDK 11
13+
- name: set up JDK 17
1414
uses: actions/setup-java@v3
1515
with:
16-
java-version: '11'
16+
java-version: '17'
1717
distribution: 'temurin'
1818
cache: gradle
1919

@@ -26,13 +26,13 @@ jobs:
2626
key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties', '**/buildSrc/**/*.kt') }}
2727
restore-keys: |
2828
${{ runner.os }}-gradle-
29-
29+
3030
- name: Grant execute permission for gradlew
3131
run: chmod +x gradlew
32-
32+
3333
- name: Access APP_GOOGLE_SERVICES_JSON
3434
run: echo '${{ secrets.APP_GOOGLE_SERVICES_JSON }}' > ./app/google-services.json
35-
35+
3636
- name: Access DATA_GOOGLE_SERVICES_JSON
3737
run: echo '${{ secrets.DATA_GOOGLE_SERVICES_JSON }}' > ./data/google-services.json
3838

@@ -63,22 +63,22 @@ jobs:
6363
runs-on: ubuntu-latest
6464
steps:
6565
- uses: actions/checkout@v3
66-
- name: set up JDK 11
66+
- name: set up JDK 17
6767
uses: actions/setup-java@v3
6868
with:
69-
java-version: '11'
69+
java-version: '17'
7070
distribution: 'temurin'
7171
cache: gradle
7272

7373
- name: Grant execute permission for gradlew
7474
run: chmod +x gradlew
75-
75+
7676
- name: Access APP_GOOGLE_SERVICES_JSON
7777
run: echo '${{ secrets.APP_GOOGLE_SERVICES_JSON }}' > ./app/google-services.json
78-
78+
7979
- name: Access DATA_GOOGLE_SERVICES_JSON
8080
run: echo '${{ secrets.DATA_GOOGLE_SERVICES_JSON }}' > ./data/google-services.json
81-
81+
8282
- name: Add Key Info into local.properties
8383
run: |
8484
touch ./local.properties
@@ -110,10 +110,10 @@ jobs:
110110
runs-on: ubuntu-latest
111111
steps:
112112
- uses: actions/checkout@v3
113-
- name: set up JDK 11
113+
- name: set up JDK 17
114114
uses: actions/setup-java@v3
115115
with:
116-
java-version: '11'
116+
java-version: '17'
117117
distribution: 'temurin'
118118
cache: gradle
119119

@@ -151,7 +151,7 @@ jobs:
151151

152152
- name: Access APP_GOOGLE_SERVICES_JSON
153153
run: echo '${{ secrets.APP_GOOGLE_SERVICES_JSON }}' > ./app/google-services.json
154-
154+
155155
- name: Access DATA_GOOGLE_SERVICES_JSON
156156
run: echo '${{ secrets.DATA_GOOGLE_SERVICES_JSON }}' > ./data/google-services.json
157157

‎.github/workflows/android_ci.yml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@ jobs:
99
runs-on: ubuntu-latest
1010
steps:
1111
- uses: actions/checkout@v3
12-
- name: set up JDK 11
12+
- name: set up JDK 17
1313
uses: actions/setup-java@v3
1414
with:
15-
java-version: '11'
15+
java-version: '17'
1616
distribution: 'temurin'
1717
cache: gradle
1818

@@ -62,10 +62,10 @@ jobs:
6262
runs-on: ubuntu-latest
6363
steps:
6464
- uses: actions/checkout@v3
65-
- name: set up JDK 11
65+
- name: set up JDK 17
6666
uses: actions/setup-java@v3
6767
with:
68-
java-version: '11'
68+
java-version: '17'
6969
distribution: 'temurin'
7070
cache: gradle
7171

@@ -109,10 +109,10 @@ jobs:
109109
runs-on: ubuntu-latest
110110
steps:
111111
- uses: actions/checkout@v3
112-
- name: set up JDK 11
112+
- name: set up JDK 17
113113
uses: actions/setup-java@v3
114114
with:
115-
java-version: '11'
115+
java-version: '17'
116116
distribution: 'temurin'
117117
cache: gradle
118118

‎app/build.gradle.kts‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,13 +41,14 @@ android {
4141
}
4242
}
4343
compileOptions {
44-
sourceCompatibility = JavaVersion.VERSION_1_8
45-
targetCompatibility = JavaVersion.VERSION_1_8
44+
sourceCompatibility = JavaVersion.VERSION_17
45+
targetCompatibility = JavaVersion.VERSION_17
4646
}
4747
kotlinOptions {
48-
jvmTarget = "1.8"
48+
jvmTarget = "17"
4949
}
5050
buildFeatures {
51+
buildConfig = true
5152
viewBinding = true
5253
}
5354
}

‎build.gradle.kts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
buildscript {
22
extra.apply {
3-
set("compileSdk", 34)
3+
set("compileSdk", 35)
44
set("minSdkVersion", 26)
5-
set("targetSdk", 34)
5+
set("targetSdk", 35)
66
set("versionCode", 1)
77
set("versionName", "1.0")
88
}

‎core/compose-ui/build.gradle.kts‎

Lines changed: 25 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -24,39 +24,46 @@ android {
2424
}
2525
}
2626
compileOptions {
27-
sourceCompatibility = JavaVersion.VERSION_1_8
28-
targetCompatibility = JavaVersion.VERSION_1_8
27+
sourceCompatibility = JavaVersion.VERSION_17
28+
targetCompatibility = JavaVersion.VERSION_17
2929
}
3030
kotlinOptions {
31-
jvmTarget = "1.8"
31+
jvmTarget = "17"
3232
}
3333
buildFeatures {
34+
buildConfig = true
3435
compose = true
3536
}
3637
composeOptions {
37-
kotlinCompilerExtensionVersion = "1.4.3"
38+
kotlinCompilerExtensionVersion = "1.5.15"
3839
}
3940
}
4041

4142
dependencies {
4243
implementation(project(":core:ui"))
4344

44-
implementation("androidx.core:core-ktx:1.9.0")
45-
implementation("androidx.appcompat:appcompat:1.6.1")
46-
implementation("com.google.android.material:material:1.9.0")
47-
testImplementation("junit:junit:4.13.2")
48-
androidTestImplementation("androidx.test.ext:junit:1.1.5")
49-
androidTestImplementation("androidx.test.espresso:espresso-core:3.5.1")
45+
implementation("com.google.accompanist:accompanist-placeholder:0.30.1")
5046

47+
implementation(libs.androidx.core)
48+
implementation(libs.androidx.appcompat)
49+
implementation(libs.android.material)
50+
implementation(libs.androidx.constraintlayout)
51+
testImplementation(libs.junit)
52+
androidTestImplementation(libs.androidx.junit)
53+
androidTestImplementation(libs.androidx.espresso)
5154

52-
implementation("androidx.activity:activity-compose:1.9.0")
53-
implementation("androidx.compose.material:material:1.4.3")
54-
implementation("androidx.compose.animation:animation:1.4.3")
55-
implementation("androidx.compose.ui:ui-tooling:1.4.3")
56-
implementation("androidx.lifecycle:lifecycle-viewmodel-compose:2.6.1")
57-
androidTestImplementation("androidx.compose.ui:ui-test-junit4:1.4.3")
55+
implementation(libs.jetpack.compose.material)
56+
implementation(libs.jetpack.compose.animation)
57+
implementation(libs.jetpack.compose.ui.tooling)
58+
testImplementation(libs.jetpack.compose.ui.tooling.test)
59+
implementation(libs.jetpack.compose.navigation)
60+
implementation(libs.jetpack.compose.activity)
61+
implementation(libs.jetpack.compose.viewmodel)
62+
implementation(libs.jetpack.compose.coil)
63+
implementation(libs.jetpack.compose.foundation)
64+
implementation(libs.app.compat.theme.adpater)
5865

59-
implementation("com.google.accompanist:accompanist-placeholder:0.30.1")
66+
implementation(libs.lottie.compose)
6067

61-
implementation("io.coil-kt:coil-compose:2.1.0")
68+
implementation(libs.renderscript.intrinsics.replacement.toolkit)
6269
}

‎core/navigation/build.gradle.kts‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,14 @@ android {
2121
}
2222
}
2323
compileOptions {
24-
sourceCompatibility = JavaVersion.VERSION_1_8
25-
targetCompatibility = JavaVersion.VERSION_1_8
24+
sourceCompatibility = JavaVersion.VERSION_17
25+
targetCompatibility = JavaVersion.VERSION_17
2626
}
2727
kotlinOptions {
28-
jvmTarget = "1.8"
28+
jvmTarget = "17"
29+
}
30+
buildFeatures {
31+
buildConfig = true
2932
}
3033
}
3134

‎core/ui/build.gradle.kts‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,13 +25,14 @@ android {
2525
}
2626
}
2727
compileOptions {
28-
sourceCompatibility = JavaVersion.VERSION_1_8
29-
targetCompatibility = JavaVersion.VERSION_1_8
28+
sourceCompatibility = JavaVersion.VERSION_17
29+
targetCompatibility = JavaVersion.VERSION_17
3030
}
3131
kotlinOptions {
32-
jvmTarget = "1.8"
32+
jvmTarget = "17"
3333
}
3434
buildFeatures {
35+
buildConfig = true
3536
viewBinding = true
3637
}
3738
}

‎data/build.gradle.kts‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,14 +40,15 @@ android {
4040
}
4141
}
4242
compileOptions {
43-
sourceCompatibility = JavaVersion.VERSION_1_8
44-
targetCompatibility = JavaVersion.VERSION_1_8
43+
sourceCompatibility = JavaVersion.VERSION_17
44+
targetCompatibility = JavaVersion.VERSION_17
4545
}
4646
kotlinOptions {
47-
jvmTarget = "1.8"
47+
jvmTarget = "17"
4848
}
4949

5050
buildFeatures {
51+
buildConfig = true
5152
viewBinding = true
5253
dataBinding = true
5354
}

‎detekt.gradle.kts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ subprojects {
1616
apply (plugin = "io.gitlab.arturbosch.detekt")
1717

1818
tasks.withType(Detekt).configureEach {
19-
jvmTarget = "1.8"
19+
jvmTarget = "17"
2020
}
2121
}
2222

‎domain/build.gradle.kts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ plugins {
44
}
55

66
java {
7-
sourceCompatibility = JavaVersion.VERSION_1_8
8-
targetCompatibility = JavaVersion.VERSION_1_8
7+
sourceCompatibility = JavaVersion.VERSION_17
8+
targetCompatibility = JavaVersion.VERSION_17
99
}
1010

1111
dependencies {

0 commit comments

Comments
 (0)