Skip to content

Commit

Permalink
chore: Update starter dependency to 0.27.0 (#229)
Browse files Browse the repository at this point in the history
  • Loading branch information
mateuszkwiecinski authored May 5, 2021
1 parent 21974ce commit 6299392
Show file tree
Hide file tree
Showing 11 changed files with 19 additions and 16 deletions.
4 changes: 4 additions & 0 deletions Changelog.md
Original file line number Diff line number Diff line change
Expand Up @@ -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`
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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,
)
)

Expand Down
8 changes: 5 additions & 3 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
4 changes: 2 additions & 2 deletions 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 "3.4.3"
id "org.jmailen.kotlinter" version "3.4.4"
id 'org.jetbrains.kotlin.jvm' version '1.5.0'
}

Expand All @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion config/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ dependencies {
testImplementation project(":testing")
}

test {
tasks.named("test") {
useJUnitPlatform()
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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() {

Expand Down
3 changes: 1 addition & 2 deletions jvm/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ plugins {
}

repositories {
mavenCentral()
gradlePluginPortal()
}

Expand All @@ -19,7 +18,7 @@ dependencies {
testImplementation project(":testing")
}

test {
tasks.named("test") {
useJUnitPlatform()
}

Expand Down
2 changes: 1 addition & 1 deletion multiplatform/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ dependencies {
testImplementation project(":testing")
}

test {
tasks.named("test") {
useJUnitPlatform()
}

Expand Down
4 changes: 1 addition & 3 deletions quality/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,6 @@ plugins {
}

repositories {
mavenCentral()
google()
gradlePluginPortal()
}

Expand All @@ -22,7 +20,7 @@ dependencies {
testImplementation project(":testing")
}

test {
tasks.named("test") {
useJUnitPlatform()
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
2 changes: 1 addition & 1 deletion versioning/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ dependencies {
testImplementation project(":testing")
}

test {
tasks.named("test") {
useJUnitPlatform()
}

Expand Down

0 comments on commit 6299392

Please sign in to comment.