From fb5e7fc6fd0d54c424ccf39dcb3a305b53b2af62 Mon Sep 17 00:00:00 2001 From: Adam <897017+aSemy@users.noreply.github.com> Date: Tue, 19 Sep 2023 00:09:13 +0200 Subject: [PATCH 1/2] disable 'if branch == main' check for Maven publishing --- .github/workflows/run_publish_maven.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/run_publish_maven.yml b/.github/workflows/run_publish_maven.yml index 6b79b4bd..1b2bb482 100644 --- a/.github/workflows/run_publish_maven.yml +++ b/.github/workflows/run_publish_maven.yml @@ -20,7 +20,6 @@ permissions: jobs: sonatype-release: - if: github.ref == 'refs/heads/main' permissions: contents: read packages: write From 46dc2f9378cb89ded09ba4813f8054de69b7bfe3 Mon Sep 17 00:00:00 2001 From: Adam <897017+aSemy@users.noreply.github.com> Date: Tue, 19 Sep 2023 08:22:52 +0200 Subject: [PATCH 2/2] set JVM Toolchain to 11 in KMP projects (#114) --- .../src/main/kotlin/buildsrc/convention/kotlin-jvm.gradle.kts | 4 +--- .../src/main/kotlin/buildsrc/convention/kotlin-mpp.gradle.kts | 1 + 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/buildSrc/src/main/kotlin/buildsrc/convention/kotlin-jvm.gradle.kts b/buildSrc/src/main/kotlin/buildsrc/convention/kotlin-jvm.gradle.kts index af515e23..7eebea99 100644 --- a/buildSrc/src/main/kotlin/buildsrc/convention/kotlin-jvm.gradle.kts +++ b/buildSrc/src/main/kotlin/buildsrc/convention/kotlin-jvm.gradle.kts @@ -20,9 +20,7 @@ dependencies { } kotlin { - jvmToolchain { - languageVersion.set(JavaLanguageVersion.of(11)) - } + jvmToolchain(11) } java { diff --git a/buildSrc/src/main/kotlin/buildsrc/convention/kotlin-mpp.gradle.kts b/buildSrc/src/main/kotlin/buildsrc/convention/kotlin-mpp.gradle.kts index 31f00f17..b3105e69 100644 --- a/buildSrc/src/main/kotlin/buildsrc/convention/kotlin-mpp.gradle.kts +++ b/buildSrc/src/main/kotlin/buildsrc/convention/kotlin-mpp.gradle.kts @@ -20,6 +20,7 @@ kotlin { nodejs() } + jvmToolchain(11) jvm { withJava() }