Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
S
skiko
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
liuqiang
skiko
Commits
3a01ba64
Commit
3a01ba64
authored
Nov 19, 2020
by
Alexey Tsvetkov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Deduplicate artifact names across build scripts
parent
424bbae2
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
17 additions
and
7 deletions
+17
-7
build.gradle.kts
skiko/build.gradle.kts
+2
-2
properties.kt
skiko/buildSrc/src/main/kotlin/properties.kt
+11
-1
build.gradle.kts
skiko/ci/build.gradle.kts
+4
-4
No files found.
skiko/build.gradle.kts
View file @
3a01ba64
...
@@ -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
()
})
}
}
...
...
skiko/buildSrc/src/main/kotlin/properties.kt
View file @
3a01ba64
...
@@ -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"
)
...
@@ -89,3 +92,10 @@ class SkikoProperties(private val myProject: Project) {
...
@@ -89,3 +92,10 @@ 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
skiko/ci/build.gradle.kts
View file @
3a01ba64
...
@@ -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
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment