Unverified Commit 728ea5a9 authored by Nikolay Igotti's avatar Nikolay Igotti Committed by GitHub

Finish jvm -> awt rename (#438)

parent 7313535c
...@@ -36,7 +36,7 @@ i.e. something like this ...@@ -36,7 +36,7 @@ i.e. something like this
val version = "0.5.3" val version = "0.5.3"
val target = "${targetOs}-${targetArch}" val target = "${targetOs}-${targetArch}"
dependencies { dependencies {
implementation("org.jetbrains.skiko:skiko-jvm-runtime-$target:$version") implementation("org.jetbrains.skiko:skiko-awt-runtime-$target:$version")
} }
``` ```
......
...@@ -38,7 +38,7 @@ dependencies { ...@@ -38,7 +38,7 @@ dependencies {
implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8") implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8")
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-swing:1.5.0") implementation("org.jetbrains.kotlinx:kotlinx-coroutines-swing:1.5.0")
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-test:1.5.0") implementation("org.jetbrains.kotlinx:kotlinx-coroutines-test:1.5.0")
implementation("org.jetbrains.skiko:skiko-jvm-runtime-$target:$version") implementation("org.jetbrains.skiko:skiko-awt-runtime-$target:$version")
testImplementation("org.jetbrains.kotlin:kotlin-test") testImplementation("org.jetbrains.kotlin:kotlin-test")
testImplementation("org.jetbrains.kotlin:kotlin-test-junit") testImplementation("org.jetbrains.kotlin:kotlin-test-junit")
} }
......
...@@ -100,7 +100,7 @@ kotlin { ...@@ -100,7 +100,7 @@ kotlin {
val jvmMain by getting { val jvmMain by getting {
dependsOn(commonMain) dependsOn(commonMain)
dependencies { dependencies {
implementation("org.jetbrains.skiko:skiko-jvm-runtime-$hostOs-$hostArch:$version") implementation("org.jetbrains.skiko:skiko-awt-runtime-$hostOs-$hostArch:$version")
} }
} }
......
...@@ -905,7 +905,7 @@ fun KotlinTarget.generateVersion( ...@@ -905,7 +905,7 @@ fun KotlinTarget.generateVersion(
} }
val skikoJvmJar by project.tasks.registering(Jar::class) { val skikoJvmJar by project.tasks.registering(Jar::class) {
archiveBaseName.set("skiko-jvm") archiveBaseName.set("skiko-awt")
from(kotlin.jvm("awt").compilations["main"].output.allOutputs) from(kotlin.jvm("awt").compilations["main"].output.allOutputs)
} }
......
...@@ -191,11 +191,11 @@ class SkikoProperties(private val myProject: Project) { ...@@ -191,11 +191,11 @@ class SkikoProperties(private val myProject: Project) {
object SkikoArtifacts { object SkikoArtifacts {
// names are also used in samples, e.g. samples/SkijaInjectSample/build.gradle // names are also used in samples, e.g. samples/SkijaInjectSample/build.gradle
val commonArtifactId = "skiko" val commonArtifactId = "skiko"
val jvmArtifactId = "skiko-jvm" val jvmArtifactId = "skiko-awt"
val jsArtifactId = "skiko-js" val jsArtifactId = "skiko-js"
val jsWasmArtifactId = "skiko-js-wasm-runtime" val jsWasmArtifactId = "skiko-js-wasm-runtime"
fun jvmRuntimeArtifactIdFor(os: OS, arch: Arch) = fun jvmRuntimeArtifactIdFor(os: OS, arch: Arch) =
"skiko-jvm-runtime-${targetId(os, arch)}" "skiko-awt-runtime-${targetId(os, arch)}"
// Using custom name like skiko-<Os>-<Arch> (with a dash) // Using custom name like skiko-<Os>-<Arch> (with a dash)
// does not seem possible (at least without adding a dash to a target's tasks), // does not seem possible (at least without adding a dash to a target's tasks),
......
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