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 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() }