From ecebbda1eede03dacab744bb2243db8dfb063e0d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 1 Jul 2022 06:33:22 +0000 Subject: [PATCH 1/2] chore(deps): bump spotless-plugin-gradle from 6.7.2 to 6.8.0 Bumps spotless-plugin-gradle from 6.7.2 to 6.8.0. --- updated-dependencies: - dependency-name: com.diffplug.spotless:spotless-plugin-gradle dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle.kts b/build.gradle.kts index 2e559fd7..66e833ec 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -15,7 +15,7 @@ buildscript { dependencies { classpath("com.android.tools.build:gradle:7.2.1") classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion") - classpath("com.diffplug.spotless:spotless-plugin-gradle:6.7.2") + classpath("com.diffplug.spotless:spotless-plugin-gradle:6.8.0") classpath("dev.ahmedmourad.nocopy:nocopy-gradle-plugin:1.4.0") classpath("org.jacoco:org.jacoco.core:0.8.8") classpath("com.vanniktech:gradle-android-junit-jacoco-plugin:0.17.0-SNAPSHOT") From 9d0d2aee33c7816985329852e16fb2313a4aff99 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petrus=20Nguy=E1=BB=85n=20Th=C3=A1i=20H=E1=BB=8Dc?= Date: Fri, 22 Jul 2022 16:41:13 +0700 Subject: [PATCH 2/2] deps: ktlintVersion = "0.46.1" --- build.gradle.kts | 8 +++++--- buildSrc/src/main/kotlin/deps.kt | 2 +- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index df75412f..efbb8c33 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -54,7 +54,8 @@ subprojects { "ij_kotlin_imports_layout", "indent_size", "end_of_line", - "charset" + "charset", + "disabled_rules" ) kotlin { @@ -67,8 +68,9 @@ subprojects { "end_of_line" to "lf", "charset" to "utf-8", "disabled_rules" to arrayOf( - "experimental:package-name", - "experimental:trailing-comma", + "package-name", + "trailing-comma", + "filename", "experimental:type-parameter-list-spacing", ).joinToString(separator = ","), ) diff --git a/buildSrc/src/main/kotlin/deps.kt b/buildSrc/src/main/kotlin/deps.kt index bc08da8f..e4ce0885 100644 --- a/buildSrc/src/main/kotlin/deps.kt +++ b/buildSrc/src/main/kotlin/deps.kt @@ -6,7 +6,7 @@ import org.gradle.kotlin.dsl.project import org.gradle.plugin.use.PluginDependenciesSpec import org.gradle.plugin.use.PluginDependencySpec -const val ktlintVersion = "0.45.2" +const val ktlintVersion = "0.46.1" const val kotlinVersion = "1.7.10" object appConfig {