Skip to content

Commit e4e101e

Browse files
committed
Fix Android + Kotlin deployment JDK versions
1 parent 74da3b5 commit e4e101e

File tree

4 files changed

+11
-10
lines changed

4 files changed

+11
-10
lines changed

templates/android/.github/workflows/publish.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,10 @@ jobs:
1212
steps:
1313
- name: Check out code
1414
uses: actions/checkout@v2
15-
- name: Set up JDK 11
15+
- name: Set up JDK 17
1616
uses: actions/setup-java@v1
1717
with:
18-
java-version: 11
19-
# Base64 decodes and pipes the GPG key content into the secret file
18+
java-version: 17
2019
- name: Prepare environment
2120
env:
2221
GPG_KEY_CONTENTS: ${{ secrets.GPG_KEY_CONTENTS }}

templates/kotlin/.github/workflows/publish.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@ jobs:
1212
steps:
1313
- name: Check out code
1414
uses: actions/checkout@v2
15-
- name: Set up JDK 11
15+
- name: Set up JDK 17
1616
uses: actions/setup-java@v1
1717
with:
18-
java-version: 11
18+
java-version: 17
1919
# Base64 decodes and pipes the GPG key content into the secret file
2020
- name: Prepare environment
2121
env:

templates/kotlin/build.gradle.twig

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
plugins {
2-
id "org.jetbrains.kotlin.jvm" version '1.8.0'
2+
id "org.jetbrains.kotlin.jvm" version '1.9.10'
33
id "java-library"
4-
id "io.github.gradle-nexus.publish-plugin" version "1.1.0"
4+
id "io.github.gradle-nexus.publish-plugin" version "1.3.0"
55
}
66

77
apply from: "${rootDir}/scripts/configure.gradle"
@@ -29,9 +29,11 @@ repositories {
2929
}
3030

3131
dependencies {
32-
api("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.0")
33-
api(platform("com.squareup.okhttp3:okhttp-bom:4.9.3"))
32+
api("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.1")
33+
34+
api(platform("com.squareup.okhttp3:okhttp-bom:4.12.0"))
3435
api("com.squareup.okhttp3:okhttp")
36+
3537
implementation("com.squareup.okhttp3:okhttp-urlconnection")
3638
implementation("com.squareup.okhttp3:logging-interceptor")
3739
implementation("com.google.code.gson:gson:2.9.0")
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists

0 commit comments

Comments
 (0)