Upgrade samples to Kotlin 1.2.30

bamboo · bamboo · commit 0bae9dd8d2d2 · 2018-03-07T12:51:41.000-03:00
diff --git a/samples-tests/src/test/kotlin/org/gradle/kotlin/dsl/samples/SamplesSmokeTest.kt b/samples-tests/src/test/kotlin/org/gradle/kotlin/dsl/samples/SamplesSmokeTest.kt
@@ -8,7 +8,6 @@ import org.hamcrest.CoreMatchers.containsString
 import org.junit.Assert.assertThat
 import org.junit.Assume.assumeTrue
 import org.junit.Before
-import org.junit.Ignore
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.junit.runners.Parameterized
@@ -39,7 +38,6 @@ class SamplesSmokeTest(
         build("tasks")
     }
 
-    @Ignore("Requires a wrapper update")
     @Test
     fun `uses the right Kotlin Gradle Plugin version on `() {
 
diff --git a/samples/hello-android/build.gradle.kts b/samples/hello-android/build.gradle.kts
@@ -1,6 +1,6 @@
 plugins {
     id("com.android.application") version "3.0.1"
-    kotlin("android") version "1.2.21"
+    kotlin("android") version "1.2.30"
 }
 
 android {
@@ -27,7 +27,7 @@ android {
 dependencies {
     compile("com.android.support:appcompat-v7:27.0.1")
     compile("com.android.support.constraint:constraint-layout:1.0.2")
-    compile(kotlin("stdlib", "1.2.21"))
+    compile(kotlin("stdlib", "1.2.30"))
 }
 
 repositories {
diff --git a/samples/hello-coroutines/build.gradle.kts b/samples/hello-coroutines/build.gradle.kts
@@ -2,7 +2,7 @@ import org.jetbrains.kotlin.gradle.dsl.Coroutines
 
 plugins {
     application
-    kotlin("jvm") version "1.2.21"
+    kotlin("jvm") version "1.2.30"
 }
 
 application {
diff --git a/samples/hello-js/build.gradle.kts b/samples/hello-js/build.gradle.kts
@@ -1,7 +1,7 @@
 import org.jetbrains.kotlin.gradle.tasks.Kotlin2JsCompile
 
 plugins {
-    id("kotlin2js") version "1.2.21"
+    id("kotlin2js") version "1.2.30"
 }
 
 dependencies {
diff --git a/samples/hello-kapt/build.gradle.kts b/samples/hello-kapt/build.gradle.kts
@@ -1,7 +1,7 @@
 plugins {
     application
-    kotlin("jvm") version "1.2.21"
-    kotlin("kapt") version "1.2.21"
+    kotlin("jvm") version "1.2.30"
+    kotlin("kapt") version "1.2.30"
 }
 
 application {
diff --git a/samples/hello-kotlin/build.gradle.kts b/samples/hello-kotlin/build.gradle.kts
@@ -1,6 +1,6 @@
 plugins {
     application
-    kotlin("jvm") version "1.2.21"
+    kotlin("jvm") version "1.2.30"
 }
 
 application {
diff --git a/samples/maven-publish/build.gradle.kts b/samples/maven-publish/build.gradle.kts
@@ -1,7 +1,7 @@
 import org.gradle.api.tasks.bundling.Jar
 
 plugins {
-    kotlin("jvm") version "1.2.21"
+    kotlin("jvm") version "1.2.30"
     `maven-publish`
 }
 
diff --git a/samples/multi-kotlin-project-config-injection/build.gradle.kts b/samples/multi-kotlin-project-config-injection/build.gradle.kts
@@ -2,7 +2,7 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 plugins {
     base
-    kotlin("jvm") version "1.2.21" apply false
+    kotlin("jvm") version "1.2.30" apply false
 }
 
 allprojects {
diff --git a/samples/multi-kotlin-project-with-buildSrc/build.gradle.kts b/samples/multi-kotlin-project-with-buildSrc/build.gradle.kts
@@ -1,6 +1,6 @@
 plugins {
     base
-    kotlin("jvm") version "1.2.21" apply false
+    kotlin("jvm") version "1.2.30" apply false
 }
 
 allprojects {
diff --git a/samples/multi-kotlin-project/build.gradle.kts b/samples/multi-kotlin-project/build.gradle.kts
@@ -1,6 +1,6 @@
 plugins {
     base
-    kotlin("jvm") version "1.2.21" apply false
+    kotlin("jvm") version "1.2.30" apply false
 }
 
 allprojects {

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`plugins {`
`2`	`2`	`id("com.android.application") version "3.0.1"`
`3`		`- kotlin("android") version "1.2.21"`
	`3`	`+ kotlin("android") version "1.2.30"`
`4`	`4`	`}`
`5`	`5`
`6`	`6`	`android {`
`@@ -27,7 +27,7 @@ android {`
`27`	`27`	`dependencies {`
`28`	`28`	`compile("com.android.support:appcompat-v7:27.0.1")`
`29`	`29`	`compile("com.android.support.constraint:constraint-layout:1.0.2")`
`30`		`- compile(kotlin("stdlib", "1.2.21"))`
	`30`	`+ compile(kotlin("stdlib", "1.2.30"))`
`31`	`31`	`}`
`32`	`32`
`33`	`33`	`repositories {`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@ import org.jetbrains.kotlin.gradle.dsl.Coroutines`
`2`	`2`
`3`	`3`	`plugins {`
`4`	`4`	`application`
`5`		`- kotlin("jvm") version "1.2.21"`
	`5`	`+ kotlin("jvm") version "1.2.30"`
`6`	`6`	`}`
`7`	`7`
`8`	`8`	`application {`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`import org.jetbrains.kotlin.gradle.tasks.Kotlin2JsCompile`
`2`	`2`
`3`	`3`	`plugins {`
`4`		`- id("kotlin2js") version "1.2.21"`
	`4`	`+ id("kotlin2js") version "1.2.30"`
`5`	`5`	`}`
`6`	`6`
`7`	`7`	`dependencies {`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`import org.gradle.api.tasks.bundling.Jar`
`2`	`2`
`3`	`3`	`plugins {`
`4`		`- kotlin("jvm") version "1.2.21"`
	`4`	`+ kotlin("jvm") version "1.2.30"`
`5`	`5`	`maven-publish`
`6`	`6`	`}`
`7`	`7`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile`
`2`	`2`
`3`	`3`	`plugins {`
`4`	`4`	`base`
`5`		`- kotlin("jvm") version "1.2.21" apply false`
	`5`	`+ kotlin("jvm") version "1.2.30" apply false`
`6`	`6`	`}`
`7`	`7`
`8`	`8`	`allprojects {`