Update to Kotlin 1.3.10; produce runnable jar (Kotlin#18)

yole · yole · commit 3c30885cea1b · 2018-11-20T08:32:39.000+01:00
diff --git a/gradle/hello-world/build.gradle b/gradle/hello-world/build.gradle
@@ -1,5 +1,5 @@
 buildscript {
-  ext.kotlin_version = '1.1.4-3'
+  ext.kotlin_version = '1.3.10'
   repositories {
     mavenCentral()
   }
@@ -25,6 +25,11 @@ dependencies {
   testCompile "org.jetbrains.kotlin:kotlin-test-junit:$kotlin_version"
 }
 
+jar {
+  manifest { attributes 'Main-Class': 'demo.HelloWorldKt' }
+  from { configurations.compile.collect { it.isDirectory() ? it : zipTree(it) } }
+}
+
 task wrapper(type: Wrapper) {
-  gradleVersion = "4.1"
+  gradleVersion = "4.10.2"
 }
diff --git a/gradle/hello-world/gradle/wrapper/gradle-wrapper.properties b/gradle/hello-world/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.10-all.zip

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`buildscript {`
`2`		`- ext.kotlin_version = '1.1.4-3'`
	`2`	`+ ext.kotlin_version = '1.3.10'`
`3`	`3`	`repositories {`
`4`	`4`	`mavenCentral()`
`5`	`5`	`}`
`@@ -25,6 +25,11 @@ dependencies {`
`25`	`25`	`testCompile "org.jetbrains.kotlin:kotlin-test-junit:$kotlin_version"`
`26`	`26`	`}`
`27`	`27`
	`28`	`+jar {`
	`29`	`+ manifest { attributes 'Main-Class': 'demo.HelloWorldKt' }`
	`30`	`+ from { configurations.compile.collect { it.isDirectory() ? it : zipTree(it) } }`
	`31`	`+}`
	`32`	`+`
`28`	`33`	`task wrapper(type: Wrapper) {`
`29`		`- gradleVersion = "4.1"`
	`34`	`+ gradleVersion = "4.10.2"`
`30`	`35`	`}`