From 5d3a41cd4da84ec6230588a49a5e781364edcd56 Mon Sep 17 00:00:00 2001 From: Andrew Golovashevich Date: Sat, 9 Nov 2024 16:33:05 +0300 Subject: [PATCH] Small fixes and v0.2 --- README.md | 6 +++--- embed/build.gradle.kts | 3 +++ .../kotlin/kmp_gradle_build_helper/plugin/XomrkDsl.kt | 2 +- test/gradle.properties | 1 + versions.properties | 2 +- 5 files changed, 9 insertions(+), 5 deletions(-) create mode 100644 test/gradle.properties diff --git a/README.md b/README.md index 3f69f7c..87f145f 100644 --- a/README.md +++ b/README.md @@ -16,7 +16,7 @@ buildscript { } dependencies { - classpath("ru.landgrafhomyak.kotlin:kotlin-mpp-gradle-build-helper:v0.1k2.0.20") + classpath("ru.landgrafhomyak.kotlin:kotlin-mpp-gradle-build-helper:v0.2k2.0.20") } } @@ -54,7 +54,7 @@ buildscript { } dependencies { - classpath("ru.landgrafhomyak.kotlin:kotlin-mpp-gradle-build:v0.1k2.0.20") + classpath("ru.landgrafhomyak.kotlin:kotlin-mpp-gradle-build:v0.2k2.0.20") } } @@ -82,7 +82,7 @@ This library officially isn't published, so this way wouldn't work import ru.landgrafhomyak.kotlin.kmp_gradle_build_helper.* plugins { - id("ru.landgrafhomyak.kotlin.original-multiplatform-ext") version "v0.1k2.0.20" + id("ru.landgrafhomyak.kotlin.original-multiplatform-ext") version "v0.2k2.0.20" } repositories { diff --git a/embed/build.gradle.kts b/embed/build.gradle.kts index f09db99..700dd4b 100644 --- a/embed/build.gradle.kts +++ b/embed/build.gradle.kts @@ -1,7 +1,9 @@ import java.util.Properties +import org.jetbrains.kotlin.gradle.dsl.KotlinVersion import ru.landgrafhomyak.kotlin.kmp_gradle_build_helper.defineXomrkGiteaMavenRepo import ru.landgrafhomyak.kotlin.kmp_gradle_build_helper.forceSetAllMavenArtifactsId import ru.landgrafhomyak.kotlin.kmp_gradle_build_helper.optInContracts +import ru.landgrafhomyak.kotlin.kmp_gradle_build_helper.setCompatibilityWithKotlin buildscript { val versions = java.util.Properties() @@ -37,6 +39,7 @@ kotlin { jvmToolchain(8) jvm() + setCompatibilityWithKotlin(KotlinVersion.KOTLIN_1_8) sourceSets { jvmMain { diff --git a/embed/src/jvmMain/kotlin/ru/landgrafhomyak/kotlin/kmp_gradle_build_helper/plugin/XomrkDsl.kt b/embed/src/jvmMain/kotlin/ru/landgrafhomyak/kotlin/kmp_gradle_build_helper/plugin/XomrkDsl.kt index 5231a4d..829cbe0 100644 --- a/embed/src/jvmMain/kotlin/ru/landgrafhomyak/kotlin/kmp_gradle_build_helper/plugin/XomrkDsl.kt +++ b/embed/src/jvmMain/kotlin/ru/landgrafhomyak/kotlin/kmp_gradle_build_helper/plugin/XomrkDsl.kt @@ -8,7 +8,7 @@ import org.gradle.api.publish.PublishingExtension import org.jetbrains.kotlin.gradle.dsl.KotlinMultiplatformExtension import ru.landgrafhomyak.kotlin.kmp_gradle_build_helper.plugin.SetupBuildScript.PluginIDs -open class XomrkDsl internal constructor(private val project: Project) { +class XomrkDsl internal constructor(private val project: Project) { @Suppress("FunctionName") private fun _wrapExtension( @Suppress("SameParameterValue") pluginId: String, diff --git a/test/gradle.properties b/test/gradle.properties new file mode 100644 index 0000000..5a4ae9c --- /dev/null +++ b/test/gradle.properties @@ -0,0 +1 @@ +kotlin.native.ignoreDisabledTargets=true \ No newline at end of file diff --git a/versions.properties b/versions.properties index 7152cd5..1f22af5 100644 --- a/versions.properties +++ b/versions.properties @@ -1,3 +1,3 @@ -this=0.1 +this=0.2 kotlin=2.0.20 gradle=7.5.1 \ No newline at end of file