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
22faede5
Commit
22faede5
authored
Dec 21, 2021
by
Alexey Tsvetkov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Change tasks names to camel case
Mixing camel case and dash case looks ugly
parent
ad86b657
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
39 additions
and
12 deletions
+39
-12
build.gradle.kts
skiko/build.gradle.kts
+22
-12
utils.kt
skiko/buildSrc/src/main/kotlin/utils.kt
+17
-0
No files found.
skiko/build.gradle.kts
View file @
22faede5
...
...
@@ -856,7 +856,10 @@ if (hostOs == OS.MacOS) {
val
generateVersion
=
generateVersionTask
(
targetOs
,
targetArch
)
fun
generateVersionTask
(
targetOs
:
OS
,
targetArch
:
Arch
)
=
project
.
tasks
.
register
(
"generateVersion"
)
{
fun
Project
.
generateVersionTask
(
targetOs
:
OS
,
targetArch
:
Arch
)
=
registerSkikoTask
<
DefaultTask
>(
"generateVersion"
,
targetOs
,
targetArch
)
{
val
outDir
=
generatedKotlin
file
(
outDir
).
mkdirs
()
val
out
=
"$outDir/Version.kt"
...
...
@@ -879,8 +882,11 @@ val skikoJvmJar by project.tasks.registering(Jar::class) {
from
(
kotlin
.
jvm
(
"awt"
).
compilations
[
"main"
].
output
.
allOutputs
)
}
fun
maybeSignTask
(
targetOs
:
OS
,
targetArch
:
Arch
,
linkJvmBindings
:
Provider
<
LinkSkikoTask
>)
=
project
.
tasks
.
register
<
SealAndSignSharedLibraryTask
>(
"maybeSign-${targetOs.id}-${targetArch.id}"
)
{
fun
maybeSignTask
(
targetOs
:
OS
,
targetArch
:
Arch
,
linkJvmBindings
:
Provider
<
LinkSkikoTask
>
)
=
project
.
registerSkikoTask
<
SealAndSignSharedLibraryTask
>(
"maybeSign"
,
targetOs
,
targetArch
)
{
dependsOn
(
linkJvmBindings
)
val
linkOutputFile
=
linkJvmBindings
.
map
{
task
->
...
...
@@ -908,10 +914,12 @@ fun maybeSignTask(targetOs: OS, targetArch: Arch, linkJvmBindings: Provider<Link
signToken
.
set
(
skiko
.
signToken
)
}
fun
createChecksumsTask
(
targetOs
:
OS
,
targetArch
:
Arch
,
maybeSign
:
Provider
<
SealAndSignSharedLibraryTask
>,
bindingsDir
:
Provider
<
File
>)
=
project
.
tasks
.
register
<
Checksum
>(
"createChecksums-${targetOs.id}-${targetArch.id}"
)
{
fun
createChecksumsTask
(
targetOs
:
OS
,
targetArch
:
Arch
,
maybeSign
:
Provider
<
SealAndSignSharedLibraryTask
>,
bindingsDir
:
Provider
<
File
>
)
=
project
.
registerSkikoTask
<
Checksum
>(
"createChecksums"
,
targetOs
,
targetArch
)
{
val
skiaBinSubdir
=
"out/${buildType.id}-${targetOs.id}-${targetArch.id}"
dependsOn
(
maybeSign
)
files
=
project
.
files
(
maybeSign
.
flatMap
{
it
.
outputFiles
})
+
...
...
@@ -920,11 +928,13 @@ fun createChecksumsTask(targetOs: OS, targetArch: Arch,
outputDir
=
file
(
"$buildDir/checksums"
)
}
fun
skikoJvmRuntimeJarTask
(
targetOs
:
OS
,
targetArch
:
Arch
,
maybeSign
:
Provider
<
SealAndSignSharedLibraryTask
>,
createChecksums
:
Provider
<
Checksum
>,
bindingsDir
:
Provider
<
File
>)
=
project
.
tasks
.
register
<
Jar
>(
"skikoJvmRuntimeJar-${targetOs.id}-${targetArch.id}"
)
{
fun
skikoJvmRuntimeJarTask
(
targetOs
:
OS
,
targetArch
:
Arch
,
maybeSign
:
Provider
<
SealAndSignSharedLibraryTask
>,
createChecksums
:
Provider
<
Checksum
>,
bindingsDir
:
Provider
<
File
>
)
=
project
.
registerSkikoTask
<
Jar
>(
"skikoJvmRuntimeJar"
,
targetOs
,
targetArch
)
{
dependsOn
(
maybeSign
)
dependsOn
(
createChecksums
)
dependsOn
(
skikoJvmJar
)
...
...
skiko/buildSrc/src/main/kotlin/utils.kt
View file @
22faede5
import
org.gradle.api.Project
import
org.gradle.api.Task
import
org.gradle.api.file.Directory
import
org.gradle.api.provider.Provider
import
org.gradle.api.tasks.TaskContainer
import
org.gradle.api.tasks.TaskProvider
import
org.gradle.kotlin.dsl.register
import
java.util.*
...
...
@@ -16,6 +18,21 @@ inline fun <reified T : Task> TaskContainer.registerOrGetTask(
return
taskProvider
.
map
{
it
as
T
}
}
inline
fun
<
reified
T
:
Task
>
Project
.
registerSkikoTask
(
taskName
:
String
,
crossinline
fn
:
T
.()
->
Unit
):
TaskProvider
<
T
>
=
tasks
.
register
(
taskName
,
T
::
class
)
{
fn
()
}
inline
fun
<
reified
T
:
Task
>
Project
.
registerSkikoTask
(
actionName
:
String
,
targetOs
:
OS
,
targetArch
:
Arch
,
crossinline
fn
:
T
.()
->
Unit
):
TaskProvider
<
T
>
{
val
taskName
=
joinToTitleCamelCase
(
actionName
,
targetOs
.
id
,
targetArch
.
id
)
return
registerSkikoTask
(
taskName
,
fn
)
}
fun
joinToTitleCamelCase
(
vararg
parts
:
String
):
String
=
parts
.
joinToString
(
separator
=
""
)
{
toTitleCase
(
it
)
}
...
...
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