Skip to content

Commit 222b803

Browse files
authored
Merge pull request #103 from webtoon/migration
Migration from v1.7
2 parents 131a23c + 72962ae commit 222b803

19 files changed

Lines changed: 482 additions & 207 deletions

File tree

.github/workflows/build.yaml

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,7 @@ jobs:
3434
run: release/signing-setup.sh ${{ secrets.ENCRYPT_KEY }}
3535

3636
- name: Setup Gradle
37-
uses: gradle/actions/setup-gradle@v3
38-
with:
39-
gradle-home-cache-cleanup: true
37+
uses: gradle/actions/setup-gradle@v4
4038

4139
- name: Check spotless
4240
run: ./gradlew spotlessCheck --init-script gradle/init.gradle.kts --stacktrace
@@ -98,9 +96,7 @@ jobs:
9896
run: release/signing-setup.sh ${{ secrets.ENCRYPT_KEY }}
9997

10098
- name: Setup Gradle
101-
uses: gradle/actions/setup-gradle@v3
102-
with:
103-
gradle-home-cache-cleanup: true
99+
uses: gradle/actions/setup-gradle@v4
104100

105101
- name: Build tests
106102
run: ./gradlew assembleDebugAndroidTest --scan
@@ -160,9 +156,7 @@ jobs:
160156
run: release/signing-setup.sh ${{ secrets.ENCRYPT_KEY }}
161157

162158
- name: Setup Gradle
163-
uses: gradle/actions/setup-gradle@v3
164-
with:
165-
gradle-home-cache-cleanup: true
159+
uses: gradle/actions/setup-gradle@v4
166160

167161
- name: Deploy to Sonatype
168162
run: ./gradlew publish --no-parallel --stacktrace

.github/workflows/publish-docs.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,7 @@ jobs:
2424
java-version: 17
2525

2626
- name: Setup Gradle
27-
uses: gradle/actions/setup-gradle@v3
28-
with:
29-
gradle-home-cache-cleanup: true
27+
uses: gradle/actions/setup-gradle@v4
3028

3129
- name: Setup Python
3230
uses: actions/setup-python@v4

build-logic/convention/build.gradle.kts

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
import org.jetbrains.kotlin.gradle.dsl.JvmTarget
2+
13
plugins {
24
`kotlin-dsl`
35
}
@@ -9,6 +11,12 @@ java {
911
targetCompatibility = JavaVersion.VERSION_17
1012
}
1113

14+
kotlin {
15+
compilerOptions {
16+
jvmTarget = JvmTarget.JVM_17
17+
}
18+
}
19+
1220
dependencies {
1321
implementation(libs.android.pluginGradle)
1422
implementation(libs.kotlin.pluginGradle)

gradle/libs.versions.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[versions]
22

3-
agp = "8.4.1"
3+
agp = "8.7.1"
44
mavenPublish = "0.25.1"
55
metalava = "0.3.3"
66

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#Sat Apr 13 02:56:50 KST 2024
22
distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
4-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
4+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
55
zipStoreBase=GRADLE_USER_HOME
66
zipStorePath=wrapper/dists

0 commit comments

Comments
 (0)