diff --git a/samples/README.md b/samples/README.md index 8f5e33b6f7d..9e2a53a1da4 100644 --- a/samples/README.md +++ b/samples/README.md @@ -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: diff --git a/samples/androidNativeActivity/gradle.properties b/samples/androidNativeActivity/gradle.properties index 549b800b9cc..fe143bce0b5 100644 --- a/samples/androidNativeActivity/gradle.properties +++ b/samples/androidNativeActivity/gradle.properties @@ -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 diff --git a/samples/calculator/gradle.properties b/samples/calculator/gradle.properties index 2e0a002a29f..32a724e00c6 100644 --- a/samples/calculator/gradle.properties +++ b/samples/calculator/gradle.properties @@ -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 diff --git a/samples/cocoapods/kotlin-library/gradle.properties b/samples/cocoapods/kotlin-library/gradle.properties index 2e0a002a29f..32a724e00c6 100644 --- a/samples/cocoapods/kotlin-library/gradle.properties +++ b/samples/cocoapods/kotlin-library/gradle.properties @@ -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 diff --git a/samples/gradle.properties b/samples/gradle.properties index 11d7eed5e54..1260a735332 100644 --- a/samples/gradle.properties +++ b/samples/gradle.properties @@ -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 \ No newline at end of file diff --git a/samples/gtk/gradle.properties b/samples/gtk/gradle.properties index d46ff933fd4..f833920c5d7 100644 --- a/samples/gtk/gradle.properties +++ b/samples/gtk/gradle.properties @@ -1,3 +1,3 @@ -org.jetbrains.kotlin.native.jvmArgs=-Xmx8g +kotlin.native.jvmArgs=-Xmx8g kotlin.code.style=official kotlin.import.noCommonSourceSets=true diff --git a/samples/html5Canvas/README.md b/samples/html5Canvas/README.md index 723a04f9f17..24e19a4da9f 100644 --- a/samples/html5Canvas/README.md +++ b/samples/html5Canvas/README.md @@ -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= +>kotlin.native.home= >``` > The default distribution path is `$HOME/.konan/kotlin-native--`. diff --git a/samples/html5Canvas/build.gradle.kts b/samples/html5Canvas/build.gradle.kts index e4022a79711..1eb51b6f234 100644 --- a/samples/html5Canvas/build.gradle.kts +++ b/samples/html5Canvas/build.gradle.kts @@ -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() ) }