Upgrade to Kotlin 1.4 (#917)

raniejade · web-flow · commit 7f0416463739 · 2020-08-27T23:07:17.000+10:00
diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
@@ -7,15 +7,13 @@ plugins {
 repositories {
     jcenter()
     gradlePluginPortal()
-    maven ("https://dl.bintray.com/kotlin/kotlin-eap")
-    maven ("https://kotlin.bintray.com/kotlinx")
 }
 
 dependencies {
-    api(kotlin("gradle-plugin", version = "1.4.0-rc"))
+    api(kotlin("gradle-plugin", version = "1.4.0"))
     api("org.jetbrains.dokka:dokka-gradle-plugin:1.4.0-rc")
     api("com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.4")
-    api("gradle.plugin.org.jetbrains.intellij.plugins:gradle-intellij-plugin:0.4.10")
+    api("gradle.plugin.org.jetbrains.intellij.plugins:gradle-intellij-plugin:0.4.21")
     api("com.github.jengelman.gradle.plugins:shadow:4.0.2")
-    implementation(kotlin("reflect", version = "1.4.0-rc"))
+    implementation(kotlin("reflect", version = "1.4.0"))
 }
diff --git a/buildSrc/src/main/kotlin/Dependencies.kt b/buildSrc/src/main/kotlin/Dependencies.kt
@@ -16,7 +16,7 @@ object Dependencies {
     val mockitoCore = "org.mockito:mockito-core:2.23.4"
     val mockitoInline = "org.mockito:mockito-inline:2.23.4"
 
-    val kotlinCoroutinesCore = "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.8-1.4.0-rc"
+    val kotlinCoroutinesCore = "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.9"
 
     val autoService = "com.google.auto.service:auto-service:1.0-rc4"
 }
diff --git a/integration-test/buildSrc/build.gradle.kts b/integration-test/buildSrc/build.gradle.kts
@@ -1,10 +1,8 @@
 repositories {
   jcenter()
-  maven ("https://dl.bintray.com/kotlin/kotlin-eap")
-  maven ("https://kotlin.bintray.com/kotlinx")
 }
 
 dependencies {
-  implementation(kotlin("gradle-plugin", version = "1.4.0-rc"))
-  implementation(kotlin("reflect", version = "1.4.0-rc"))
+  implementation(kotlin("gradle-plugin", version = "1.4.0"))
+  implementation(kotlin("reflect", version = "1.4.0"))
 }

Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ object Dependencies {`
`16`	`16`	`val mockitoCore = "org.mockito:mockito-core:2.23.4"`
`17`	`17`	`val mockitoInline = "org.mockito:mockito-inline:2.23.4"`
`18`	`18`
`19`		`- val kotlinCoroutinesCore = "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.8-1.4.0-rc"`
	`19`	`+ val kotlinCoroutinesCore = "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.9"`
`20`	`20`
`21`	`21`	`val autoService = "com.google.auto.service:auto-service:1.0-rc4"`
`22`	`22`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,10 +1,8 @@`
`1`	`1`	`repositories {`
`2`	`2`	`jcenter()`
`3`		`- maven ("https://dl.bintray.com/kotlin/kotlin-eap")`
`4`		`- maven ("https://kotlin.bintray.com/kotlinx")`
`5`	`3`	`}`
`6`	`4`
`7`	`5`	`dependencies {`
`8`		`- implementation(kotlin("gradle-plugin", version = "1.4.0-rc"))`
`9`		`- implementation(kotlin("reflect", version = "1.4.0-rc"))`
	`6`	`+ implementation(kotlin("gradle-plugin", version = "1.4.0"))`
	`7`	`+ implementation(kotlin("reflect", version = "1.4.0"))`
`10`	`8`	`}`