From 6299392bb95e8b98a6c5c3116d504744e07416dd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mateusz=20Kwieci=C5=84ski?= <36954793+mateuszkwiecinski@users.noreply.github.com> Date: Wed, 5 May 2021 09:22:10 +0200 Subject: [PATCH] chore: Update starter dependency to 0.27.0 (#229) --- Changelog.md | 4 ++++ .../com/project/starter/modules/internal/AndroidLint.kt | 2 +- build.gradle | 8 +++++--- buildSrc/build.gradle | 4 ++-- config/build.gradle | 2 +- .../project/starter/plugins/CommonSettingsPluginTest.kt | 2 +- jvm/build.gradle | 3 +-- multiplatform/build.gradle | 2 +- quality/build.gradle | 4 +--- .../kotlin/com/project/starter/quality/internal/Ktlint.kt | 2 +- versioning/build.gradle | 2 +- 11 files changed, 19 insertions(+), 16 deletions(-) diff --git a/Changelog.md b/Changelog.md index 26a05239..253a6d54 100644 --- a/Changelog.md +++ b/Changelog.md @@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] ## Changed +- Disabled `experimental:argument-list-wrapping` rule + +## [0.26.3] - 2021-05-05 +## Changed - Update _Android Gradle Plugin_ to 4.2.0, see [release notes](https://developer.android.com/studio/releases/gradle-plugin) - Bump minimum supported Gradle version to 6.8.3 - Update Jacoco version to `0.8.7` diff --git a/android/src/main/kotlin/com/project/starter/modules/internal/AndroidLint.kt b/android/src/main/kotlin/com/project/starter/modules/internal/AndroidLint.kt index 11e23653..3c623df6 100644 --- a/android/src/main/kotlin/com/project/starter/modules/internal/AndroidLint.kt +++ b/android/src/main/kotlin/com/project/starter/modules/internal/AndroidLint.kt @@ -12,7 +12,7 @@ internal fun Project.configureAndroidLint(lintOptions: LintOptions) { "UnknownNullness" to LintOptions.SEVERITY_ERROR, "KotlinPropertyAccess" to LintOptions.SEVERITY_ERROR, "LambdaLast" to LintOptions.SEVERITY_ERROR, - "NoHardKeywords" to LintOptions.SEVERITY_ERROR + "NoHardKeywords" to LintOptions.SEVERITY_ERROR, ) ) diff --git a/build.gradle b/build.gradle index 548e5980..413e9425 100644 --- a/build.gradle +++ b/build.gradle @@ -10,9 +10,11 @@ commonConfig { } allprojects { - pluginManager.withPlugin("jacoco") { - jacoco { - toolVersion = "0.8.7" + pluginManager.withPlugin("org.jmailen.kotlinter") { + afterEvaluate { + kotlinter { + disabledRules += ["experimental:argument-list-wrapping"] + } } } tasks.withType(KotlinCompile).configureEach { diff --git a/buildSrc/build.gradle b/buildSrc/build.gradle index f6aab528..ef4e2387 100644 --- a/buildSrc/build.gradle +++ b/buildSrc/build.gradle @@ -1,6 +1,6 @@ plugins { id 'java-gradle-plugin' - id "org.jmailen.kotlinter" version "3.4.3" + id "org.jmailen.kotlinter" version "3.4.4" id 'org.jetbrains.kotlin.jvm' version '1.5.0' } @@ -10,7 +10,7 @@ repositories { dependencies { implementation "com.gradle.publish:plugin-publish-plugin:0.14.0" - implementation "com.project.starter:jvm:0.25.0" + implementation "com.project.starter:jvm:0.27.0" } gradlePlugin { diff --git a/config/build.gradle b/config/build.gradle index eeffd93a..b59da232 100644 --- a/config/build.gradle +++ b/config/build.gradle @@ -9,7 +9,7 @@ dependencies { testImplementation project(":testing") } -test { +tasks.named("test") { useJUnitPlatform() } diff --git a/config/src/test/kotlin/com/project/starter/plugins/CommonSettingsPluginTest.kt b/config/src/test/kotlin/com/project/starter/plugins/CommonSettingsPluginTest.kt index ccff549e..4a67ffc0 100644 --- a/config/src/test/kotlin/com/project/starter/plugins/CommonSettingsPluginTest.kt +++ b/config/src/test/kotlin/com/project/starter/plugins/CommonSettingsPluginTest.kt @@ -2,12 +2,12 @@ package com.project.starter.config.plugins import com.project.starter.WithGradleProjectTest import com.project.starter.kotlinClass -import java.io.File import org.assertj.core.api.Assertions.assertThat import org.gradle.testkit.runner.TaskOutcome import org.intellij.lang.annotations.Language import org.junit.jupiter.api.BeforeEach import org.junit.jupiter.api.Test +import java.io.File internal class CommonSettingsPluginTest : WithGradleProjectTest() { diff --git a/jvm/build.gradle b/jvm/build.gradle index 1265f22f..7ea89e43 100644 --- a/jvm/build.gradle +++ b/jvm/build.gradle @@ -6,7 +6,6 @@ plugins { } repositories { - mavenCentral() gradlePluginPortal() } @@ -19,7 +18,7 @@ dependencies { testImplementation project(":testing") } -test { +tasks.named("test") { useJUnitPlatform() } diff --git a/multiplatform/build.gradle b/multiplatform/build.gradle index b6860eaa..0785ff0a 100644 --- a/multiplatform/build.gradle +++ b/multiplatform/build.gradle @@ -18,7 +18,7 @@ dependencies { testImplementation project(":testing") } -test { +tasks.named("test") { useJUnitPlatform() } diff --git a/quality/build.gradle b/quality/build.gradle index 2fd71117..e60e009f 100644 --- a/quality/build.gradle +++ b/quality/build.gradle @@ -6,8 +6,6 @@ plugins { } repositories { - mavenCentral() - google() gradlePluginPortal() } @@ -22,7 +20,7 @@ dependencies { testImplementation project(":testing") } -test { +tasks.named("test") { useJUnitPlatform() } diff --git a/quality/src/main/kotlin/com/project/starter/quality/internal/Ktlint.kt b/quality/src/main/kotlin/com/project/starter/quality/internal/Ktlint.kt index 5a2ab0f2..2fcf2f86 100644 --- a/quality/src/main/kotlin/com/project/starter/quality/internal/Ktlint.kt +++ b/quality/src/main/kotlin/com/project/starter/quality/internal/Ktlint.kt @@ -11,7 +11,7 @@ internal fun Project.configureKtlint() { extensions.configure(KotlinterExtension::class.java) { it.experimentalRules = true it.reporters = emptyArray() - it.disabledRules = arrayOf("import-ordering") + it.disabledRules = arrayOf("import-ordering", "experimental:argument-list-wrapping") } tasks.named(ProjectCodeStyleTask.TASK_NAME) { diff --git a/versioning/build.gradle b/versioning/build.gradle index d6b0caf1..ecc5a0b5 100644 --- a/versioning/build.gradle +++ b/versioning/build.gradle @@ -25,7 +25,7 @@ dependencies { testImplementation project(":testing") } -test { +tasks.named("test") { useJUnitPlatform() }