Unverified Commit db3d8af9 authored by Shagen Ogandzhanian's avatar Shagen Ogandzhanian Committed by GitHub

Update Skia to m138

Co-authored-by: 's avatarVladimir Mazunin <vladimir.mazunin@jetbrains.com>
parent f50c23e4
#!/usr/bin/env bash #!/usr/bin/env bash
####### Variables you can edit to change build config, or set same environment variables before script execution ####### ####### Variables you can edit to change build config, or set same environment variables before script execution #######
SKIA_VERSION="${SKIA_VERSION:="m132-a00c390e98-1"}" # Version of Skia m###-commit-sha-#. This commit sha will be cloned from repository https://github.com/JetBrains/skia SKIA_VERSION="${SKIA_VERSION:="m138-9e6b5bff162-1"}" # Version of Skia m###-commit-sha-#. This commit sha will be cloned from repository https://github.com/JetBrains/skia
SKIA_DEBUG_MODE="${SKIA_DEBUG_MODE:="false"}" # in debug mode Skiko will be published with postix "+debug", for example "0.0.0-SNAPSHOT+debug" SKIA_DEBUG_MODE="${SKIA_DEBUG_MODE:="false"}" # in debug mode Skiko will be published with postix "+debug", for example "0.0.0-SNAPSHOT+debug"
SKIA_TARGET="${SKIA_TARGET:="iosSim"}" # possible values: "ios", "iosSim", "macos", "windows", "linux", "wasm", "android", "tvos", "tvosSim" SKIA_TARGET="${SKIA_TARGET:="iosSim"}" # possible values: "ios", "iosSim", "macos", "windows", "linux", "wasm", "android", "tvos", "tvosSim"
# For M1 Mac use "iosSim" to build for simulator, and ios to build for device. # For M1 Mac use "iosSim" to build for simulator, and ios to build for device.
......
...@@ -28,6 +28,7 @@ fun skiaHeadersDirs(skiaDir: File): List<File> = ...@@ -28,6 +28,7 @@ fun skiaHeadersDirs(skiaDir: File): List<File> =
skiaDir.resolve("include/utils"), skiaDir.resolve("include/utils"),
skiaDir.resolve("include/codec"), skiaDir.resolve("include/codec"),
skiaDir.resolve("include/svg"), skiaDir.resolve("include/svg"),
skiaDir.resolve("modules/jsonreader"),
skiaDir.resolve("modules/skottie/include"), skiaDir.resolve("modules/skottie/include"),
skiaDir.resolve("modules/skparagraph/include"), skiaDir.resolve("modules/skparagraph/include"),
skiaDir.resolve("modules/skshaper/include"), skiaDir.resolve("modules/skshaper/include"),
......
...@@ -286,6 +286,8 @@ fun SkikoProjectContext.createLinkJvmBindings( ...@@ -286,6 +286,8 @@ fun SkikoProjectContext.createLinkJvmBindings(
"$skiaBinDir/libskunicode_core.a", "$skiaBinDir/libskunicode_core.a",
"$skiaBinDir/libskunicode_icu.a", "$skiaBinDir/libskunicode_icu.a",
"$skiaBinDir/libskshaper.a", "$skiaBinDir/libskshaper.a",
"$skiaBinDir/libjsonreader.a",
) )
} }
OS.Windows -> { OS.Windows -> {
......
...@@ -193,6 +193,7 @@ fun skiaStaticLibraries(skiaDir: String, targetString: String, buildType: SkiaBu ...@@ -193,6 +193,7 @@ fun skiaStaticLibraries(skiaDir: String, targetString: String, buildType: SkiaBu
"libskparagraph.a", "libskparagraph.a",
"libskia.a", "libskia.a",
"libicu.a", "libicu.a",
"libjsonreader.a",
"libskottie.a", "libskottie.a",
"libsvg.a", "libsvg.a",
"libpng.a", "libpng.a",
......
...@@ -2,7 +2,7 @@ kotlin.code.style=official ...@@ -2,7 +2,7 @@ kotlin.code.style=official
deploy.version=0.0.0 deploy.version=0.0.0
dependencies.skia=m132-a00c390e98-1 dependencies.skia=m138-9e6b5bff162-1
# you can override general skia dependencies by passing platform-specific property: # you can override general skia dependencies by passing platform-specific property:
# dependencies.skia.android-arm64 # dependencies.skia.android-arm64
......
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