From b6ddf656cb50f8d06cead090d4526b64b47bf949 Mon Sep 17 00:00:00 2001 From: Yahor Berdnikau Date: Thu, 20 Aug 2020 23:29:01 +0200 Subject: [PATCH] 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 * Enable explicit api in warning mode. Signed-off-by: Yahor Berdnikau --- CHANGELOG.md | 3 +- build.gradle | 14 +- gradle/verification-metadata.xml | 605 ++++++------------------------- settings.gradle | 3 +- 4 files changed, 125 insertions(+), 500 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9b75fc3eec..0baa3f70dc 100644 --- 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 index 5fdbf8e336..fb8d50d9c9 100644 --- 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. */ diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml index 4953a539c6..e802bdab5e 100644 --- a/gradle/verification-metadata.xml +++ b/gradle/verification-metadata.xml @@ -768,566 +768,177 @@ - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + diff --git a/settings.gradle b/settings.gradle index 36d92ffced..46d7327692 100644 --- a/settings.gradle +++ b/settings.gradle @@ -4,11 +4,12 @@ pluginManagement { gradlePluginPortal() if (settings.hasProperty('kotlinDev')) { maven { url 'https://dl.bintray.com/kotlin/kotlin-eap' } + maven { url 'https://dl.bintray.com/kotlin/kotlin-dev' } } } plugins { - def kotlinVersion = settings.hasProperty("kotlinDev") ? "1.4.0-rc" : "1.3.70" + def kotlinVersion = settings.hasProperty("kotlinDev") ? "1.4.10-rc-345" : "1.4.0" id 'org.jetbrains.kotlin.jvm' version kotlinVersion id 'com.github.breadmoirai.github-release' version '2.2.12' id 'com.github.johnrengelman.shadow' version '5.0.0'