Update to SNAPSHOT 6713401 (#49)

* Update to SNAPSHOT 6713401 * Remove use of -Xskip-prerelease-check
google · Jul 28, 2020 · c996dcb · c996dcb
1 parent 08ac21d
commit c996dcb
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 25 deletions.
diff --git a/build.gradle b/build.gradle
@@ -22,7 +22,6 @@ buildscript {
         google()
         jcenter()
         maven { url 'https://dl.bintray.com/kotlin/kotlin-eap/' }
-        maven { url 'https://dl.bintray.com/kotlin/kotlin-dev/' }
     }
 
     dependencies {
@@ -44,7 +43,6 @@ subprojects {
         jcenter()
 
         maven { url 'https://dl.bintray.com/kotlin/kotlin-eap/' }
-        maven { url 'https://dl.bintray.com/kotlin/kotlin-dev/' }
 
         if (Libs.AndroidX.Compose.version.endsWith("SNAPSHOT")) {
             maven {
@@ -53,18 +51,6 @@ subprojects {
         }
     }
 
-    // Compose SNAPSHOTs currently depend on Kotlin 1.4.0 (which doesn't exist yet). We need to
-    // force a version which does exist.
-    configurations.configureEach {
-        resolutionStrategy {
-            eachDependency { DependencyResolveDetails details ->
-                if (details.requested.group == 'org.jetbrains.kotlin') {
-                    details.useVersion Libs.Kotlin.version
-                }
-            }
-        }
-    }
-
     apply plugin: 'com.diffplug.gradle.spotless'
     spotless {
         kotlin {
@@ -93,10 +79,6 @@ subprojects {
             freeCompilerArgs += "-Xopt-in=kotlin.RequiresOptIn"
 
             freeCompilerArgs += "-Xallow-jvm-ir-dependencies"
-
-            // Since we're using a pre-release version of the Kotlin compiler, we need
-            // to disable it's pre-release check
-            freeCompilerArgs += "-Xskip-prerelease-check"
         }
     }
 

diff --git a/buildSrc/src/main/java/dev/chrisbanes/accompanist/buildsrc/dependencies.kt b/buildSrc/src/main/java/dev/chrisbanes/accompanist/buildsrc/dependencies.kt
@@ -34,7 +34,7 @@ object Libs {
     }
 
     object Coroutines {
-        private const val version = "1.3.8-1.4-rc-154"
+        private const val version = "1.3.8-1.4.0-rc"
         const val android = "org.jetbrains.kotlinx:kotlinx-coroutines-android:$version"
         const val test = "org.jetbrains.kotlinx:kotlinx-coroutines-test:$version"
     }
@@ -51,9 +51,8 @@ object Libs {
         }
 
         object Compose {
-            const val snapshot = "6710852"
+            const val snapshot = "6713401"
             const val version = "0.1.0-SNAPSHOT"
-            const val kotlinCompilerVersion = "1.4.0-dev-withExperimentalGoogleExtensions-20200720"
 
             const val runtime = "androidx.compose.runtime:runtime:$version"
             const val foundation = "androidx.compose.foundation:foundation:${version}"

diff --git a/coil/build.gradle b/coil/build.gradle
@@ -39,7 +39,7 @@ android {
     }
 
     composeOptions {
-        kotlinCompilerVersion Libs.AndroidX.Compose.kotlinCompilerVersion
+        kotlinCompilerVersion Libs.Kotlin.version
         kotlinCompilerExtensionVersion Libs.AndroidX.Compose.version
     }
 

diff --git a/gradle.properties b/gradle.properties
@@ -23,7 +23,7 @@ android.enableJetifier=true
 systemProp.org.gradle.internal.publish.checksums.insecure=true
 
 GROUP=dev.chrisbanes.accompanist
-VERSION_NAME=0.1.8.ui-6710852-SNAPSHOT
+VERSION_NAME=0.1.8.ui-6713401-SNAPSHOT
 
 POM_DESCRIPTION=A collection of utilities for Jetpack Compose
 

diff --git a/mdc-theme/build.gradle b/mdc-theme/build.gradle
@@ -39,7 +39,7 @@ android {
     }
 
     composeOptions {
-        kotlinCompilerVersion Libs.AndroidX.Compose.kotlinCompilerVersion
+        kotlinCompilerVersion Libs.Kotlin.version
         kotlinCompilerExtensionVersion Libs.AndroidX.Compose.version
     }
 

diff --git a/sample/build.gradle b/sample/build.gradle
@@ -44,7 +44,7 @@ android {
     }
 
     composeOptions {
-        kotlinCompilerVersion Libs.AndroidX.Compose.kotlinCompilerVersion
+        kotlinCompilerVersion Libs.Kotlin.version
         kotlinCompilerExtensionVersion Libs.AndroidX.Compose.version
     }
 }