diff --git a/Changelog.md b/Changelog.md index ff290d72..3541c260 100644 --- a/Changelog.md +++ b/Changelog.md @@ -6,7 +6,9 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). ## [Unreleased] - +## Changed +- Update _Kotlin_ plugin to 1.4.0, see [release notes](https://kotlinlang.org/docs/reference/whatsnew14.html#mixing-named-and-positional-arguments) +- Update _kotlinter-gradle_ to version _3.0.0_, see [release notes](https://github.com/jeremymailen/kotlinter-gradle/releases/tag/3.0.0) ## [0.16.0] - 2020-08-25 ## Changed diff --git a/build.gradle b/build.gradle index 35fc2585..147d4ea5 100644 --- a/build.gradle +++ b/build.gradle @@ -2,7 +2,7 @@ buildscript { repositories.google() } plugins { - id 'com.starter.config' version '0.16.0' + id 'com.starter.config' version '0.16.0' id 'com.starter.versioning' version '0.16.0' } diff --git a/buildSrc/build.gradle b/buildSrc/build.gradle index fc0d2ca8..89e655a2 100644 --- a/buildSrc/build.gradle +++ b/buildSrc/build.gradle @@ -1,6 +1,6 @@ plugins { id 'java-gradle-plugin' - id "org.jmailen.kotlinter" version "2.4.1" + id "org.jmailen.kotlinter" version "3.0.0" id 'org.jetbrains.kotlin.jvm' version'1.3.72' } diff --git a/plugins/build.gradle b/plugins/build.gradle index bf4d0f08..e638fe75 100644 --- a/plugins/build.gradle +++ b/plugins/build.gradle @@ -17,13 +17,13 @@ tasks.named('lintKotlinMain') { } dependencies { - api('org.jmailen.gradle:kotlinter-gradle:2.4.1') { + api('org.jmailen.gradle:kotlinter-gradle:3.0.0') { // https://github.com/pinterest/ktlint/issues/678 exclude group: 'com.pinterest.ktlint', module: 'ktlint-test' } api 'io.gitlab.arturbosch.detekt:detekt-gradle-plugin:1.11.2' api 'com.android.tools.build:gradle:4.0.1' - api 'org.jetbrains.kotlin:kotlin-gradle-plugin' + api 'org.jetbrains.kotlin:kotlin-gradle-plugin:1.4.0' implementation 'pl.allegro.tech.build:axion-release-plugin:1.11.0' implementation project(":issuechecker") diff --git a/plugins/src/main/kotlin/com/project/starter/modules/internal/Dependencies.kt b/plugins/src/main/kotlin/com/project/starter/modules/internal/Dependencies.kt deleted file mode 100644 index de59a51f..00000000 --- a/plugins/src/main/kotlin/com/project/starter/modules/internal/Dependencies.kt +++ /dev/null @@ -1,7 +0,0 @@ -package com.project.starter.modules.internal - -import org.gradle.api.artifacts.dsl.DependencyHandler - -internal fun DependencyHandler.configureCommonDependencies() { - add("implementation", "org.jetbrains.kotlin:kotlin-stdlib-jdk8") -} diff --git a/plugins/src/main/kotlin/com/project/starter/modules/plugins/ConfigurationPlugin.kt b/plugins/src/main/kotlin/com/project/starter/modules/plugins/ConfigurationPlugin.kt index 8ddb18a1..77d04ba2 100644 --- a/plugins/src/main/kotlin/com/project/starter/modules/plugins/ConfigurationPlugin.kt +++ b/plugins/src/main/kotlin/com/project/starter/modules/plugins/ConfigurationPlugin.kt @@ -1,7 +1,6 @@ package com.project.starter.modules.plugins import com.project.starter.config.plugins.rootConfig -import com.project.starter.modules.internal.configureCommonDependencies import com.project.starter.modules.internal.configureKapt import com.project.starter.modules.internal.configureRepositories import com.project.starter.versioning.plugins.VersioningPlugin @@ -24,8 +23,6 @@ internal class ConfigurationPlugin : Plugin { configureKapt() configureRepositories() - dependencies.configureCommonDependencies() - val javaVersion = rootConfig.javaVersion tasks.withType(KotlinCompile::class.java).configureEach { it.kotlinOptions.jvmTarget = javaVersion.toString() diff --git a/sample/build.gradle b/sample/build.gradle index 63f79a06..7398e598 100644 --- a/sample/build.gradle +++ b/sample/build.gradle @@ -22,7 +22,7 @@ buildscript { } plugins { - id 'com.starter.config' version "0.15.0" + id 'com.starter.config' version "0.16.0" } commonConfig {