diff --git a/.editorconfig b/.editorconfig index 4bda7f7f..098208df 100644 --- a/.editorconfig +++ b/.editorconfig @@ -1,14 +1,19 @@ -root = true - +root=true [*] -indent_size = 2 -end_of_line = lf -charset = utf-8 -trim_trailing_whitespace = true -insert_final_newline = true - +indent_size=2 +end_of_line=lf +charset=utf-8 +trim_trailing_whitespace=true +insert_final_newline=true [*.{kt,kts}] -ij_kotlin_imports_layout = * - +ij_kotlin_imports_layout=* +ij_continuation_indent_size=4 +ktlint_standard_filename=disabled +ktlint_standard_package-name=disabled +ktlint_standard_property-naming=disabled +ktlint_standard_function-naming=disabled +ktlint_standard_no-empty-file=disabled +filename=disabled +ktlint_experimental=enabled [*.xml] -indent_size = 4 +indent_size=4 diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 40cb3f3e..ac6fe9ec 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -22,7 +22,7 @@ jobs: uses: actions/setup-java@v3 with: distribution: 'zulu' - java-version: '11' + java-version: '17' - name: Cache gradle, wrapper and buildSrc uses: actions/cache@v3 diff --git a/.github/workflows/gradle-versions-checker.yml b/.github/workflows/gradle-versions-checker.yml index 1131a546..3f14ca2d 100644 --- a/.github/workflows/gradle-versions-checker.yml +++ b/.github/workflows/gradle-versions-checker.yml @@ -20,7 +20,7 @@ jobs: uses: actions/setup-java@v3 with: distribution: 'zulu' - java-version: '11' + java-version: '17' - name: Cache gradle, wrapper and buildSrc uses: actions/cache@v3 diff --git a/.github/workflows/qodana.yml b/.github/workflows/qodana.yml index 8f4f22a8..a20aa35c 100644 --- a/.github/workflows/qodana.yml +++ b/.github/workflows/qodana.yml @@ -15,14 +15,14 @@ jobs: steps: - uses: actions/checkout@v3 - - uses: JetBrains/qodana-action@v2022.3.4 - with: - linter: jetbrains/qodana-jvm-android:latest - fail-threshold: 10 - - - name: Deploy to GitHub Pages - uses: peaceiris/actions-gh-pages@v3 - with: - github_token: ${{ secrets.GITHUB_TOKEN }} - publish_dir: ${{ runner.temp }}/qodana/results/report - destination_dir: ./ + # - name: Set up JDK + # uses: actions/setup-java@v3 + # with: + # distribution: 'zulu' + # java-version: '11' + + # - uses: JetBrains/qodana-action@v2023.2.6 + # with: + # linter: jetbrains/qodana-jvm-android:latest + # fail-threshold: 10 + # upload-result: true diff --git a/.github/workflows/review-suggest.yml b/.github/workflows/review-suggest.yml index 2ff9fc2c..32f92e64 100644 --- a/.github/workflows/review-suggest.yml +++ b/.github/workflows/review-suggest.yml @@ -18,7 +18,7 @@ jobs: - uses: actions/setup-java@v3 with: distribution: 'zulu' - java-version: '11' + java-version: '17' - name: Cache gradle, wrapper and buildSrc uses: actions/cache@v3 with: diff --git a/.github/workflows/unit-test.yml b/.github/workflows/unit-test.yml index f5c0d600..b240674c 100644 --- a/.github/workflows/unit-test.yml +++ b/.github/workflows/unit-test.yml @@ -22,7 +22,7 @@ jobs: uses: actions/setup-java@v3 with: distribution: 'zulu' - java-version: '11' + java-version: '17' - name: Cache gradle, wrapper and buildSrc uses: actions/cache@v3 @@ -38,10 +38,7 @@ jobs: run: chmod +x ./gradlew - name: Run Android Debug Unit Test - run: ./gradlew jacocoTestReportDebug --warning-mode all --stacktrace - - - name: Run Java/Kotlin Unit Test - run: ./gradlew jacocoTestReport --warning-mode all --stacktrace + run: ./gradlew :app:koverHtmlReport --warning-mode all --stacktrace - name: Upload Test Report uses: codecov/codecov-action@v3.1.4 diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml index 17eb6a80..1cae6040 100644 --- a/.idea/codeStyles/Project.xml +++ b/.idea/codeStyles/Project.xml @@ -7,8 +7,6 @@ -