From 03bb25d520258ff85d7a70e3ebb9d8052e26b2ea Mon Sep 17 00:00:00 2001
From: Torsten Grote <t@grobox.de>
Date: Tue, 17 Aug 2021 15:27:43 +0200
Subject: [PATCH] Apply ktlint checks to all modules
also upgrade ktlint
---
build.gradle | 2 ++
gradle/ktlint.gradle | 3 +--
mailbox-android/build.gradle | 2 +-
mailbox-cli/build.gradle | 3 +++
.../src/main/java/org/briarproject/mailbox/cli/Main.kt | 10 ++++++----
mailbox-core/build.gradle | 3 +++
.../mailbox/core/db/DatabaseComponentImpl.kt | 4 ++--
.../org/briarproject/mailbox/core/lifecycle/Service.kt | 2 +-
8 files changed, 19 insertions(+), 10 deletions(-)
diff --git a/build.gradle b/build.gradle
index 20a8ec64..c4af8a64 100644
--- a/build.gradle
+++ b/build.gradle
@@ -5,6 +5,7 @@ buildscript {
ext.obfs4_version = '0.0.12-dev-40245c4a'
ext.junit_version = '5.7.2'
ext.mockk_version = '1.10.4'
+ ext.ktlint_plugin_version = '10.1.0'
repositories {
google()
mavenCentral()
@@ -19,6 +20,7 @@ buildscript {
allprojects {
repositories {
google()
+ //noinspection JcenterRepositoryObsolete
jcenter() // for dependencies that haven't moved, yet
mavenCentral()
}
diff --git a/gradle/ktlint.gradle b/gradle/ktlint.gradle
index 59358c39..22e03eae 100644
--- a/gradle/ktlint.gradle
+++ b/gradle/ktlint.gradle
@@ -1,11 +1,10 @@
ktlint {
- version = "0.41.0"
+ version = "0.42.1"
android = true
enableExperimentalRules = false
verbose = true
disabledRules = [
"import-ordering",
"no-blank-line-before-rbrace",
- "indent", // remove in 0.42 https://github.com/pinterest/ktlint/issues/764
]
}
diff --git a/mailbox-android/build.gradle b/mailbox-android/build.gradle
index 23af48a7..323ed59f 100644
--- a/mailbox-android/build.gradle
+++ b/mailbox-android/build.gradle
@@ -5,7 +5,7 @@ plugins {
id 'kotlin-android'
id 'kotlin-kapt'
id 'dagger.hilt.android.plugin'
- id "org.jlleitschuh.gradle.ktlint" version "10.1.0"
+ id "org.jlleitschuh.gradle.ktlint" version "$ktlint_plugin_version"
}
android {
diff --git a/mailbox-cli/build.gradle b/mailbox-cli/build.gradle
index c2d1a7c9..6d07db59 100644
--- a/mailbox-cli/build.gradle
+++ b/mailbox-cli/build.gradle
@@ -3,6 +3,7 @@ plugins {
id 'idea'
id 'org.jetbrains.kotlin.jvm'
id 'org.jetbrains.kotlin.kapt'
+ id "org.jlleitschuh.gradle.ktlint" version "$ktlint_plugin_version"
}
sourceCompatibility = 1.8
@@ -44,6 +45,8 @@ test {
}
}
+apply from: "${rootProject.rootDir}/gradle/ktlint.gradle"
+
// At the moment for non-Android projects we need to explicitly mark the code generated by kapt
// as 'generated source code' for correct highlighting and resolve in IDE.
idea {
diff --git a/mailbox-cli/src/main/java/org/briarproject/mailbox/cli/Main.kt b/mailbox-cli/src/main/java/org/briarproject/mailbox/cli/Main.kt
index e47a3d7f..24784e8b 100644
--- a/mailbox-cli/src/main/java/org/briarproject/mailbox/cli/Main.kt
+++ b/mailbox-cli/src/main/java/org/briarproject/mailbox/cli/Main.kt
@@ -59,10 +59,12 @@ class Main : CliktCommand(
val javaCliComponent = DaggerJavaCliComponent.builder().build()
javaCliComponent.inject(this)
- Runtime.getRuntime().addShutdownHook(Thread {
- lifecycleManager.stopServices()
- lifecycleManager.waitForShutdown()
- })
+ Runtime.getRuntime().addShutdownHook(
+ Thread {
+ lifecycleManager.stopServices()
+ lifecycleManager.waitForShutdown()
+ }
+ )
lifecycleManager.startServices()
lifecycleManager.waitForStartup()
diff --git a/mailbox-core/build.gradle b/mailbox-core/build.gradle
index 7735fd50..303a1edd 100644
--- a/mailbox-core/build.gradle
+++ b/mailbox-core/build.gradle
@@ -3,6 +3,7 @@ plugins {
id 'idea'
id 'org.jetbrains.kotlin.jvm'
id 'org.jetbrains.kotlin.kapt'
+ id "org.jlleitschuh.gradle.ktlint" version "$ktlint_plugin_version"
}
sourceCompatibility = 1.8
@@ -35,3 +36,5 @@ test {
events "passed", "skipped", "failed"
}
}
+
+apply from: "${rootProject.rootDir}/gradle/ktlint.gradle"
diff --git a/mailbox-core/src/main/java/org/briarproject/mailbox/core/db/DatabaseComponentImpl.kt b/mailbox-core/src/main/java/org/briarproject/mailbox/core/db/DatabaseComponentImpl.kt
index c82dd66d..86804941 100644
--- a/mailbox-core/src/main/java/org/briarproject/mailbox/core/db/DatabaseComponentImpl.kt
+++ b/mailbox-core/src/main/java/org/briarproject/mailbox/core/db/DatabaseComponentImpl.kt
@@ -4,11 +4,11 @@ class DatabaseComponentImpl : DatabaseComponent {
override fun open(listener: MigrationListener?): Boolean {
// TODO: implement this
- return true;
+ return true
}
override fun close() {
// TODO: implement this
}
-}
\ No newline at end of file
+}
diff --git a/mailbox-core/src/main/java/org/briarproject/mailbox/core/lifecycle/Service.kt b/mailbox-core/src/main/java/org/briarproject/mailbox/core/lifecycle/Service.kt
index cd1a9a86..0c185c92 100644
--- a/mailbox-core/src/main/java/org/briarproject/mailbox/core/lifecycle/Service.kt
+++ b/mailbox-core/src/main/java/org/briarproject/mailbox/core/lifecycle/Service.kt
@@ -19,4 +19,4 @@ interface Service {
@Throws(ServiceException::class)
fun stopService()
-}
\ No newline at end of file
+}
--
GitLab