Unverified Commit 29d227ac authored by Shagen Ogandzhanian's avatar Shagen Ogandzhanian Committed by GitHub

[build] Correct kotlin.version parametrizaton in skiko/skiko (#1066)

This PR solves misleading kotlin.version parametrization which actually
was not working as expected: The actual version was always resolved from
buildSrc.

some context
https://jetbrains.slack.com/archives/C0288G57R/p1749820141169649
parent 2fe57f72
......@@ -10,6 +10,7 @@ repositories {
dependencies {
implementation(kotlin("stdlib"))
compileOnly(gradleApi())
implementation(kotlin("gradle-plugin", "1.9.21"))
val kotlinVersion = project.properties["kotlin.version"] as String
implementation(kotlin("gradle-plugin", kotlinVersion))
implementation("de.undercouch:gradle-download-task:5.5.0")
}
......@@ -25,8 +25,6 @@ dependencies.skia=m132-a00c390e98-1
org.gradle.jvmargs=-Xmx3G -XX:MaxMetaspaceSize=512m
kotlin.version=1.9.21
skiko.awt.enabled=true
skiko.js.enabled=false
skiko.wasm.enabled=false
......
......@@ -28,9 +28,10 @@ pluginManagement {
}
plugins {
val kotlinVersion = extra["kotlin.version"] as String
kotlin("jvm").version(kotlinVersion)
kotlin("multiplatform").version(kotlinVersion)
// whatever kotlinVersion we point to here, it will be ignored due to the nature of gradle design
// the actual version is set in buildSrc/gradle.properties
kotlin("jvm")
kotlin("multiplatform")
id("com.android.library").version("7.4.2") apply false
}
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment