Unverified Commit 27a93c41 authored by Nikolay Igotti's avatar Nikolay Igotti Committed by GitHub

Move to Skia m96-fd5bb8d130 and Ubuntu 18 build (#249)

parent 534d24a8
......@@ -127,7 +127,7 @@ class SkikoProperties(private val myProject: Project) {
fun skiaReleaseFor(os: OS, arch: Arch, buildType: SkiaBuildType): String {
val target = "${os.id}-${arch.id}"
val tag = myProject.property("dependencies.skia.$target") as String
val suffix = if (os == OS.Linux && arch == Arch.X64) "-ubuntu14" else ""
val suffix = if (os == OS.Linux && arch == Arch.X64) "-ubuntu18" else ""
return "${tag}/Skia-${tag}-${os.id}-${buildType.id}-${arch.id}$suffix"
}
......
......@@ -2,13 +2,13 @@ kotlin.code.style=official
deploy.version=0.0.0
kotlin.mpp.enableGranularSourceSetsMetadata=true
dependencies.skia.windows-x64=m94-fd7c5792ca
dependencies.skia.linux-x64=m94-fd7c5792ca
dependencies.skia.macos-x64=m94-fd7c5792ca
dependencies.skia.linux-arm64=m94-fd7c5792ca
dependencies.skia.macos-arm64=m94-fd7c5792ca
dependencies.skia.wasm-wasm=m94-fd7c5792ca
dependencies.skia.ios-x64=m94-fd7c5792ca
dependencies.skia.ios-arm64=m94-fd7c5792ca
dependencies.skia.windows-x64=m96-fd5bb8d130
dependencies.skia.linux-x64=m96-fd5bb8d130
dependencies.skia.macos-x64=m96-fd5bb8d130
dependencies.skia.linux-arm64=m96-fd5bb8d130
dependencies.skia.macos-arm64=m96-fd5bb8d130
dependencies.skia.wasm-wasm=m96-fd5bb8d130
dependencies.skia.ios-x64=m96-fd5bb8d130
dependencies.skia.ios-arm64=m96-fd5bb8d130
org.gradle.jvmargs=-Xmx3G
......@@ -15,10 +15,16 @@ actual open class SkiaLayer(
get() = _contentScale
actual var fullscreen: Boolean
get() = TODO("Not yet implemented")
set(value) {}
get() = false
set(value) {
if (value) throw IllegalArgumentException("fullscreen unsupported")
}
actual var transparency: Boolean = false
actual var transparency: Boolean
get() = false
set(value) {
if (value) throw IllegalArgumentException("transparency unsupported")
}
val nsView = NSView(NSMakeRect(0.0, 0.0, 640.0, 480.0))
var _contentScale: Float = 1.0f
......
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