From 33ff270a9c2ae05dc52fbd7272f3d3a940b1e96b Mon Sep 17 00:00:00 2001 From: Alexander Karkossa Date: Sun, 9 Jun 2024 16:08:12 +0200 Subject: [PATCH] build: remove ktlint --- .editorconfig | 3 -- .github/workflows/ktlint.yml | 29 ------------------- _ktlint.gradle | 25 ---------------- bottom-drawer-scaffold/build.gradle | 1 - example/build.gradle | 1 - .../sample/MainActivity.kt | 8 ++--- gradle/libs.versions.toml | 2 -- 7 files changed, 2 insertions(+), 67 deletions(-) delete mode 100644 .editorconfig delete mode 100644 .github/workflows/ktlint.yml delete mode 100644 _ktlint.gradle diff --git a/.editorconfig b/.editorconfig deleted file mode 100644 index bef2c0b..0000000 --- a/.editorconfig +++ /dev/null @@ -1,3 +0,0 @@ -[*.{kt,kts}] -disabled_rules=no-wildcard-imports,import-ordering,indent -indent_size=4 #Setting -> Editor -> Kotlin -> Tabs and Indents \ No newline at end of file diff --git a/.github/workflows/ktlint.yml b/.github/workflows/ktlint.yml deleted file mode 100644 index ac8cdc9..0000000 --- a/.github/workflows/ktlint.yml +++ /dev/null @@ -1,29 +0,0 @@ -name: Ktlint - -on: - pull_request: - push: - paths-ignore: - - 'README.md' - branches: - - develop - - main - -jobs: - ktlint: - if: "! contains(toJSON(github.event.commits.*.message), '[skip ci]') && ! (contains(toJSON(github.event.commits.*.message), '[skip ') && contains(toJSON(github.event.commits.*.message), '#ktlint'))" - runs-on: ubuntu-latest - - steps: - - uses: actions/checkout@v2 - - name: Set up JDK 17 - uses: actions/setup-java@v1 - with: - java-version: 17 - distribution: 'zulu' - - - name: Grant execute permission for gradlew - run: chmod +x gradlew - - - name: Build with Gradle - run: ./gradlew ktlint \ No newline at end of file diff --git a/_ktlint.gradle b/_ktlint.gradle deleted file mode 100644 index f3dde7e..0000000 --- a/_ktlint.gradle +++ /dev/null @@ -1,25 +0,0 @@ -configurations { - ktlint -} - -dependencies { - ktlint libs.ktlint -} - -task ktlint(type: JavaExec, group: "verification") { - description = "Check Kotlin code style." - main = "com.pinterest.ktlint.Main" - classpath = configurations.ktlint - args "**/*.kt" - // to generate report in checkstyle format prepend following args: - // "--reporter=plain", "--reporter=checkstyle,output=${buildDir}/ktlint.xml" - // see https://github.com/pinterest/ktlint#usage for more -} -check.dependsOn ktlint - -task ktlintFormat(type: JavaExec, group: "formatting") { - description = "Fix Kotlin code style deviations." - main = "com.pinterest.ktlint.Main" - classpath = configurations.ktlint - args "-F", "src/**/*.kt" -} diff --git a/bottom-drawer-scaffold/build.gradle b/bottom-drawer-scaffold/build.gradle index c632605..50a312a 100644 --- a/bottom-drawer-scaffold/build.gradle +++ b/bottom-drawer-scaffold/build.gradle @@ -3,7 +3,6 @@ plugins { id 'kotlin-android' } -apply from: '../_ktlint.gradle' apply from: '../buildCompose.gradle' ext { diff --git a/example/build.gradle b/example/build.gradle index f7fafce..0406e60 100644 --- a/example/build.gradle +++ b/example/build.gradle @@ -3,7 +3,6 @@ plugins { id 'kotlin-android' } -apply from: '../_ktlint.gradle' apply from: '../buildCompose.gradle' android { diff --git a/example/src/main/java/de/charlex/compose/bottomdrawerscaffold/sample/MainActivity.kt b/example/src/main/java/de/charlex/compose/bottomdrawerscaffold/sample/MainActivity.kt index 5bce607..089061e 100644 --- a/example/src/main/java/de/charlex/compose/bottomdrawerscaffold/sample/MainActivity.kt +++ b/example/src/main/java/de/charlex/compose/bottomdrawerscaffold/sample/MainActivity.kt @@ -1,17 +1,14 @@ package de.charlex.compose.bottomdrawerscaffold.sample import android.os.Bundle -import android.util.Log import androidx.activity.ComponentActivity import androidx.activity.compose.setContent import androidx.activity.enableEdgeToEdge -import androidx.compose.foundation.ExperimentalFoundationApi import androidx.compose.foundation.background import androidx.compose.foundation.clickable import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.ColumnScope -import androidx.compose.foundation.layout.ExperimentalLayoutApi import androidx.compose.foundation.layout.Row import androidx.compose.foundation.layout.Spacer import androidx.compose.foundation.layout.fillMaxSize @@ -48,8 +45,6 @@ import androidx.compose.material3.SheetValue import androidx.compose.material3.SnackbarHost import androidx.compose.material3.SnackbarHostState import androidx.compose.material3.Text -import androidx.compose.material3.TopAppBar -import androidx.compose.material3.TopAppBarDefaults import androidx.compose.runtime.Composable import androidx.compose.runtime.remember import androidx.compose.runtime.rememberCoroutineScope @@ -239,7 +234,8 @@ fun Group( children: @Composable ColumnScope.() -> Unit ) { Column { - Text(text = title, + Text( + text = title, modifier = Modifier .padding(horizontal = 40.dp) .padding(top = 30.dp, bottom = 15.dp), diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index f5668c5..b3d0699 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -15,7 +15,6 @@ material3 = "1.3.0-beta02" # https://developer.android.com/build/releases/gradle activityCompose = "1.9.0" coreKtx = "1.13.1" -ktlint = "0.49.1" nexusStaging = "0.30.0" @@ -30,7 +29,6 @@ compose-material3-material3 = { module = "androidx.compose.material3:material3", core-ktx = { module = "androidx.core:core-ktx", version.ref = "coreKtx" } kotlin-stdlib-jdk8 = { module = "org.jetbrains.kotlin:kotlin-stdlib-jdk8", version.ref = "kotlin" } activity-compose = { module = "androidx.activity:activity-compose", version.ref = "activityCompose" } -ktlint = { module = "com.pinterest:ktlint", version.ref = "ktlint" } [plugins] android-library = { id = "com.android.library", version.ref = "gradlePlugin" }