From 3329f74c27b683574ac181bc40e3836ceccce6c1 Mon Sep 17 00:00:00 2001
From: Ilya Matveev <ilya.matveev@jetbrains.com>
Date: Fri, 31 May 2019 19:41:25 +0300
Subject: [PATCH] Samples: Enable experimental standard library API

---
 samples/echoServer/build.gradle.kts  | 7 ++++++-
 samples/libcurl/build.gradle.kts     | 5 +++++
 samples/tensorflow/build.gradle.kts  | 2 +-
 samples/torch/build.gradle.kts       | 4 ++--
 samples/videoplayer/build.gradle.kts | 5 +++++
 5 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/samples/echoServer/build.gradle.kts b/samples/echoServer/build.gradle.kts
index da4ac5c56ae..3b96e35c9c6 100644
--- a/samples/echoServer/build.gradle.kts
+++ b/samples/echoServer/build.gradle.kts
@@ -4,7 +4,7 @@ plugins {
     kotlin("multiplatform")
 }
 
-// Add two additional presets for Raspberry Pi.
+// Add two additional presets for Raspberry Pi and Linux/ARM64.
 val raspberryPiPresets: List<KotlinNativeTargetPreset> = listOf("linuxArm32Hfp", "linuxArm64").map {
     kotlin.presets[it] as KotlinNativeTargetPreset
 }
@@ -44,4 +44,9 @@ kotlin {
             getByName(mainSourceSetName).dependsOn(echoServerMain)
         }
     }
+
+    // Enable experimental stdlib API used by the sample.
+    sourceSets.all {
+        languageSettings.useExperimentalAnnotation("kotlin.ExperimentalStdlibApi")
+    }
 }
diff --git a/samples/libcurl/build.gradle.kts b/samples/libcurl/build.gradle.kts
index bf1456005f8..b3d3e70708c 100644
--- a/samples/libcurl/build.gradle.kts
+++ b/samples/libcurl/build.gradle.kts
@@ -54,4 +54,9 @@ kotlin {
             }
         }
     }
+
+    // Enable experimental stdlib API used by the sample.
+    sourceSets.all {
+        languageSettings.useExperimentalAnnotation("kotlin.ExperimentalStdlibApi")
+    }
 }
diff --git a/samples/tensorflow/build.gradle.kts b/samples/tensorflow/build.gradle.kts
index e2c18948375..36e679dad28 100644
--- a/samples/tensorflow/build.gradle.kts
+++ b/samples/tensorflow/build.gradle.kts
@@ -34,7 +34,7 @@ kotlin {
         }
         compilations["main"].cinterops {
             val tensorflow by creating {
-                includeDirs(tensorflowHome.resolve("/include"))
+                includeDirs(tensorflowHome.resolve("include"))
             }
         }
     }
diff --git a/samples/torch/build.gradle.kts b/samples/torch/build.gradle.kts
index 80c4815e07a..113a5e6c617 100644
--- a/samples/torch/build.gradle.kts
+++ b/samples/torch/build.gradle.kts
@@ -36,8 +36,8 @@ kotlin {
         compilations["main"].cinterops {
             val torch by creating {
                 includeDirs(
-                    torchHome.resolve("/include"),
-                    torchHome.resolve("/include/TH")
+                    torchHome.resolve("include"),
+                    torchHome.resolve("include/TH")
                 )
             }
         }
diff --git a/samples/videoplayer/build.gradle.kts b/samples/videoplayer/build.gradle.kts
index e6405844589..8a520c100be 100644
--- a/samples/videoplayer/build.gradle.kts
+++ b/samples/videoplayer/build.gradle.kts
@@ -46,4 +46,9 @@ kotlin {
             }
         }
     }
+
+    // Enable experimental stdlib API used by the sample.
+    sourceSets.all {
+        languageSettings.useExperimentalAnnotation("kotlin.ExperimentalStdlibApi")
+    }
 }