From c3294583045e1b6d174ea8a78519f6f7d6d0e3bb Mon Sep 17 00:00:00 2001 From: "p.strelchenko" Date: Wed, 6 Dec 2023 13:22:43 +0600 Subject: [PATCH] =?UTF-8?q?=D0=92=D0=BA=D0=BB=D1=8E=D1=87=D0=B0=D0=B5?= =?UTF-8?q?=D1=82=20=D0=BF=D1=80=D0=B0=D0=B2=D0=B8=D0=BB=D0=BE=20detekt=20?= =?UTF-8?q?=D0=BF=D1=80=D0=BE=20=D0=BE=D1=82=D1=81=D1=83=D1=82=D1=81=D1=82?= =?UTF-8?q?=D0=B2=D0=B8=D0=B5=20=D0=BD=D0=B5=D1=81=D0=BA=D0=BE=D0=BB=D1=8C?= =?UTF-8?q?=D0=BA=D0=B8=D1=85=20=D0=BF=D1=83=D1=81=D1=82=D1=8B=D1=85=20?= =?UTF-8?q?=D1=81=D1=82=D1=80=D0=BE=D0=BA=20=D0=BF=D0=BE=D0=B4=D1=80=D1=8F?= =?UTF-8?q?=D0=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/ru/practicum/android/diploma/ui/root/RootActivity.kt | 2 +- .../src/main/kotlin/ru/practicum/android/VersionCatalogExt.kt | 1 - conf/detekt.yml | 4 +--- 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/app/src/main/java/ru/practicum/android/diploma/ui/root/RootActivity.kt b/app/src/main/java/ru/practicum/android/diploma/ui/root/RootActivity.kt index 087673acfd..b02bd17d18 100644 --- a/app/src/main/java/ru/practicum/android/diploma/ui/root/RootActivity.kt +++ b/app/src/main/java/ru/practicum/android/diploma/ui/root/RootActivity.kt @@ -18,4 +18,4 @@ class RootActivity : AppCompatActivity() { // ... } -} \ No newline at end of file +} diff --git a/build-logic/gradle-ext/src/main/kotlin/ru/practicum/android/VersionCatalogExt.kt b/build-logic/gradle-ext/src/main/kotlin/ru/practicum/android/VersionCatalogExt.kt index 2312000202..3e970d5c20 100644 --- a/build-logic/gradle-ext/src/main/kotlin/ru/practicum/android/VersionCatalogExt.kt +++ b/build-logic/gradle-ext/src/main/kotlin/ru/practicum/android/VersionCatalogExt.kt @@ -4,7 +4,6 @@ import org.gradle.accessors.dm.LibrariesForLibs import org.gradle.api.Project import org.gradle.kotlin.dsl.the - /** * Workaround to make version catalog accessible in convention plugins * https://github.com/gradle/gradle/issues/15383 diff --git a/conf/detekt.yml b/conf/detekt.yml index 5e65d9aed8..c72053854f 100644 --- a/conf/detekt.yml +++ b/conf/detekt.yml @@ -302,10 +302,8 @@ formatting: NoBlankLineBeforeRbrace: active: false autoCorrect: false - # Правило выключено, потому что иногда мы ставим больше одной пустой строки - # между, например, property и функциями NoConsecutiveBlankLines: - active: false + active: true autoCorrect: true NoEmptyClassBody: active: true