Updated samples (#4015)
This commit is contained in:
+1
-1
@@ -30,7 +30,7 @@ the sources is used. So you must build the compiler and the necessary platform l
|
||||
`./gradlew bundle` from the Kotlin/Native root directory before building samples (see
|
||||
[README.md](https://github.com/JetBrains/kotlin-native/blob/master/README.md) for details).
|
||||
|
||||
Alternatively you may remove a line `org.jetbrains.kotlin.native.home=<...>` from all `gradle.properties` files.
|
||||
Alternatively you may remove a line `kotlin.native.home=<...>` from all `gradle.properties` files.
|
||||
In this case the Gradle plugin downloads and uses a default compiler for this plugin version.
|
||||
|
||||
One may also build all the samples with one command. To build them using Gradle run:
|
||||
|
||||
@@ -7,10 +7,10 @@ kotlin.code.style=official
|
||||
|
||||
# Pin Kotlin version:
|
||||
# CHANGE_VERSION_WITH_RELEASE
|
||||
kotlin_version=1.3.70
|
||||
kotlin_version=1.3.71
|
||||
|
||||
# Use custom Kotlin/Native home:
|
||||
org.jetbrains.kotlin.native.home=../../dist
|
||||
kotlin.native.home=../../dist
|
||||
|
||||
# Increase memory for in-process compiler execution.
|
||||
org.gradle.jvmargs=-Xmx3g
|
||||
|
||||
@@ -7,10 +7,10 @@ kotlin.code.style=official
|
||||
|
||||
# Pin Kotlin version:
|
||||
# CHANGE_VERSION_WITH_RELEASE
|
||||
kotlin_version=1.3.70
|
||||
kotlin_version=1.3.71
|
||||
|
||||
# Use custom Kotlin/Native home:
|
||||
org.jetbrains.kotlin.native.home=../../../dist
|
||||
kotlin.native.home=../../../dist
|
||||
|
||||
# Increase memory for in-process compiler execution.
|
||||
org.gradle.jvmargs=-Xmx3g
|
||||
|
||||
@@ -7,10 +7,10 @@ kotlin.code.style=official
|
||||
|
||||
# Pin Kotlin version:
|
||||
# CHANGE_VERSION_WITH_RELEASE
|
||||
kotlin_version=1.3.70
|
||||
kotlin_version=1.3.71
|
||||
|
||||
# Use custom Kotlin/Native home:
|
||||
org.jetbrains.kotlin.native.home=../../../dist
|
||||
kotlin.native.home=../../../dist
|
||||
|
||||
# Increase memory for in-process compiler execution.
|
||||
org.gradle.jvmargs=-Xmx3g
|
||||
|
||||
@@ -6,11 +6,11 @@ kotlin.code.style=official
|
||||
|
||||
# Pin Kotlin version:
|
||||
# CHANGE_VERSION_WITH_RELEASE
|
||||
kotlin_version=1.3.70
|
||||
kotlin_version=1.3.71
|
||||
|
||||
# Use custom Kotlin/Native home:
|
||||
org.jetbrains.kotlin.native.home=../../dist
|
||||
kotlin.native.home=../../dist
|
||||
org.gradle.workers.max=4
|
||||
|
||||
# Increase memory for in-process compiler execution.
|
||||
org.gradle.jvmargs=-Xmx3g
|
||||
org.gradle.jvmargs=-Xmx3g
|
||||
@@ -1,3 +1,3 @@
|
||||
org.jetbrains.kotlin.native.jvmArgs=-Xmx8g
|
||||
kotlin.native.jvmArgs=-Xmx8g
|
||||
kotlin.code.style=official
|
||||
kotlin.import.noCommonSourceSets=true
|
||||
|
||||
@@ -6,7 +6,7 @@ from a Kotlin/Native code.
|
||||
> __Note__: If you build this sample not from the Kotlin/Native repository, you need to specify a path to a
|
||||
Kotlin/Native distribution. Add the following snippet in `gradle.properties`:
|
||||
>```
|
||||
>org.jetbrains.kotlin.native.home=<path-to-distribution>
|
||||
>kotlin.native.home=<path-to-distribution>
|
||||
>```
|
||||
> The default distribution path is `$HOME/.konan/kotlin-native-<macos|linux|windows>-<version>`.
|
||||
|
||||
|
||||
@@ -44,7 +44,7 @@ val jsinterop by tasks.creating(Exec::class) {
|
||||
workingDir = projectDir
|
||||
|
||||
val ext = if (isWindows) ".bat" else ""
|
||||
val distributionPath = project.properties["org.jetbrains.kotlin.native.home"] as String?
|
||||
val distributionPath = project.properties["kotlin.native.home"] as String?
|
||||
|
||||
if (distributionPath != null) {
|
||||
val jsinteropCommand = file(distributionPath).resolve("bin").resolve("jsinterop$ext")
|
||||
@@ -66,7 +66,7 @@ val jsinterop by tasks.creating(Exec::class) {
|
||||
"""
|
||||
|
|
||||
|Kotlin/Native distribution path must be specified to build the JavaScript interop.
|
||||
|Use 'org.jetbrains.kotlin.native.home' project property to specify it.
|
||||
|Use 'kotlin.native.home' project property to specify it.
|
||||
""".trimMargin()
|
||||
)
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user