Update Kotlin to 1.3.0-dev-496; Update README.md

h0tk3y · Sep 12, 2018 · 0a09f03 · 0a09f03
1 parent 733ad00
commit 0a09f03
Show file tree

Hide file tree

Showing 10 changed files with 13 additions and 19 deletions.
diff --git a/README.md b/README.md
@@ -201,7 +201,7 @@ kotlin.sourceSets {
 
 These settings affect the behavior of analysis:
 
-* (TBD) In the IDE, each module created from a source set uses takes its language settings into the facet
+* In the IDE, each module created from a source set uses takes its language settings into the facet
 * During a Gradle build, the language settings of the default source set created for a compilation are used for the Kotlin compilation task (with the task's own `kotlinOptions` having higher priority on language and API versions)
 
 The language settings are checked for consistency between source sets depending on each other. Namely, if `foo` depends on `bar`:
@@ -283,18 +283,14 @@ We are going to implement this in two steps.
 
 * Some targets [may only be built with an appropriate host](https://github.com/JetBrains/kotlin/blob/2251440f04e5bdb4bdfef2dc47c30356b7f39411/konan/utils/src/org/jetbrains/kotlin/konan/target/KonanTarget.kt#L168) (e.g. a Windows machine cannot build Linux or iOS native artifacts). An unsupported target is skipped during builds.
 
-    * (TBD) During publishing with the `maven-publish` plugin, only artifacts for targets supported by the host should be published. Currently, publishing from a host that does not support some of the targets erases their artifacts from the Gradle metadata.
+    * During publishing with the `maven-publish` plugin, only artifacts for targets supported by the host should be published. Currently, publishing from a host that does not support some of the targets erases their artifacts from the Gradle metadata.
 
 * To build an executable for a Kotlin/Native target, say, a `linuxX64` one, add the following to the build script:
 
     ```groovy
-    import org.jetbrains.kotlin.gradle.plugin.mpp.NativeOutputKind
-    
-    /* ... */
-    
     kotlin.targets {
         fromPreset(presets.linuxX64, 'foo') {
-            compilations.main.outputKinds += NativeOutputKind.EXECUTABLE
+            compilations.main.outputKinds('EXECUTABLE')
         }
     }
     ```

diff --git a/common-lib-and-android-app/app/build.gradle b/common-lib-and-android-app/app/build.gradle
@@ -10,7 +10,7 @@ buildscript {
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:3.2.0-beta03'
-        classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.0-dev-1'
+        classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.0-dev-496'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files

diff --git a/common-lib-and-android-app/lib-arithmetic/build.gradle b/common-lib-and-android-app/lib-arithmetic/build.gradle
@@ -8,7 +8,7 @@ buildscript {
 		maven { url 'https://dl.bintray.com/kotlin/kotlin-dev' }
 	}
 	dependencies {
-		classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.0-dev-1'
+		classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.0-dev-496'
 	}
 }
 

diff --git a/common-lib-and-android-app/lib-strings/build.gradle b/common-lib-and-android-app/lib-strings/build.gradle
@@ -8,7 +8,7 @@ buildscript {
         maven { url 'https://dl.bintray.com/kotlin/kotlin-dev' }
     }
     dependencies {
-        classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.0-dev-1'
+        classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.0-dev-496'
     }
 }
 

diff --git a/lib-and-app/sample-app/build.gradle b/lib-and-app/sample-app/build.gradle
@@ -1,13 +1,11 @@
-import org.jetbrains.kotlin.gradle.plugin.mpp.NativeOutputKind
-
 buildscript {
     repositories {
         mavenLocal()
         jcenter()
         maven { url 'https://dl.bintray.com/kotlin/kotlin-dev' }
     }
     dependencies {
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.0-dev-1"
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.0-dev-496"
     }
 }
 
@@ -51,7 +49,7 @@ kotlin {
         fromPreset(presets.macosX64, 'mac')
 
         configure([linux, windows, mac]) {
-            compilations.main.outputKinds += NativeOutputKind.EXECUTABLE
+            compilations.main.outputKinds('EXECUTABLE')
         }
     }
 }
diff --git a/lib-and-app/sample-lib/build.gradle b/lib-and-app/sample-lib/build.gradle
@@ -8,7 +8,7 @@ buildscript {
         maven { url 'https://dl.bintray.com/kotlin/kotlin-dev' }
     }
     dependencies {
-        classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.0-dev-1'
+        classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.0-dev-496'
     }
 }
 

diff --git a/lib-with-java/build.gradle b/lib-with-java/build.gradle
@@ -8,7 +8,7 @@ buildscript {
         maven { url 'https://dl.bintray.com/kotlin/kotlin-dev' }
 	}
 	dependencies {
-		classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.0-dev-1'
+		classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.0-dev-496'
 	}
 }
 

diff --git a/multiple-targets-same-platform/sample-app/build.gradle b/multiple-targets-same-platform/sample-app/build.gradle
@@ -5,7 +5,7 @@ buildscript {
         maven { url 'https://dl.bintray.com/kotlin/kotlin-dev' }
     }
     dependencies {
-        classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.0-dev-1'
+        classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.0-dev-496'
     }
 }
 

diff --git a/project-dependency/build.gradle b/project-dependency/build.gradle
@@ -5,7 +5,7 @@ buildscript {
 		maven { url 'https://dl.bintray.com/kotlin/kotlin-dev' }
 	}
 	dependencies {
-		classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.0-dev-1"
+		classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.0-dev-496"
 	}
 }
 

diff --git a/split-actuals/build.gradle b/split-actuals/build.gradle
@@ -1,5 +1,5 @@
 buildscript {
-    ext.kotlin_version = '1.3.0-dev-1'
+    ext.kotlin_version = '1.3.0-dev-496'
     repositories {
         mavenLocal()
         jcenter()