Kotlin 1.1.3 upgrade

sureshg · Jun 23, 2017 · a1dd2a9 · a1dd2a9
1 parent 5da10be
commit a1dd2a9
Show file tree

Hide file tree

Showing 7 changed files with 17 additions and 19 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,8 @@
+## 1.1.2
+
+- Upgrade to kotlin 1.1.3
+- Build script fixes 
+
 ## 1.1.1
 
 - Filter out host issuer CN cert from trust store.

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -13,11 +13,10 @@ import term.*
 buildscript {
     var javaVersion: JavaVersion by extra { JavaVersion.VERSION_1_8 }
     var kotlinVersion: String by extra { "kotlin.version".sysProp }
-    var kotlinEAPRepo: String by extra { "wrapper.version".sysProp }
-    var wrapperVersion: String by extra { "kotlin.eap.repo".sysProp }
+    var kotlinEAPRepo: String by extra { "kotlin.eap.repo".sysProp }
+    var wrapperVersion: String by extra { "wrapper.version".sysProp }
 
     repositories {
-        gradleScriptKotlin()
         maven { setUrl("https://dl.bintray.com/kotlin/kotlin-eap") }
     }
 
@@ -83,12 +82,12 @@ tasks.withType<KotlinCompile> {
 }
 
 repositories {
-    gradleScriptKotlin()
+    jcenter()
     maven { setUrl(kotlinEAPRepo) }
 }
 
 dependencies {
-    compile(kotlin("stdlib-jre8"))
+    compile(kotlin("stdlib-jre8", kotlinVersion))
     compile("io.airlift:airline:0.7")
 }
 

diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
@@ -1,16 +1,11 @@
-buildscript {
-    repositories {
-        gradleScriptKotlin()
-    }
-}
-
 plugins {
-    val ktPlugin = System.getProperty("kotlin.version") ?: "1.1.2-2"
+    `kotlin-dsl`
+    val ktPlugin = System.getProperty("kotlin.version") ?: "1.1.3"
     kotlin("jvm", ktPlugin)
 }
 
 repositories {
-    gradleScriptKotlin()
+    jcenter()
 }
 
 dependencies {

diff --git a/gradle.properties b/gradle.properties
@@ -1,12 +1,12 @@
 # Gradle script kotlin
 appAuthor=Suresh
-appVersion=1.1.1
+appVersion=1.1.2
 
 # Kotlin, Plugins versions
-systemProp.kotlin.version=1.1.2-2
+systemProp.kotlin.version=1.1.3
 systemProp.dokka.version=0.9.15-eap-1
 systemProp.gradle-versions.version=0.15.0
-systemProp.wrapper.version=gradle-kotlin-dsl-4.1-20170617185729+0000
+systemProp.wrapper.version=gradle-kotlin-dsl-4.1-20170622074548+0000
 systemProp.kotlin.eap.repo=https://dl.bintray.com/kotlin/kotlin-eap-1.1
 systemProp.gradle.snap.url=https://repo.gradle.org/gradle/dist-snapshots
 

diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Sat Jun 17 14:19:02 PDT 2017
+#Fri Jun 23 13:16:43 PDT 2017
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://repo.gradle.org/gradle/dist-snapshots/gradle-kotlin-dsl-4.1-20170617185729+0000-all.zip
+distributionUrl=https\://repo.gradle.org/gradle/dist-snapshots/gradle-kotlin-dsl-4.1-20170622074548+0000-all.zip
diff --git a/settings.gradle b/settings.gradle
@@ -1 +0,0 @@
-rootProject.name = 'installcerts'