Skip to content

Commit

Permalink
change: Update _Kotlin_ plugin to 1.4.0 (#104)
Browse files Browse the repository at this point in the history
* change: Update _Kotlin_ plugin to 1.4.0, see [release notes](https://kotlinlang.org/docs/reference/whatsnew14.html#mixing-named-and-positional-arguments)
* change: Update _kotlinter-gradle_ to version _3.0.0_, see [release notes](https://github.com/jeremymailen/kotlinter-gradle/releases/tag/3.0.0)
  • Loading branch information
mateuszkwiecinski authored Aug 25, 2020
1 parent be991fa commit 5917d95
Show file tree
Hide file tree
Showing 7 changed files with 8 additions and 16 deletions.
4 changes: 3 additions & 1 deletion Changelog.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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'
}

Expand Down
2 changes: 1 addition & 1 deletion buildSrc/build.gradle
Original file line number Diff line number Diff line change
@@ -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'
}

Expand Down
4 changes: 2 additions & 2 deletions plugins/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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")

Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -24,8 +23,6 @@ internal class ConfigurationPlugin : Plugin<Project> {
configureKapt()
configureRepositories()

dependencies.configureCommonDependencies()

val javaVersion = rootConfig.javaVersion
tasks.withType(KotlinCompile::class.java).configureEach {
it.kotlinOptions.jvmTarget = javaVersion.toString()
Expand Down
2 changes: 1 addition & 1 deletion sample/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ buildscript {
}

plugins {
id 'com.starter.config' version "0.15.0"
id 'com.starter.config' version "0.16.0"
}

commonConfig {
Expand Down

0 comments on commit 5917d95

Please sign in to comment.