Update to Kotlin 1.4.0 (#844)

* Update Kotlin to 1.4.0 version. As well bump dev version to 1.4.10-rc-345. Signed-off-by: Yahor Berdnikau <[email protected]> * Enable explicit api in warning mode. Signed-off-by: Yahor Berdnikau <[email protected]>
pinterest · Aug 20, 2020 · b6ddf65 · b6ddf65
1 parent 98812d0
commit b6ddf65
Show file tree

Hide file tree

Showing 4 changed files with 125 additions and 500 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -9,7 +9,7 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 - Checksum generation for executable Jar ([#695](https://github.com/pinterest/ktlint/issues/695))
 - Enable Gradle dependency verification
 - `parameter-list-wrapping` rule now also considers function arguments while wrapping ([#620](https://github.com/pinterest/ktlint/issues/620))
-- Publish snapshots built against kotlin development versions (1.4.0-rc)
+- Publish snapshots built against kotlin development versions
 
 ### Fixed
 - Safe-called wrapped trailing lambdas indented correctly ([#776](https://github.com/pinterest/ktlint/issues/776))
@@ -27,6 +27,7 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 - Update Gradle to 6.6 version
 - Update ec4j to 0.2.2 version. Now it should report path to `.editorconfig` file on failed parsing 
 and allow empty `.editorconfig` files.
+- Update Kotlin to 1.4.0 version ([#830](https://github.com/pinterest/ktlint/issues/830))
 
 
 ## [0.37.2] - 2020-06-16

diff --git a/build.gradle b/build.gradle
@@ -4,7 +4,7 @@ plugins {
 }
 
 ext.versions = [
-  'kotlin': gradle.ext.isKotlinDev ? '1.4.0-rc' : '1.3.70',
+  'kotlin': gradle.ext.isKotlinDev ? '1.4.10-rc-345' : '1.4.0',
   'gradle': '6.6',
   'gradle-sha256': 'e6f83508f0970452f56197f610d13c5f593baaf43c0e3c6a571e5967be754025'
 ]
@@ -52,6 +52,7 @@ allprojects {
 
     if (gradle.ext.isKotlinDev) {
       maven { url 'https://dl.bintray.com/kotlin/kotlin-eap' }
+      maven { url 'https://dl.bintray.com/kotlin/kotlin-dev' }
     }
   }
 
@@ -70,6 +71,17 @@ allprojects {
   }
 }
 
+subprojects { subProject ->
+  // Do not enabling explicit api for cli project
+  if (subProject.name != "ktlint") {
+    subProject.plugins.withId("org.jetbrains.kotlin.jvm") {
+      subProject.extensions.configure("kotlin") { ext ->
+        ext.explicitApi = 'warning'
+      }
+    }
+  }
+}
+
 /**
  * Configures "wrapper" task to use specific Gradle version and distribution type.
  */