diff --git a/build.gradle.kts b/build.gradle.kts index a2eb037fd8..5e6896deed 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,6 +1,5 @@ plugins { - val kotlinVersion: String by System.getProperties() - kotlin("plugin.serialization") version kotlinVersion + kotlin("plugin.serialization") kotlin("multiplatform") id("maven-publish") id("signing") @@ -17,7 +17,7 @@ allprojects { } // Versions -val kotlinVersion: String by System.getProperties() +val kotlinVersion: String by extra val serializationVersion: String by project val coroutinesVersion: String by project diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts index d0ef18b67b..ae67887584 100644 --- a/buildSrc/build.gradle.kts +++ b/buildSrc/build.gradle.kts @@ -3,12 +3,15 @@ plugins { } repositories { + mavenLocal() mavenCentral() gradlePluginPortal() } +val kotlinVersion: String by extra + dependencies { - implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.20") + implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion") implementation("io.github.gradle-nexus:publish-plugin:1.3.0") implementation("org.jetbrains.dokka:dokka-gradle-plugin:1.9.10") implementation(gradleApi()) diff --git a/buildSrc/gradle.properties b/buildSrc/gradle.properties new file mode 100644 index 0000000000..b67c10f362 --- /dev/null +++ b/buildSrc/gradle.properties @@ -0,0 +1 @@ +kotlinVersion= diff --git a/buildSrc/src/main/kotlin/Shared.kt b/buildSrc/src/main/kotlin/Shared.kt index 59bf038735..0e0929a594 100644 --- a/buildSrc/src/main/kotlin/Shared.kt +++ b/buildSrc/src/main/kotlin/Shared.kt @@ -16,8 +16,8 @@ import org.jetbrains.kotlin.gradle.targets.js.dsl.KotlinJsTargetDsl fun Project.repositories() { repositories { - mavenCentral() mavenLocal() + mavenCentral() } } diff --git a/gradle.properties b/gradle.properties index 9315dcac95..d5fabb822c 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,7 +1,7 @@ group=io.kvision versionNumber=7.1.0 -systemProp.kotlinVersion=1.9.20 +kotlinVersion= javaVersion=17 coroutinesVersion=1.7.3 serializationVersion=1.6.0 diff --git a/settings.gradle.kts b/settings.gradle.kts index 901058aae2..7c338f6ba2 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -1,8 +1,13 @@ pluginManagement { repositories { + mavenLocal() gradlePluginPortal() mavenCentral() - mavenLocal() + } + + val kotlinVersion: String by settings + plugins { + id("org.jetbrains.kotlin.plugin.serialization") version kotlinVersion } } rootProject.name = "kvision"