From 9b77c1c53f19f62f5bc38833832ab79fc828fa45 Mon Sep 17 00:00:00 2001 From: AJ Date: Sun, 1 Dec 2024 10:06:43 -0800 Subject: [PATCH] Publish artifacts on ubuntu runner --- .github/workflows/build.yml | 2 +- .github/workflows/release.yml | 4 ++-- gradle.properties | 2 ++ gradle/libs.versions.toml | 8 ++++---- 4 files changed, 9 insertions(+), 7 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 0098c14b..d590f5ce 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -61,4 +61,4 @@ jobs: ORG_GRADLE_PROJECT_mavenCentralUsername: ${{ secrets.ORG_GRADLE_PROJECT_mavenCentralUsername }} env: - GRADLE_OPTS: -Dorg.gradle.configureondemand=true -Dorg.gradle.parallel=true -Dkotlin.incremental=false -Dorg.gradle.project.kotlin.incremental.multiplatform=false -Dorg.gradle.project.kotlin.native.disableCompilerDaemon=true -Dorg.gradle.jvmargs="-Xmx6g -Dfile.encoding=UTF-8" + GRADLE_OPTS: -Dorg.gradle.configureondemand=true -Dorg.gradle.parallel=true -Dkotlin.incremental=false -Dorg.gradle.project.kotlin.incremental.multiplatform=false -Dorg.gradle.project.kotlin.native.disableCompilerDaemon=true -Dorg.gradle.jvmargs="-Xmx12g -Dfile.encoding=UTF-8" diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index e73a326b..e6b10d75 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -7,7 +7,7 @@ on: jobs: release: - runs-on: macos-latest + runs-on: ubuntu-latest if: ${{ github.repository == 'ajalt/clikt' }} steps: - uses: actions/checkout@v4 @@ -25,4 +25,4 @@ jobs: env: # configureondemand=false to work around KT-51763 - GRADLE_OPTS: -Dorg.gradle.configureondemand=false -Dorg.gradle.parallel=true -Dkotlin.incremental=false -Dorg.gradle.project.kotlin.incremental.multiplatform=false -Dorg.gradle.project.kotlin.native.disableCompilerDaemon=true -Dorg.gradle.jvmargs="-Xmx6g -Dfile.encoding=UTF-8" + GRADLE_OPTS: -Dorg.gradle.configureondemand=false -Dorg.gradle.parallel=true -Dkotlin.incremental=false -Dorg.gradle.project.kotlin.incremental.multiplatform=false -Dorg.gradle.project.kotlin.native.disableCompilerDaemon=true -Dorg.gradle.jvmargs="-Xmx12g -Dfile.encoding=UTF-8" diff --git a/gradle.properties b/gradle.properties index 713a707b..e9bf8482 100644 --- a/gradle.properties +++ b/gradle.properties @@ -3,6 +3,8 @@ VERSION_NAME=5.0.1 # Silence the compile warning that MPP is experimental kotlin.mpp.stability.nowarn=true +# Enable experimental cross compilation +kotlin.native.enableKlibsCrossCompilation=true # gradle-maven-publish configuration SONATYPE_HOST=DEFAULT diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 08914bdb..1c3c5c68 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,7 +1,7 @@ [versions] kotlin = "2.1.0" -coroutines = "1.8.1" -mordant = "3.0.0" +coroutines = "1.9.0" +mordant = "3.0.1" [libraries] mordant = {module = "com.github.ajalt.mordant:mordant", version.ref = "mordant"} @@ -10,7 +10,7 @@ mordant-markdown = {module = "com.github.ajalt.mordant:mordant-markdown", versio # used in tests coroutines-core = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version.ref = "coroutines" } coroutines-test = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-test", version.ref = "coroutines" } -kotest = "io.kotest:kotest-assertions-core:5.9.0" +kotest = "io.kotest:kotest-assertions-core:5.9.1" systemrules = "com.github.stefanbirkner:system-rules:1.19.0" jimfs = "com.google.jimfs:jimfs:1.3.0" @@ -20,5 +20,5 @@ kotlinx-serialization = "org.jetbrains.kotlinx:kotlinx-serialization-json:1.6.2" [plugins] dokka = "org.jetbrains.dokka:1.9.20" -publish = "com.vanniktech.maven.publish:0.28.0" +publish = "com.vanniktech.maven.publish:0.30.0" kotlinBinaryCompatibilityValidator = "org.jetbrains.kotlinx.binary-compatibility-validator:0.16.3"