diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 0cfbfda2d..6e6e2910b 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -27,6 +27,9 @@ jobs: restore-keys: | ${{ runner.os }}-gradle- + - name: Linter (gradle) + run: ./gradlew ktlintCheck + - name: Test (gradle) run: ./gradlew test --no-daemon diff --git a/app/build.gradle b/app/build.gradle index a0a49dda4..32ab8260a 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -167,3 +167,7 @@ dependencies { debugImplementation "androidx.compose.ui:ui-tooling:$compose_ui_version" debugImplementation "androidx.compose.ui:ui-test-manifest:$compose_ui_version" } + +ktlint { + disabledRules.set(["no-wildcard-imports"]) +} diff --git a/build.gradle b/build.gradle index 2e35222a9..6c6032c6a 100644 --- a/build.gradle +++ b/build.gradle @@ -13,4 +13,11 @@ plugins { id 'com.android.library' version '7.4.1' apply false id 'org.jetbrains.kotlin.android' version '1.8.10' apply false id 'org.jetbrains.kotlin.jvm' version '1.8.10' apply false -} \ No newline at end of file +} + +task installGitHook(type: Copy) { + from new File(rootProject.rootDir, 'pre-commit') + into { new File(rootProject.rootDir, '.git/hooks') } + fileMode 0777 +} +tasks.getByPath(':app:preBuild').dependsOn installGitHook \ No newline at end of file diff --git a/tools/git-hooks/pre-commit.sh b/pre-commit similarity index 100% rename from tools/git-hooks/pre-commit.sh rename to pre-commit diff --git a/tools/git-hooks/init.sh b/tools/git-hooks/init.sh deleted file mode 100755 index b6452533f..000000000 --- a/tools/git-hooks/init.sh +++ /dev/null @@ -1,13 +0,0 @@ -#!/usr/bin/env bash - -set -e - -function setup_git_hooks() -{ - echo "Initialising git hooks..." - ln -sf "$PWD/tools/git-hooks/pre-commit.sh" "$PWD/.git/hooks/pre-commit" - chmod +x "$PWD/.git/hooks/pre-commit" - echo "Done" -} - -setup_git_hooks \ No newline at end of file