Merge pull request #522 from badoo/kotlin-1.4

Kotlin 1.4.0
badoo · Aug 18, 2020 · e0c4ab2 · e0c4ab2
2 parents a1c4f1a + ef5e762
commit e0c4ab2
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 29 deletions.
diff --git a/coroutines-interop/build.gradle b/coroutines-interop/build.gradle
@@ -15,7 +15,7 @@ kotlin {
     sourceSets {
         commonMain {
             dependencies {
-                implementation Deps.kotlinx.coroutines.core.common
+                implementation Deps.kotlinx.coroutines.core
                 implementation project(':reaktive')
                 implementation project(':utils')
             }
@@ -32,29 +32,5 @@ kotlin {
                 implementation Deps.kotlinx.coroutines.test
             }
         }
-
-        jvmMain {
-            dependencies {
-                implementation Deps.kotlinx.coroutines.core
-            }
-        }
-
-        androidMain {
-            dependencies {
-                implementation Deps.kotlinx.coroutines.android
-            }
-        }
-
-        nativeCommonMain {
-            dependencies {
-                implementation Deps.kotlinx.coroutines.core.native
-            }
-        }
-
-        jsMain {
-            dependencies {
-                implementation Deps.kotlinx.coroutines.core.js
-            }
-        }
     }
 }
diff --git a/includedBuild/dependencies/src/main/kotlin/com/badoo/reaktive/dependencies/Deps.kt b/includedBuild/dependencies/src/main/kotlin/com/badoo/reaktive/dependencies/Deps.kt
@@ -2,8 +2,8 @@ package com.badoo.reaktive.dependencies
 
 object Deps {
 
-    private const val kotlinVersion = "1.3.72"
-    private const val coroutinesVersion = "1.3.4"
+    private const val kotlinVersion = "1.4.0"
+    private const val coroutinesVersion = "1.3.9"
     private const val detektVersion = "1.9.1"
     private const val asmVersion = "6.0"
 
@@ -23,6 +23,7 @@ object Deps {
         val stdlib = Stdlib()
         val test = Test
         val plugin = "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion"
+        val compilerEmbeddable = "org.jetbrains.kotlin:kotlin-compiler-embeddable:$kotlinVersion"
 
         class Stdlib(
             private val name: String = "org.jetbrains.kotlin:kotlin-stdlib:$kotlinVersion"

diff --git a/includedBuild/gradleConfiguration/build.gradle.kts b/includedBuild/gradleConfiguration/build.gradle.kts
@@ -14,6 +14,7 @@ repositories {
 
 dependencies {
     implementation(Deps.kotlin.plugin)
+    implementation(Deps.kotlin.compilerEmbeddable)
     implementation(Deps.android.plugin)
     implementation(Deps.jmh.plugin)
     implementation(Deps.bintray)

diff --git a/reaktive/api/reaktive.api b/reaktive/api/reaktive.api
@@ -50,7 +50,6 @@ public abstract interface class com/badoo/reaktive/base/ValueCallback {
 }
 
 public final class com/badoo/reaktive/base/exceptions/CompositeException : java/lang/RuntimeException {
-	public static final field Companion Lcom/badoo/reaktive/base/exceptions/CompositeException$Companion;
 	public fun <init> (Ljava/lang/Throwable;Ljava/lang/Throwable;)V
 	public final fun getCause1 ()Ljava/lang/Throwable;
 	public final fun getCause2 ()Ljava/lang/Throwable;
@@ -231,7 +230,6 @@ public final class com/badoo/reaktive/completable/VariousKt {
 }
 
 public class com/badoo/reaktive/disposable/CompositeDisposable : com/badoo/reaktive/disposable/Disposable {
-	public static final field Companion Lcom/badoo/reaktive/disposable/CompositeDisposable$Companion;
 	public fun <init> ()V
 	public final fun add (Lcom/badoo/reaktive/disposable/Disposable;)Z
 	public final fun clear (Z)V