Fix inconsistent Java versions
This commit is contained in:
parent
0b26a16f1f
commit
2649e1e6d2
2 changed files with 4 additions and 7 deletions
|
@ -15,7 +15,7 @@ jobs:
|
||||||
uses: https://git.wbrawner.com/actions/setup-java@v4
|
uses: https://git.wbrawner.com/actions/setup-java@v4
|
||||||
with:
|
with:
|
||||||
distribution: 'zulu'
|
distribution: 'zulu'
|
||||||
java-version: '17'
|
java-version: '21'
|
||||||
- name: Validate Gradle Wrapper
|
- name: Validate Gradle Wrapper
|
||||||
uses: https://git.wbrawner.com/gradle/actions/wrapper-validation@v4
|
uses: https://git.wbrawner.com/gradle/actions/wrapper-validation@v4
|
||||||
unit_tests:
|
unit_tests:
|
||||||
|
@ -29,7 +29,7 @@ jobs:
|
||||||
uses: https://git.wbrawner.com/actions/setup-java@v4
|
uses: https://git.wbrawner.com/actions/setup-java@v4
|
||||||
with:
|
with:
|
||||||
distribution: 'zulu'
|
distribution: 'zulu'
|
||||||
java-version: '17'
|
java-version: '21'
|
||||||
- name: Setup Android SDK
|
- name: Setup Android SDK
|
||||||
uses: https://git.wbrawner.com/android-actions/setup-android@v3
|
uses: https://git.wbrawner.com/android-actions/setup-android@v3
|
||||||
- name: Setup Gradle
|
- name: Setup Gradle
|
||||||
|
@ -56,7 +56,7 @@ jobs:
|
||||||
# uses: https://git.wbrawner.com/actions/setup-java@v3
|
# uses: https://git.wbrawner.com/actions/setup-java@v3
|
||||||
# with:
|
# with:
|
||||||
# distribution: 'zulu'
|
# distribution: 'zulu'
|
||||||
# java-version: '17'
|
# java-version: '21'
|
||||||
# - name: Build with Gradle
|
# - name: Build with Gradle
|
||||||
# uses: https://git.wbrawner.com/gradle/gradle-build-action@v2
|
# uses: https://git.wbrawner.com/gradle/gradle-build-action@v2
|
||||||
# with:
|
# with:
|
||||||
|
|
|
@ -7,6 +7,7 @@ plugins {
|
||||||
}
|
}
|
||||||
|
|
||||||
kotlin {
|
kotlin {
|
||||||
|
jvmToolchain(21)
|
||||||
androidTarget()
|
androidTarget()
|
||||||
listOf(iosArm64(), iosSimulatorArm64()).forEach {
|
listOf(iosArm64(), iosSimulatorArm64()).forEach {
|
||||||
it.binaries.framework {
|
it.binaries.framework {
|
||||||
|
@ -66,10 +67,6 @@ android {
|
||||||
defaultConfig {
|
defaultConfig {
|
||||||
minSdk = libs.versions.minSdk.get().toInt()
|
minSdk = libs.versions.minSdk.get().toInt()
|
||||||
}
|
}
|
||||||
compileOptions {
|
|
||||||
sourceCompatibility = JavaVersion.VERSION_21
|
|
||||||
targetCompatibility = JavaVersion.VERSION_21
|
|
||||||
}
|
|
||||||
buildTypes {
|
buildTypes {
|
||||||
release {
|
release {
|
||||||
consumerProguardFiles("proguard-rules.pro")
|
consumerProguardFiles("proguard-rules.pro")
|
||||||
|
|
Loading…
Reference in a new issue