Polishing samples: small fixes (#2275)
* Polishing samples: small fixes * Switch samples to Kotlin plugin v. 1.3.0 * Fix JS-interop cmd path for Windows #2274
This commit is contained in:
@@ -2,7 +2,7 @@
|
|||||||
org.gradle.parallel=true
|
org.gradle.parallel=true
|
||||||
|
|
||||||
# Pin Kotlin version:
|
# Pin Kotlin version:
|
||||||
kotlin_version=1.3.0-rc-202
|
kotlin_version=1.3.0
|
||||||
|
|
||||||
# Use custom Kotlin/Native home:
|
# Use custom Kotlin/Native home:
|
||||||
org.jetbrains.kotlin.native.home=../../dist
|
org.jetbrains.kotlin.native.home=../../dist
|
||||||
|
|||||||
@@ -9,7 +9,7 @@ plugins {
|
|||||||
|
|
||||||
repositories {
|
repositories {
|
||||||
jcenter()
|
jcenter()
|
||||||
maven { url "https://dl.bintray.com/kotlin/ktor" }
|
maven { url 'https://dl.bintray.com/kotlin/ktor' }
|
||||||
}
|
}
|
||||||
|
|
||||||
String packageName = 'kotlinx.interop.wasm.dom'
|
String packageName = 'kotlinx.interop.wasm.dom'
|
||||||
@@ -31,7 +31,7 @@ kotlin {
|
|||||||
}
|
}
|
||||||
httpServerMain {
|
httpServerMain {
|
||||||
dependencies {
|
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) {
|
task jsinterop(type: Exec) {
|
||||||
workingDir projectDir
|
workingDir projectDir
|
||||||
def ext = MPPTools.isWindows() ? '.bat' : ''
|
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) {
|
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,
|
'-pkg', packageName,
|
||||||
'-o', jsinteropKlibFileName,
|
'-o', jsinteropKlibFileName,
|
||||||
'-target', 'wasm32'
|
'-target', 'wasm32'
|
||||||
|
|||||||
@@ -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"
|
|
||||||
Reference in New Issue
Block a user