[Kotlin] Upgrade to Kotlin 1.5.0 (#7)

kittinunf · May 14, 2021 · 6db475f · 6db475f
1 parent 4e74b88
commit 6db475f
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 22 deletions.
diff --git a/buildSrc/buildSrc/src/main/kotlin/Dependencies.kt b/buildSrc/buildSrc/src/main/kotlin/Dependencies.kt
@@ -1,13 +1,9 @@
 // Main libraries
 object Kotlin {
 
-    private const val version = "1.4.32"
+    private const val version = "1.5.0"
 
     const val plugin = "org.jetbrains.kotlin:kotlin-gradle-plugin:$version"
-
-    const val testCommon = "org.jetbrains.kotlin:kotlin-test-common"
-    const val testAnnotationsCommon = "org.jetbrains.kotlin:kotlin-test-annotations-common"
-    const val testJunit = "org.jetbrains.kotlin:kotlin-test-junit"
 }
 
 object Android {
@@ -31,7 +27,7 @@ object AndroidX {
 
 object Coroutines {
 
-    private const val version = "1.4.3-native-mt"
+    private const val version = "1.5.0-RC-native-mt"
 
     const val core = "org.jetbrains.kotlinx:kotlinx-coroutines-core:$version"
     const val test = "org.jetbrains.kotlinx:kotlinx-coroutines-test:$version"
@@ -48,7 +44,7 @@ object JUnit {
 }
 
 object Jacoco {
-    const val version = "0.8.6"
+    const val version = "0.8.7"
 }
 
 // Publishing libraries

diff --git a/cored/build.gradle.kts b/cored/build.gradle.kts
@@ -14,18 +14,6 @@ group = Publishing.groupId
 val gitSha = "git rev-parse --short HEAD".runCommand(project.rootDir)?.trim().orEmpty()
 version = if (isReleaseBuild) Publishing.version else "main-$gitSha-SNAPSHOT"
 
-// this is workaround to make it work with Kotlin 1.4, it will not be needed anymore in Kotlin 1.5
-android {
-    configurations {
-        create("androidTestApi")
-        create("androidTestDebugApi")
-        create("androidTestReleaseApi")
-        create("testApi")
-        create("testDebugApi")
-        create("testReleaseApi")
-    }
-}
-
 kotlin {
     android {
         publishLibraryVariants("release", "debug")
@@ -54,8 +42,7 @@ kotlin {
 
         val commonTest by getting {
             dependencies {
-                implementation(Kotlin.testCommon)
-                implementation(Kotlin.testAnnotationsCommon)
+                implementation(kotlin("test"))
             }
         }
 
@@ -64,7 +51,6 @@ kotlin {
         val androidTest by getting {
             dependencies {
                 implementation(Coroutines.test)
-                implementation(Kotlin.testJunit)
             }
         }