From 30d18ed34f73fa766549e6366fe48b0a2840d41a Mon Sep 17 00:00:00 2001 From: Anaru Hudson Date: Mon, 6 May 2024 15:43:26 +0100 Subject: [PATCH] ktlint --- .editorconfig | 6 +++-- .../kotlin/AndroidApplicationComposePlugin.kt | 2 +- .../main/kotlin/AndroidApplicationPlugin.kt | 2 +- .../src/main/kotlin/AndroidHiltPlugin.kt | 1 + .../main/kotlin/AndroidHiltWorkerPlugin.kt | 2 +- .../kotlin/AndroidLibraryComposePlugin.kt | 2 +- .../src/main/kotlin/AndroidLibraryPlugin.kt | 5 ++-- .../src/main/kotlin/AndroidLintPlugin.kt | 2 +- .../src/main/kotlin/AndroidRoomPlugin.kt | 2 +- .../com/whakaara/structure/DefaultConfig.kt | 2 +- .../com/whakaara/structure/KotlinAndroid.kt | 6 ++--- .../kotlin/com/whakaara/structure/Modules.kt | 2 +- .../whakaara/structure/ProjectExtensions.kt | 2 +- build.gradle.kts | 24 ------------------- .../com/whakaara/test/MainDispatcherRule.kt | 2 +- .../core/di/CoroutinesDispatchersModule.kt | 2 +- scripts/pre-commit | 21 ---------------- 17 files changed, 22 insertions(+), 63 deletions(-) delete mode 100755 scripts/pre-commit diff --git a/.editorconfig b/.editorconfig index cfcf2766..49c9a7aa 100644 --- a/.editorconfig +++ b/.editorconfig @@ -1,4 +1,6 @@ [*.{kt,kts}] +insert_final_newline = true +max_line_length = off ktlint_standard_indent = disabled ktlint_standard_argument-list-wrapping = disabled ktlint_standard_parameter-list-wrapping = disabled @@ -8,5 +10,5 @@ ktlint_standard_trailing-comma-on-call-site = disabled ktlint_standard_trailing-comma-on-declaration-site = disabled ktlint_standard_max-line-length = disabled ktlint_standard_import-ordering = disabled -ktlint_disabled_rules = import-ordering -max_line_length = off \ No newline at end of file +ktlint_standard_final-newline = enabled +ktlint_disabled_rules = import-ordering \ No newline at end of file diff --git a/build-logic/structure/src/main/kotlin/AndroidApplicationComposePlugin.kt b/build-logic/structure/src/main/kotlin/AndroidApplicationComposePlugin.kt index ec10e84c..2a81db95 100644 --- a/build-logic/structure/src/main/kotlin/AndroidApplicationComposePlugin.kt +++ b/build-logic/structure/src/main/kotlin/AndroidApplicationComposePlugin.kt @@ -13,4 +13,4 @@ class AndroidApplicationComposePlugin : Plugin { configureAndroidCompose(extension) } } -} \ No newline at end of file +} diff --git a/build-logic/structure/src/main/kotlin/AndroidApplicationPlugin.kt b/build-logic/structure/src/main/kotlin/AndroidApplicationPlugin.kt index 683b3853..5170f3d3 100644 --- a/build-logic/structure/src/main/kotlin/AndroidApplicationPlugin.kt +++ b/build-logic/structure/src/main/kotlin/AndroidApplicationPlugin.kt @@ -24,4 +24,4 @@ class AndroidApplicationPlugin : Plugin { } } } -} \ No newline at end of file +} diff --git a/build-logic/structure/src/main/kotlin/AndroidHiltPlugin.kt b/build-logic/structure/src/main/kotlin/AndroidHiltPlugin.kt index 262901f1..52d012db 100644 --- a/build-logic/structure/src/main/kotlin/AndroidHiltPlugin.kt +++ b/build-logic/structure/src/main/kotlin/AndroidHiltPlugin.kt @@ -18,3 +18,4 @@ class AndroidHiltPlugin : Plugin { } } } + diff --git a/build-logic/structure/src/main/kotlin/AndroidHiltWorkerPlugin.kt b/build-logic/structure/src/main/kotlin/AndroidHiltWorkerPlugin.kt index 8cf038af..8b18084a 100644 --- a/build-logic/structure/src/main/kotlin/AndroidHiltWorkerPlugin.kt +++ b/build-logic/structure/src/main/kotlin/AndroidHiltWorkerPlugin.kt @@ -16,4 +16,4 @@ class AndroidHiltWorkerPlugin : Plugin { } } } -} \ No newline at end of file +} diff --git a/build-logic/structure/src/main/kotlin/AndroidLibraryComposePlugin.kt b/build-logic/structure/src/main/kotlin/AndroidLibraryComposePlugin.kt index b6d6c5fe..d02eb40f 100644 --- a/build-logic/structure/src/main/kotlin/AndroidLibraryComposePlugin.kt +++ b/build-logic/structure/src/main/kotlin/AndroidLibraryComposePlugin.kt @@ -13,4 +13,4 @@ class AndroidLibraryComposePlugin : Plugin { configureAndroidCompose(extension) } } -} \ No newline at end of file +} diff --git a/build-logic/structure/src/main/kotlin/AndroidLibraryPlugin.kt b/build-logic/structure/src/main/kotlin/AndroidLibraryPlugin.kt index d1f1a2d5..b4400afb 100644 --- a/build-logic/structure/src/main/kotlin/AndroidLibraryPlugin.kt +++ b/build-logic/structure/src/main/kotlin/AndroidLibraryPlugin.kt @@ -21,10 +21,11 @@ class AndroidLibraryPlugin : Plugin { } extensions.configure { beforeVariants { - it.enableAndroidTest = it.enableAndroidTest - && project.projectDir.resolve("src/androidTest").exists() + it.enableAndroidTest = it.enableAndroidTest && + project.projectDir.resolve("src/androidTest").exists() } } } } } + diff --git a/build-logic/structure/src/main/kotlin/AndroidLintPlugin.kt b/build-logic/structure/src/main/kotlin/AndroidLintPlugin.kt index fb66912e..d8531a64 100644 --- a/build-logic/structure/src/main/kotlin/AndroidLintPlugin.kt +++ b/build-logic/structure/src/main/kotlin/AndroidLintPlugin.kt @@ -28,4 +28,4 @@ class AndroidLintPlugin : Plugin { } } } -} \ No newline at end of file +} diff --git a/build-logic/structure/src/main/kotlin/AndroidRoomPlugin.kt b/build-logic/structure/src/main/kotlin/AndroidRoomPlugin.kt index ba65176e..ce26bac2 100644 --- a/build-logic/structure/src/main/kotlin/AndroidRoomPlugin.kt +++ b/build-logic/structure/src/main/kotlin/AndroidRoomPlugin.kt @@ -32,4 +32,4 @@ class AndroidRoomPlugin : Plugin { } } } -} \ No newline at end of file +} diff --git a/build-logic/structure/src/main/kotlin/com/whakaara/structure/DefaultConfig.kt b/build-logic/structure/src/main/kotlin/com/whakaara/structure/DefaultConfig.kt index 173cbce0..84bd8715 100644 --- a/build-logic/structure/src/main/kotlin/com/whakaara/structure/DefaultConfig.kt +++ b/build-logic/structure/src/main/kotlin/com/whakaara/structure/DefaultConfig.kt @@ -6,4 +6,4 @@ object DefaultConfig { const val compileSdk = 34 const val versionCode = 1 const val versionName = "1.0" -} \ No newline at end of file +} diff --git a/build-logic/structure/src/main/kotlin/com/whakaara/structure/KotlinAndroid.kt b/build-logic/structure/src/main/kotlin/com/whakaara/structure/KotlinAndroid.kt index fb4385a7..b3ff518d 100644 --- a/build-logic/structure/src/main/kotlin/com/whakaara/structure/KotlinAndroid.kt +++ b/build-logic/structure/src/main/kotlin/com/whakaara/structure/KotlinAndroid.kt @@ -11,7 +11,7 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile // Taken from NIA sample app by Google internal fun Project.configureKotlinAndroid( - commonExtension: CommonExtension<*, *, *, *, *>, + commonExtension: CommonExtension<*, *, *, *, *> ) { commonExtension.apply { compileSdk = DefaultConfig.compileSdk @@ -54,7 +54,7 @@ private fun Project.configureKotlin() { } internal fun Project.configureAndroidCompose( - commonExtension: CommonExtension<*, *, *, *, *>, + commonExtension: CommonExtension<*, *, *, *, *> ) { commonExtension.apply { buildFeatures { @@ -73,4 +73,4 @@ internal fun Project.configureAndroidCompose( add("debugImplementation", libs.findLibrary("androidx-compose-ui-tooling").get()) } } -} \ No newline at end of file +} diff --git a/build-logic/structure/src/main/kotlin/com/whakaara/structure/Modules.kt b/build-logic/structure/src/main/kotlin/com/whakaara/structure/Modules.kt index 4f53005c..67b51cd9 100644 --- a/build-logic/structure/src/main/kotlin/com/whakaara/structure/Modules.kt +++ b/build-logic/structure/src/main/kotlin/com/whakaara/structure/Modules.kt @@ -17,4 +17,4 @@ fun DependencyHandlerScope.modules(vararg module: String) { modules.forEach { add("implementation", project(it)) } -} \ No newline at end of file +} diff --git a/build-logic/structure/src/main/kotlin/com/whakaara/structure/ProjectExtensions.kt b/build-logic/structure/src/main/kotlin/com/whakaara/structure/ProjectExtensions.kt index 69d29ef4..c634b95c 100644 --- a/build-logic/structure/src/main/kotlin/com/whakaara/structure/ProjectExtensions.kt +++ b/build-logic/structure/src/main/kotlin/com/whakaara/structure/ProjectExtensions.kt @@ -15,4 +15,4 @@ fun VersionCatalog.getLibrary(alias: String): Provider = - findPlugin(alias).get() \ No newline at end of file + findPlugin(alias).get() diff --git a/build.gradle.kts b/build.gradle.kts index 8b0f283d..c2a8b674 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -17,27 +17,3 @@ plugins { alias(libs.plugins.hilt) apply false alias(libs.plugins.ktlint) apply false } - -allprojects { - tasks.register("copyGitHooks", Copy::class) { - description = "Copies the git hooks from /git-hooks to the .git folder." - group = "git hooks" - from("$rootDir/scripts/pre-commit") - into("$rootDir/.git/hooks/") -// fileMode = 0b111101101 - } - - tasks.register("installGitHooks", Exec::class) { - description = "Installs the pre-commit git hooks from /git-hooks." - group = "git hooks" - workingDir = rootDir - commandLine("chmod", "-R", "+x", ".git/hooks/") - dependsOn("copyGitHooks") - doLast { - logger.info("Git hook installed successfully.") - } - } - afterEvaluate { - tasks.findByName("preBuild")?.dependsOn("installGitHooks") - } -} \ No newline at end of file diff --git a/core-test/src/main/java/com/whakaara/test/MainDispatcherRule.kt b/core-test/src/main/java/com/whakaara/test/MainDispatcherRule.kt index 6fed5a62..7a8dec74 100644 --- a/core-test/src/main/java/com/whakaara/test/MainDispatcherRule.kt +++ b/core-test/src/main/java/com/whakaara/test/MainDispatcherRule.kt @@ -11,7 +11,7 @@ import org.junit.runner.Description @OptIn(ExperimentalCoroutinesApi::class) class MainDispatcherRule( - private val testDispatcher: TestDispatcher = UnconfinedTestDispatcher(), + private val testDispatcher: TestDispatcher = UnconfinedTestDispatcher() ) : TestWatcher() { override fun starting(description: Description) { Dispatchers.setMain(testDispatcher) diff --git a/core/src/main/java/com/whakaara/core/di/CoroutinesDispatchersModule.kt b/core/src/main/java/com/whakaara/core/di/CoroutinesDispatchersModule.kt index 36373e91..e87daeeb 100644 --- a/core/src/main/java/com/whakaara/core/di/CoroutinesDispatchersModule.kt +++ b/core/src/main/java/com/whakaara/core/di/CoroutinesDispatchersModule.kt @@ -4,9 +4,9 @@ import dagger.Module import dagger.Provides import dagger.hilt.InstallIn import dagger.hilt.components.SingletonComponent -import javax.inject.Qualifier import kotlinx.coroutines.CoroutineDispatcher import kotlinx.coroutines.Dispatchers +import javax.inject.Qualifier @Retention(AnnotationRetention.RUNTIME) @Qualifier diff --git a/scripts/pre-commit b/scripts/pre-commit deleted file mode 100755 index 10099354..00000000 --- a/scripts/pre-commit +++ /dev/null @@ -1,21 +0,0 @@ -#!/bin/bash -echo "*********************************************************" -echo "Running git pre-commit hook. Running Static analysis... " -echo "*********************************************************" - -./gradlew ktlintCheck - -status=$? - -if [ "$status" = 0 ] ; then - echo "Static analysis found no problems." - exit 0 -else - echo "*********************************************************" - echo " ******************************************** " - echo 1>&2 "Static analysis found violations it could not fix." - echo "Run ./gradlew ktlintFormat to fix formatting related issues..." - echo " ******************************************** " - echo "*********************************************************" - exit 1 -fi \ No newline at end of file