diff --git a/samples/gradle.properties b/samples/gradle.properties index d406f3c36fb..2ba850a9cfc 100644 --- a/samples/gradle.properties +++ b/samples/gradle.properties @@ -2,7 +2,7 @@ org.gradle.parallel=true # Pin Kotlin version: -kotlin_version=1.3.0-rc-202 +kotlin_version=1.3.0 # Use custom Kotlin/Native home: org.jetbrains.kotlin.native.home=../../dist diff --git a/samples/html5Canvas/build.gradle b/samples/html5Canvas/build.gradle index 5afdc4bb8ac..27a83fab620 100644 --- a/samples/html5Canvas/build.gradle +++ b/samples/html5Canvas/build.gradle @@ -9,7 +9,7 @@ plugins { repositories { jcenter() - maven { url "https://dl.bintray.com/kotlin/ktor" } + maven { url 'https://dl.bintray.com/kotlin/ktor' } } String packageName = 'kotlinx.interop.wasm.dom' @@ -31,7 +31,7 @@ kotlin { } httpServerMain { dependencies { - implementation "io.ktor:ktor-server-netty:1.0.0-beta-1" + implementation 'io.ktor:ktor-server-netty:1.0.0-beta-2' } } } @@ -40,9 +40,9 @@ kotlin { task jsinterop(type: Exec) { workingDir projectDir def ext = MPPTools.isWindows() ? '.bat' : '' - def distributionPath = project.properties['org.jetbrains.kotlin.native.home'] + def distributionPath = project.properties['org.jetbrains.kotlin.native.home'] as String if (distributionPath != null) { - commandLine Paths.get(distributionPath as String, 'bin', "jsinterop$ext").toString(), + commandLine Paths.get(file(distributionPath).path, 'bin', "jsinterop$ext").toString(), '-pkg', packageName, '-o', jsinteropKlibFileName, '-target', 'wasm32' diff --git a/samples/konan.sh b/samples/konan.sh deleted file mode 100644 index c203df866f9..00000000000 --- a/samples/konan.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/usr/bin/env bash - -if [ -z "$KONAN_HOME" ]; then - PATH="$DIR/../../dist/bin:$DIR/../../bin:$PATH" -else - PATH="$KONAN_HOME/bin:$PATH" -fi - -KONAN_USER_DIR=${KONAN_DATA_DIR:-"$HOME/.konan"} -KONAN_DEPS="$KONAN_USER_DIR/dependencies"