JS artifact compilation. (#184)

.github/workflows/blank.yml

@@ -88,7 +88,7 @@ jobs:
            ./emsdk activate 2.0.29
            source ./emsdk_env.sh
            cd ..
-           ./gradlew skikoJsJar
+           ./gradlew -Pskiko.wasm.enabled=true publishSkikoWasmRuntimePublicationToMavenLocal publishSkikoJsRuntimePublicationToMavenLocal
    windows:
     runs-on: windows-2019
     steps:

samples/SkiaJsSample/build.gradle.kts

+plugins {
+    kotlin("multiplatform") version "1.5.21"
+}
+
+repositories {
+    mavenLocal()
+    mavenCentral()
+    maven("https://dl.bintray.com/kotlin/kotlin-eap")
+    maven("https://maven.pkg.jetbrains.space/public/p/compose/dev")
+}
+
+var version = "0.0.0-SNAPSHOT"
+if (project.hasProperty("skiko.version")) {
+    version = project.properties["skiko.version"] as String
+}
+
+val resourcesDir = "$buildDir/resources/"
+
+kotlin {
+
+    js(IR) {
+        browser()
+        binaries.executable()
+    }
+
+    sourceSets {
+        val commonMain by getting {}
+
+        val jsMain by getting {
+            dependsOn(commonMain)
+            dependencies {
+                // This one is tricky - it has js and wasm binaries required for final linking.
+                // We cannot use it directly but need to extract data from there.
+                implementation("org.jetbrains.skiko:skiko-js-runtime:$version")
+            }
+            resources.setSrcDirs(listOf(resourcesDir))
+        }
+    }
+}
+
+val skikoWasm by configurations.creating
+
+dependencies {
+    skikoWasm("org.jetbrains.skiko:skiko-js-wasm-runtime:$version")
+}
+
+val unzipTask = tasks.register("unzipWasm", Copy::class) {
+    destinationDir = file(resourcesDir)
+    from(skikoWasm.map { zipTree(it) })
+}
+
+tasks.withType<org.jetbrains.kotlin.gradle.dsl.KotlinJsCompile>().configureEach {
+    dependsOn(unzipTask)
+}
+

samples/SkiaJsSample/gradle.properties

+kotlin.code.style=official

samples/SkiaJsSample/gradle/wrapper/gradle-wrapper.properties

+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists

samples/SkiaJsSample/gradlew

+#!/usr/bin/env sh
+
+#
+# Copyright 2015 the original author or authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+##############################################################################
+##
+##  Gradle start up script for UN*X
+##
+##############################################################################
+
+# Attempt to set APP_HOME
+# Resolve links: $0 may be a link
+PRG="$0"
+# Need this for relative symlinks.
+while [ -h "$PRG" ] ; do
+    ls=`ls -ld "$PRG"`
+    link=`expr "$ls" : '.*-> \(.*\)$'`
+    if expr "$link" : '/.*' > /dev/null; then
+        PRG="$link"
+    else
+        PRG=`dirname "$PRG"`"/$link"
+    fi
+done
+SAVED="`pwd`"
+cd "`dirname \"$PRG\"`/" >/dev/null
+APP_HOME="`pwd -P`"
+cd "$SAVED" >/dev/null
+
+APP_NAME="Gradle"
+APP_BASE_NAME=`basename "$0"`
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+
+# Use the maximum available, or set MAX_FD != -1 to use that value.
+MAX_FD="maximum"
+
+warn () {
+    echo "$*"
+}
+
+die () {
+    echo
+    echo "$*"
+    echo
+    exit 1
+}
+
+# OS specific support (must be 'true' or 'false').
+cygwin=false
+msys=false
+darwin=false
+nonstop=false
+case "`uname`" in
+  CYGWIN* )
+    cygwin=true
+    ;;
+  Darwin* )
+    darwin=true
+    ;;
+  MINGW* )
+    msys=true
+    ;;
+  NONSTOP* )
+    nonstop=true
+    ;;
+esac
+
+CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+
+
+# Determine the Java command to use to start the JVM.
+if [ -n "$JAVA_HOME" ] ; then
+    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+        # IBM's JDK on AIX uses strange locations for the executables
+        JAVACMD="$JAVA_HOME/jre/sh/java"
+    else
+        JAVACMD="$JAVA_HOME/bin/java"
+    fi
+    if [ ! -x "$JAVACMD" ] ; then
+        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+    fi
+else
+    JAVACMD="java"
+    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+fi
+
+# Increase the maximum file descriptors if we can.
+if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
+    MAX_FD_LIMIT=`ulimit -H -n`
+    if [ $? -eq 0 ] ; then
+        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
+            MAX_FD="$MAX_FD_LIMIT"
+        fi
+        ulimit -n $MAX_FD
+        if [ $? -ne 0 ] ; then
+            warn "Could not set maximum file descriptor limit: $MAX_FD"
+        fi
+    else
+        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
+    fi
+fi
+
+# For Darwin, add options to specify how the application appears in the dock
+if $darwin; then
+    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
+fi
+
+# For Cygwin or MSYS, switch paths to Windows format before running java
+if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
+    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
+    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+
+    JAVACMD=`cygpath --unix "$JAVACMD"`
+
+    # We build the pattern for arguments to be converted via cygpath
+    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
+    SEP=""
+    for dir in $ROOTDIRSRAW ; do
+        ROOTDIRS="$ROOTDIRS$SEP$dir"
+        SEP="|"
+    done
+    OURCYGPATTERN="(^($ROOTDIRS))"
+    # Add a user-defined pattern to the cygpath arguments
+    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
+        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
+    fi
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    i=0
+    for arg in "$@" ; do
+        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
+        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
+
+        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
+            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
+        else
+            eval `echo args$i`="\"$arg\""
+        fi
+        i=`expr $i + 1`
+    done
+    case $i in
+        0) set -- ;;
+        1) set -- "$args0" ;;
+        2) set -- "$args0" "$args1" ;;
+        3) set -- "$args0" "$args1" "$args2" ;;
+        4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+        5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+        6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+        7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+        8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+        9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+    esac
+fi
+
+# Escape application args
+save () {
+    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
+    echo " "
+}
+APP_ARGS=`save "$@"`
+
+# Collect all arguments for the java command, following the shell quoting and substitution rules
+eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
+
+exec "$JAVACMD" "$@"

samples/SkiaJsSample/settings.gradle.kts

+pluginManagement {
+    repositories {
+        mavenCentral()
+        gradlePluginPortal()
+        maven {
+            url = uri("https://dl.bintray.com/kotlin/kotlin-eap")
+        }
+    }
+    
+}
+rootProject.name = "SkiaJsSample"
+

samples/SkiaJsSample/src/jsMain/kotlin/org/jetbrains/skiko/sample/js/App.kt

+package org.jetbrains.skiko.sample.js
+
+import org.jetbrains.skia.Paint
+
+fun main(args: Array<String>) {
+    println(Paint())
+}
\ No newline at end of file

skiko/build.gradle.kts

@@ -105,6 +105,9 @@ val skiaBinSubdir = "out/${buildType.id}-${targetOs.id}-${targetArch.id}"
 val Project.supportNative: Boolean
    get() = properties.get("skiko.native.enabled") == "true"
 
+val Project.supportWasm: Boolean
+    get() = properties.get("skiko.wasm.enabled") == "true"
+
 kotlin {
     jvm {
         compilations.all {
@@ -129,7 +132,7 @@ kotlin {
         val targetString = target
         val skiaDir = skiaDir.get().absolutePath
         val nativeTarget = when (targetString) {
-            "macos-x64", "macos-arm64" -> macosX64() {
+            "macos-x64", "macos-arm64" -> macosX64 {
                 compilations.all {
                     kotlinOptions {
                         freeCompilerArgs += listOf(
@@ -337,34 +340,43 @@ project.tasks.register<Exec>("objcCompile") {
 }
 
 project.tasks.register<Exec>("wasmCompile") {
-    dependsOn(skiaWasmDir)
-    val skiaDir = skiaWasmDir.get().absolutePath
-    val inputDir = "$projectDir/src/jsMain/cpp"
-    val outDir = "$buildDir/wasm"
-    val names = File(inputDir).listFiles()!!.filter { it.name.endsWith(".cc") }.map { it.name.removeSuffix(".cc") }
-    val srcs = names.map { "$inputDir/$it.cc" }.toTypedArray()
-    val outJs = "$outDir/skiko.js"
-    val outWasm = "$outDir/skiko.wasm"
-    workingDir = File(outDir)
-    commandLine = listOf(
-        "emcc",
-        *Arch.Wasm.clangFlags,
-        "-I$skiaDir",
-        "-I$skiaDir/include",
-        "-I$skiaDir/include/core",
-        "-I$skiaDir/include/effects",
-        "-I$skiaDir/include/gpu",
-        "-o", outJs,
-        *srcs
-    )
-    argumentProviders.add(CommandLineArgumentProvider {
-        val skiaBinDir = "$skiaDir/out/${buildType.id}-wasm-wasm"
-        // We must compute this list after Skia unpacking task has finished.
-        listOf(skiaBinDir).findAllFiles(".a")
-    })
-    file(outDir).mkdirs()
-    inputs.files(srcs)
-    outputs.files(outJs, outWasm)
+        dependsOn(skiaWasmDir)
+        val skiaDir = skiaWasmDir.get().absolutePath
+        val inputDir = "$projectDir/src/jsMain/cpp"
+        val outDir = "$buildDir/wasm"
+        val names = File(inputDir).listFiles()!!.filter { it.name.endsWith(".cc") }.map { it.name.removeSuffix(".cc") }
+        val srcs = names.map { "$inputDir/$it.cc" }.toTypedArray()
+        val outJs = "$outDir/skiko.js"
+        val outWasm = "$outDir/skiko.wasm"
+        workingDir = File(outDir)
+        if (supportWasm) {
+            commandLine = listOf(
+                "emcc",
+                *Arch.Wasm.clangFlags,
+                "-I$skiaDir",
+                "-I$skiaDir/include",
+                "-I$skiaDir/include/core",
+                "-I$skiaDir/include/effects",
+                "-I$skiaDir/include/gpu",
+                "-o", outJs,
+                *srcs
+            )
+            argumentProviders.add(CommandLineArgumentProvider {
+                val skiaBinDir = "$skiaDir/out/${buildType.id}-wasm-wasm"
+                // We must compute this list after Skia unpacking task has finished.
+                listOf(skiaBinDir).findAllFiles(".a")
+            })
+        } else {
+            // Create dummy files anyway.
+            commandLine = listOf(
+                "touch",
+                outJs,
+                outWasm
+            )
+        }
+        file(outDir).mkdirs()
+        inputs.files(srcs)
+        outputs.files(outJs, outWasm)
 }
 
 fun List<String>.findAllFiles(suffix: String): List<String> = this
@@ -597,7 +609,7 @@ library {
 
 val skikoJvmJar: Provider<Jar> by tasks.registering(Jar::class) {
     archiveBaseName.set("skiko-jvm")
-    from(kotlin.jvm().compilations["main"].output.allOutputs)
+        from(kotlin.jvm().compilations["main"].output.allOutputs)
 }
 
 val skikoNativeLib: File
@@ -653,13 +665,12 @@ val skikoJvmRuntimeJar by project.tasks.registering(Jar::class) {
     from(createChecksums.get().outputs.files)
 }
 
-project.tasks.register<Jar>("skikoJsJar") {
+val skikoWasmJar by project.tasks.registering(Jar::class) {
     // We produce jar that contains .js of wrapper/bindings and .wasm with Skia + bindings.
     from(project.tasks.named("wasmCompile").get().outputs)
-    from(project.tasks.named("jsJar").get().outputs)
     archiveBaseName.set("skiko-wasm")
     doLast {
-        println("output at ${outputs.files.files.single()}")
+        println("Wasm and JS at ${outputs.files.files.single()}")
     }
 }
 
@@ -801,11 +812,21 @@ publishing {
         if (supportNative) {
             create<MavenPublication>("skikoNativeRuntime") {
                 artifactId = SkikoArtifacts.nativeRuntimeArtifactIdFor(targetOs, targetArch)
-                    afterEvaluate {
-                        artifact(project.tasks.withType(KotlinNativeCompile::class.java)
+                afterEvaluate {
+                    artifact(project.tasks.withType(KotlinNativeCompile::class.java)
                                 .single { it.name.startsWith("compileKotlin") } // Exclude compileTestKotlin.
                                 .outputs.files.single { it.name.endsWith(".klib") })
-                    }
+                }
+            }
+        }
+        create<MavenPublication>("skikoJsRuntime") {
+            artifactId = SkikoArtifacts.jsArtifactId
+            artifact(project.tasks.named("jsJar").get())
+        }
+        if (supportWasm) {
+            create<MavenPublication>("skikoWasmRuntime") {
+                artifactId = SkikoArtifacts.jsWasmArtifactId
+                artifact(skikoWasmJar.get())
             }
         }
     }
@@ -824,7 +845,7 @@ afterEvaluate {
 
 // Kotlin/JS has a bug preventing compilation on non-x86 Linux machines,
 // see https://youtrack.jetbrains.com/issue/KT-48631
-// It always downloads and uses x86 version, so on those achitectures
+// It always downloads and uses x86 version, so on those architectures
 if (hostOs == OS.Linux && hostArch != Arch.X64) {
     rootProject.plugins.withType(org.jetbrains.kotlin.gradle.targets.js.nodejs.NodeJsRootPlugin::class.java) {
         rootProject.the<org.jetbrains.kotlin.gradle.targets.js.nodejs.NodeJsRootExtension>().download = false

skiko/buildSrc/src/main/kotlin/properties.kt

@@ -138,10 +138,10 @@ class SkikoProperties(private val myProject: Project) {
 object SkikoArtifacts {
     // names are also used in samples, e.g. samples/SkijaInjectSample/build.gradle
     val commonArtifactId = "skiko-jvm"
+    val jsArtifactId = "skiko-js-runtime"
+    val jsWasmArtifactId = "skiko-js-wasm-runtime"
     fun runtimeArtifactIdFor(os: OS, arch: Arch) =
         "skiko-jvm-runtime-${targetId(os, arch)}"
     fun nativeRuntimeArtifactIdFor(os: OS, arch: Arch) =
         "skiko-native-runtime-${targetId(os, arch)}"
-    fun nativeSkiaInteropArtifactIdFor(os: OS, arch: Arch) =
-        "skiko-native-skia-interop-${targetId(os, arch)}"
 }
\ No newline at end of file