From 43e407e11a7a8692e0a4faaab02aba1affc3566b Mon Sep 17 00:00:00 2001 From: Alexander Nozik Date: Tue, 24 Dec 2024 10:51:55 +0300 Subject: [PATCH] Merge changes for Kotlin 2.1.0 --- .space.kts | 48 ----------------------------------------------- gradle.properties | 2 +- 2 files changed, 1 insertion(+), 49 deletions(-) delete mode 100644 .space.kts diff --git a/.space.kts b/.space.kts deleted file mode 100644 index 45c84ae3d..000000000 --- a/.space.kts +++ /dev/null @@ -1,48 +0,0 @@ -import kotlin.io.path.readText - -val projectName = "kmath" - -job("Build") { - //Perform only jvm tests - gradlew("spc.registry.jetbrains.space/p/sci/containers/kotlin-ci:1.0.3", "test", "jvmTest") -} - -job("Publish") { - startOn { - gitPush { enabled = false } - } - container("spc.registry.jetbrains.space/p/sci/containers/kotlin-ci:1.0.3") { - env["SPACE_USER"] = "{{ project:space_user }}" - env["SPACE_TOKEN"] = "{{ project:space_token }}" - kotlinScript { api -> - - val spaceUser = System.getenv("SPACE_USER") - val spaceToken = System.getenv("SPACE_TOKEN") - - // write the version to the build directory - api.gradlew("version") - - //read the version from build file - val version = java.nio.file.Path.of("build/project-version.txt").readText() - - val revisionSuffix = if (version.endsWith("SNAPSHOT")) { - "-" + api.gitRevision().take(7) - } else { - "" - } - - api.space().projects.automation.deployments.start( - project = api.projectIdentifier(), - targetIdentifier = TargetIdentifier.Key(projectName), - version = version + revisionSuffix, - // automatically update deployment status based on the status of a job - syncWithAutomationJob = true - ) - api.gradlew( - "publishAllPublicationsToSpaceRepository", - "-Ppublishing.space.user=\"$spaceUser\"", - "-Ppublishing.space.token=\"$spaceToken\"", - ) - } - } -} \ No newline at end of file diff --git a/gradle.properties b/gradle.properties index 03997feec..3c52aadac 100644 --- a/gradle.properties +++ b/gradle.properties @@ -13,4 +13,4 @@ kotlin.native.ignoreDisabledTargets=true org.jetbrains.dokka.experimental.gradle.pluginMode=V2EnabledWithHelpers kotlin.native.enableKlibsCrossCompilation=true -toolsVersion=0.16.0-kotlin-2.1.20-Beta1 +toolsVersion=0.16.0-kotlin-2.1.0