Skip to content

Commit ba5b3aa

Browse files
committed
refactor: update CI configuration and Kotlin compile options
1 parent 82bc1f9 commit ba5b3aa

File tree

2 files changed

+4
-52
lines changed

2 files changed

+4
-52
lines changed

.github/workflows/CI.yaml

Lines changed: 1 addition & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -107,53 +107,4 @@ jobs:
107107
continue-on-error: false
108108
paths: |
109109
${{ github.workspace }}/feature/**/build/reports/kover/reportDebug.xml
110-
token: ${{ secrets.GITHUB_TOKEN }}
111-
112-
build:
113-
runs-on: ubuntu-latest
114-
timeout-minutes: 15
115-
needs: [spotless, tests]
116-
steps:
117-
- name: Checkout
118-
uses: actions/checkout@v4
119-
120-
- name: Set up JDK 17
121-
uses: actions/setup-java@v4
122-
with:
123-
distribution: 'zulu'
124-
java-version: 17
125-
126-
- name: chmod cache key
127-
run: chmod +x ./scripts/checksum.sh
128-
129-
- name: Generate cache key
130-
run: ./scripts/checksum.sh app checksum.txt
131-
132-
- uses: actions/cache@v3
133-
with:
134-
path: |
135-
~/.gradle/caches/modules-*
136-
~/.gradle/caches/jars-*
137-
~/.gradle/caches/build-cache-*
138-
~/.gradle/wrapper/
139-
~/.gradle/caches/transforms-*
140-
key: gradle-${{ hashFiles('checksum.txt') }}
141-
restore-keys: |
142-
gradle-
143-
144-
- name: Copy CI gradle.properties
145-
run: mkdir -p ~/.gradle ; cp .github/ci-gradle.properties ~/.gradle/gradle.properties
146-
147-
- name: Setup Gradle
148-
uses: gradle/actions/setup-gradle@v3
149-
150-
- name: Build Debug APK
151-
run: ./gradlew assembleDebug --no-daemon
152-
153-
- name: Upload build reports
154-
if: always()
155-
uses: actions/upload-artifact@v3
156-
with:
157-
name: build-reports
158-
path: app/build/reports
159-
110+
token: ${{ secrets.GITHUB_TOKEN }}

build-logic/convention/build.gradle.kts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
import org.jetbrains.kotlin.gradle.dsl.JvmTarget
12
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
23

34
plugins {
@@ -12,8 +13,8 @@ java {
1213
targetCompatibility = JavaVersion.VERSION_17
1314
}
1415
tasks.withType<KotlinCompile>().configureEach {
15-
kotlinOptions {
16-
jvmTarget = JavaVersion.VERSION_17.toString()
16+
compilerOptions {
17+
jvmTarget.set(JvmTarget.JVM_17)
1718
}
1819
}
1920

0 commit comments

Comments
 (0)