From 5ee98cb443b96e2eddc070a5a8e5f541d13efd36 Mon Sep 17 00:00:00 2001
From: LepilkinaElena <Elena.Lepilkina@jetbrains.com>
Date: Wed, 25 Sep 2019 18:25:45 +0300
Subject: [PATCH] Changed samples to use new MPP plugin flag (#3379)

---
 .../org/jetbrains/kotlin/benchmark/BenchmarkingPlugin.kt       | 3 ++-
 performance/swiftinterop/build.gradle                          | 3 ++-
 samples/coverage/build.gradle.kts                              | 2 +-
 samples/csvparser/build.gradle.kts                             | 2 +-
 samples/gradle.properties                                      | 2 +-
 samples/tetris/build.gradle.kts                                | 2 +-
 samples/videoplayer/build.gradle.kts                           | 2 +-
 7 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/build-tools/src/main/kotlin/org/jetbrains/kotlin/benchmark/BenchmarkingPlugin.kt b/build-tools/src/main/kotlin/org/jetbrains/kotlin/benchmark/BenchmarkingPlugin.kt
index 37e06088fa3..b1cd2abb39f 100644
--- a/build-tools/src/main/kotlin/org/jetbrains/kotlin/benchmark/BenchmarkingPlugin.kt
+++ b/build-tools/src/main/kotlin/org/jetbrains/kotlin/benchmark/BenchmarkingPlugin.kt
@@ -173,7 +173,8 @@ open class BenchmarkingPlugin: Plugin<Project> {
 
     private fun Project.configureNativeTarget(hostPreset: KotlinNativeTargetPreset) {
         kotlin.targetFromPreset(hostPreset, NATIVE_TARGET_NAME) {
-            compilations.getByName("main").kotlinOptions.freeCompilerArgs = project.compilerArgs + listOf("-l", "kotlinx-cli")
+            compilations.getByName("main").kotlinOptions.freeCompilerArgs = project.compilerArgs
+            compilations.getByName("main").enableEndorsedLibs = true
             binaries.executable(NATIVE_EXECUTABLE_NAME, listOf(RELEASE)) {
                 if (HostManager.hostIsMingw) {
                     linkerOpts.add("-L${mingwPath}/lib")
diff --git a/performance/swiftinterop/build.gradle b/performance/swiftinterop/build.gradle
index c8188d47dfd..a7a7f030093 100644
--- a/performance/swiftinterop/build.gradle
+++ b/performance/swiftinterop/build.gradle
@@ -55,7 +55,8 @@ kotlin {
     }
 
     macosX64("macos") {
-        compilations.main.kotlinOptions.freeCompilerArgs = ["-l", "kotlinx-cli", "-opt"] + (project.hasProperty('compilerArgs') ? compilerArgs.split() : [])
+        compilations.main.kotlinOptions.freeCompilerArgs = (project.hasProperty('compilerArgs') ? compilerArgs.split() : [])
+        compilations.main.enableEndorsedLibs = true
         binaries {
             framework(frameworkName, [RELEASE])
         }
diff --git a/samples/coverage/build.gradle.kts b/samples/coverage/build.gradle.kts
index e9100f070de..da5c3fea60f 100644
--- a/samples/coverage/build.gradle.kts
+++ b/samples/coverage/build.gradle.kts
@@ -24,7 +24,7 @@ kotlin {
             executable(listOf(DEBUG))
         }
         binaries.getTest("DEBUG").apply {
-            freeCompilerArgs.add("-Xlibrary-to-cover=${compilations["main"].output.classesDirs.singleFile.absolutePath}")
+            freeCompilerArgs += listOf("-Xlibrary-to-cover=${compilations["main"].output.classesDirs.singleFile.absolutePath}")
         }
     }
 }
diff --git a/samples/csvparser/build.gradle.kts b/samples/csvparser/build.gradle.kts
index 1e752713257..7d2da6fe2f5 100644
--- a/samples/csvparser/build.gradle.kts
+++ b/samples/csvparser/build.gradle.kts
@@ -15,7 +15,7 @@ kotlin {
     }
         
     hostTarget.apply {
-        compilations["main"].kotlinOptions.freeCompilerArgs = listOf("-l", "kotlinx-cli")
+        compilations["main"].enableEndorsedLibs = true
         binaries {
             executable {
                 entryPoint = "sample.csvparser.main"
diff --git a/samples/gradle.properties b/samples/gradle.properties
index be416d70cbc..3d14c1f954c 100644
--- a/samples/gradle.properties
+++ b/samples/gradle.properties
@@ -5,7 +5,7 @@ org.gradle.parallel=true
 
 # Pin Kotlin version:
 # CHANGE_VERSION_WITH_RELEASE
-kotlin_version=1.3.50
+kotlin_version=1.3.60-dev-2497
 
 # Use custom Kotlin/Native home:
 org.jetbrains.kotlin.native.home=../../dist
diff --git a/samples/tetris/build.gradle.kts b/samples/tetris/build.gradle.kts
index 04b60f8b1f7..f25ee68d454 100644
--- a/samples/tetris/build.gradle.kts
+++ b/samples/tetris/build.gradle.kts
@@ -70,7 +70,7 @@ kotlin {
             }
         }
 
-        compilations["main"].kotlinOptions.freeCompilerArgs = listOf("-l", "kotlinx-cli")
+        compilations["main"].enableEndorsedLibs = true
     }
 }
 
diff --git a/samples/videoplayer/build.gradle.kts b/samples/videoplayer/build.gradle.kts
index 8f8df6a6995..1cc2a964b93 100644
--- a/samples/videoplayer/build.gradle.kts
+++ b/samples/videoplayer/build.gradle.kts
@@ -46,7 +46,7 @@ kotlin {
             }
         }
 
-        compilations["main"].kotlinOptions.freeCompilerArgs = listOf("-l", "kotlinx-cli")
+        compilations["main"].enableEndorsedLibs = true
     }
 
     // Enable experimental stdlib API used by the sample.