Merge branch 'develop' into feature/create-channel

8d07a65a · Filipe de Lima Brito · GitHub · 60009b87 · 70855e95 · 8d07a65a
Unverified Commit 8d07a65a authored Jun 15, 2018 by Filipe de Lima Brito Committed by GitHub Jun 15, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 2 deletions

build.gradle app/build.gradle +1 -0

dependencies.gradle dependencies.gradle +2 -2

No files found.
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -53,6 +53,7 @@ android {

    packagingOptions {
        exclude 'META-INF/core.kotlin_module'
+        exclude 'META-INF/main.kotlin_module'
    }
 }


--- a/dependencies.gradle
+++ b/dependencies.gradle
@@ -4,8 +4,8 @@ ext {
            compileSdk            : 28,
            targetSdk             : 28,
            buildTools            : '28.0.0-rc2',
-            kotlin                : '1.2.41',
-            coroutine             : '0.22.5',
+            kotlin                : '1.2.50',
+            coroutine             : '0.23.1',
            dokka                 : '0.9.16',

            // Main dependencies