Commit 3a01ba64 authored by Alexey Tsvetkov's avatar Alexey Tsvetkov

Deduplicate artifact names across build scripts

parent 424bbae2
...@@ -488,13 +488,13 @@ publishing { ...@@ -488,13 +488,13 @@ publishing {
} }
} }
create<MavenPublication>("skikoJvm") { create<MavenPublication>("skikoJvm") {
artifactId = "skiko-jvm" artifactId = SkikoArtifacts.commonArtifactId
afterEvaluate { afterEvaluate {
artifact(skikoJvmJar.map { it.archiveFile.get() }) artifact(skikoJvmJar.map { it.archiveFile.get() })
} }
} }
create<MavenPublication>("skikoJvmRuntime") { create<MavenPublication>("skikoJvmRuntime") {
artifactId = "skiko-jvm-runtime-$target" artifactId = SkikoArtifacts.runtimeArtifactIdFor(hostOs, hostArch)
afterEvaluate { afterEvaluate {
artifact(skikoJvmRuntimeJar.map { it.archiveFile.get() }) artifact(skikoJvmRuntimeJar.map { it.archiveFile.get() })
} }
......
...@@ -38,7 +38,10 @@ val hostArch by lazy { ...@@ -38,7 +38,10 @@ val hostArch by lazy {
val targetOs = hostOs val targetOs = hostOs
val targetArch = hostArch val targetArch = hostArch
val target = "${targetOs.id}-${targetArch.id}" val target = targetId(targetOs, targetArch)
fun targetId(os: OS, arch: Arch) =
"${os.id}-${arch.id}"
val jdkHome = System.getProperty("java.home") ?: error("'java.home' is null") val jdkHome = System.getProperty("java.home") ?: error("'java.home' is null")
...@@ -88,4 +91,11 @@ class SkikoProperties(private val myProject: Project) { ...@@ -88,4 +91,11 @@ class SkikoProperties(private val myProject: Project) {
val dependenciesDir: File val dependenciesDir: File
get() = myProject.rootProject.projectDir.resolve("dependencies") get() = myProject.rootProject.projectDir.resolve("dependencies")
}
object SkikoArtifacts {
// names are also used in samples, e.g. samples/SkijaInjectSample/build.gradle
val commonArtifactId = "skiko-jvm"
fun runtimeArtifactIdFor(os: OS, arch: Arch) =
"skiko-jvm-runtime-${targetId(os, arch)}"
} }
\ No newline at end of file
...@@ -20,10 +20,10 @@ dependencies { ...@@ -20,10 +20,10 @@ dependencies {
} }
} }
skikoDep("skiko-jvm") skikoDep(SkikoArtifacts.commonArtifactId)
skikoDep("skiko-jvm-runtime-windows-x64") skikoDep(SkikoArtifacts.runtimeArtifactIdFor(OS.Windows, Arch.X64))
skikoDep("skiko-jvm-runtime-linux-x64") skikoDep(SkikoArtifacts.runtimeArtifactIdFor(OS.Linux, Arch.X64))
skikoDep("skiko-jvm-runtime-macos-x64") skikoDep(SkikoArtifacts.runtimeArtifactIdFor(OS.MacOS, Arch.X64))
} }
val createGithubRelease by tasks.registering { val createGithubRelease by tasks.registering {
......
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