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
a43e971b
Commit
a43e971b
authored
Aug 20, 2020
by
Alexey Tsvetkov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix build
parent
ebb55205
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
5 deletions
+6
-5
build.gradle.kts
skiko/build.gradle.kts
+3
-4
gradle.properties
skiko/gradle.properties
+3
-1
No files found.
skiko/build.gradle.kts
View file @
a43e971b
...
...
@@ -379,7 +379,7 @@ val createChecksums by project.tasks.registering(org.gradle.crypto.checksum.Chec
val
linkTask
=
project
.
tasks
.
named
(
"linkRelease${target.capitalize()}"
)
dependsOn
(
linkTask
)
files
=
linkTask
.
get
().
outputs
.
files
.
filter
{
it
.
isFile
}
+
if
(
target
==
"windows"
)
files
(
"$skiaDir/out/Release-x64/icudtl.dat"
)
else
files
()
if
(
target
==
"windows"
)
files
(
skiaDir
.
map
{
it
.
resolve
(
"out/Release-x64/icudtl.dat"
)
}
)
else
files
()
algorithm
=
Checksum
.
Algorithm
.
SHA256
outputDir
=
file
(
"$buildDir/checksums"
)
}
...
...
@@ -392,7 +392,7 @@ val skikoJvmRuntimeJar by project.tasks.registering(Jar::class) {
it
.
outputs
.
files
.
filter
{
it
.
isFile
}
})
if
(
target
==
"windows"
)
{
from
(
files
(
"$skiaDir/out/Release-x64/icudtl.dat"
))
from
(
files
(
skiaDir
.
map
{
it
.
resolve
(
"out/Release-x64/icudtl.dat"
)
}
))
}
from
(
createChecksums
.
get
().
outputs
.
files
)
}
...
...
@@ -516,8 +516,7 @@ class SkikoProperties(private val myProject: Project) {
get
()
=
myProject
.
property
(
"dependencies.skija.git.commit"
)
as
String
val
skiaReleaseForCurrentOS
:
String
get
()
=
(
myProject
.
property
(
"dependencies.skia.release.pattern"
)
as
String
)
.
replace
(
"<TARGET_OS>"
,
target
)
get
()
=
(
myProject
.
property
(
"dependencies.skia.$target"
)
as
String
)
val
visualStudioBuildToolsDir
:
File
?
get
()
=
System
.
getenv
()[
"SKIKO_VSBT_PATH"
]
?.
let
{
File
(
it
)
}
?.
takeIf
{
it
.
isDirectory
}
...
...
skiko/gradle.properties
View file @
a43e971b
kotlin.code.style
=
official
deploy.version
=
0.1
dependencies.skija.git.commit
=
c3faf18878a0ad3244e4119a69b555b5b77a21d0
dependencies.skia.release.pattern
=
Skia-85-<TARGET_OS>-Release-x64
\ No newline at end of file
dependencies.skia.windows
=
Skia-85-windows-Release-x64
dependencies.skia.linux
=
Skia-m85-linux-Release-x64
dependencies.skia.macos
=
Skia-85-macos-Release-x64
\ No newline at end of file
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