From 5d1e2c65479934ec17207f253e435f7620db7589 Mon Sep 17 00:00:00 2001 From: "hoc081098@gmail.com" Date: Sat, 5 Oct 2024 16:55:35 +0700 Subject: [PATCH] build: apply versions catalogue --- .editorconfig | 20 +- .github/workflows/build.yml | 2 +- .github/workflows/gradle-versions-checker.yml | 2 +- .github/workflows/qodana.yml | 2 +- .github/workflows/review-suggest.yml | 2 +- .github/workflows/unit-test.yml | 2 +- .idea/.name | 2 +- .idea/compiler.xml | 33 +- .idea/gradle.xml | 1 + .idea/icon.png | Bin 0 -> 203081 bytes .idea/kotlinc.xml | 6 + .idea/misc.xml | 3 +- .idea/other.xml | 296 ------------------ .idea/runConfigurations.xml | 13 + .idea/vcs.xml | 2 + app/build.gradle.kts | 89 +++--- build.gradle.kts | 61 ++-- buildSrc/gradle/wrapper/gradle-wrapper.jar | Bin 43453 -> 43583 bytes buildSrc/settings.gradle.kts | 7 + buildSrc/src/main/kotlin/appConfig.kt | 15 + buildSrc/src/main/kotlin/deps.kt | 136 +------- .../src/main/kotlin/libsVersionCatalog.kt | 28 ++ core-ui/build.gradle.kts | 33 +- .../core_ui/ExampleInstrumentedTest.kt | 1 - .../hoc/flowmvi/core_ui/ExampleUnitTest.kt | 1 - core/build.gradle.kts | 14 +- data/build.gradle.kts | 43 ++- domain/build.gradle.kts | 20 +- feature-add/build.gradle.kts | 50 +-- .../java/com/hoc/flowmvi/ui/add/AddModule.kt | 2 +- feature-main/build.gradle.kts | 57 ++-- .../com/hoc/flowmvi/ui/main/MainModule.kt | 2 +- feature-search/build.gradle.kts | 56 ++-- .../ui/search/ExampleInstrumentedTest.kt | 1 - .../com/hoc/flowmvi/ui/search/SearchModule.kt | 2 +- .../com/hoc/flowmvi/ui/search/SearchVM.kt | 4 +- gradle/libs.versions.toml | 124 ++++++++ gradle/versions.toml | 55 ---- mvi/mvi-base/build.gradle.kts | 27 +- .../flowmvi/mvi_base/AbstractMviViewModel.kt | 3 +- mvi/mvi-testing/build.gradle.kts | 29 +- settings.gradle.kts | 9 +- test-utils/build.gradle.kts | 14 +- 43 files changed, 513 insertions(+), 756 deletions(-) create mode 100644 .idea/icon.png delete mode 100644 .idea/other.xml create mode 100644 .idea/runConfigurations.xml create mode 100644 buildSrc/settings.gradle.kts create mode 100644 buildSrc/src/main/kotlin/appConfig.kt create mode 100644 buildSrc/src/main/kotlin/libsVersionCatalog.kt delete mode 100644 core-ui/src/androidTest/java/com/hoc/flowmvi/core_ui/ExampleInstrumentedTest.kt delete mode 100644 core-ui/src/test/java/com/hoc/flowmvi/core_ui/ExampleUnitTest.kt delete mode 100644 feature-search/src/androidTest/java/com/hoc/flowmvi/ui/search/ExampleInstrumentedTest.kt create mode 100644 gradle/libs.versions.toml delete mode 100644 gradle/versions.toml diff --git a/.editorconfig b/.editorconfig index 098208df..4dfb2c02 100644 --- a/.editorconfig +++ b/.editorconfig @@ -8,12 +8,24 @@ insert_final_newline=true [*.{kt,kts}] ij_kotlin_imports_layout=* ij_continuation_indent_size=4 +ij_kotlin_allow_trailing_comma_on_call_site=true +ij_kotlin_allow_trailing_comma=true 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 +ktlint_experimental=disabled +ktlint_code_style=ktlint_official +ktlint_standard_argument-list-wrapping=disabled +ktlint_standard_multiline-expression-wrapping=disabled +ktlint_standard_string-template-indent=disabled +ktlint_standard_no-consecutive-comments=disabled +ktlint_standard_value-parameter-comment=disabled +ktlint_standard_value-argument-comment=disabled +max_line_length=120 +[*.kts] +max_line_length=512 +ktlint_standard_chain-wrapping=disabled +ktlint_standard_value-argument-comment=disabled [*.xml] -indent_size=4 +indent_size=4 \ No newline at end of file diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 02766462..b73d097f 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -22,7 +22,7 @@ jobs: uses: actions/setup-java@v4 with: distribution: 'zulu' - java-version: '17' + java-version: '21' - name: Cache gradle, wrapper and buildSrc uses: actions/cache@v4 diff --git a/.github/workflows/gradle-versions-checker.yml b/.github/workflows/gradle-versions-checker.yml index fc9697c0..bf0cc850 100644 --- a/.github/workflows/gradle-versions-checker.yml +++ b/.github/workflows/gradle-versions-checker.yml @@ -20,7 +20,7 @@ jobs: uses: actions/setup-java@v4 with: distribution: 'zulu' - java-version: '17' + java-version: '21' - name: Cache gradle, wrapper and buildSrc uses: actions/cache@v4 diff --git a/.github/workflows/qodana.yml b/.github/workflows/qodana.yml index 3f1d95d7..ebb2b982 100644 --- a/.github/workflows/qodana.yml +++ b/.github/workflows/qodana.yml @@ -19,7 +19,7 @@ jobs: # uses: actions/setup-java@v3 # with: # distribution: 'zulu' - # java-version: '11' + # java-version: '21' # - uses: JetBrains/qodana-action@v2023.2.6 # with: diff --git a/.github/workflows/review-suggest.yml b/.github/workflows/review-suggest.yml index 8eb0f7ab..6ea8c762 100644 --- a/.github/workflows/review-suggest.yml +++ b/.github/workflows/review-suggest.yml @@ -18,7 +18,7 @@ jobs: - uses: actions/setup-java@v4 with: distribution: 'zulu' - java-version: '17' + java-version: '21' - name: Cache gradle, wrapper and buildSrc uses: actions/cache@v4 with: diff --git a/.github/workflows/unit-test.yml b/.github/workflows/unit-test.yml index b828b857..44a4237a 100644 --- a/.github/workflows/unit-test.yml +++ b/.github/workflows/unit-test.yml @@ -22,7 +22,7 @@ jobs: uses: actions/setup-java@v4 with: distribution: 'zulu' - java-version: '17' + java-version: '21' - name: Cache gradle, wrapper and buildSrc uses: actions/cache@v4 diff --git a/.idea/.name b/.idea/.name index fbd80218..8bb73b85 100644 --- a/.idea/.name +++ b/.idea/.name @@ -1 +1 @@ -MVI Coroutines Flow \ No newline at end of file +MVI-Coroutines-Flow diff --git a/.idea/compiler.xml b/.idea/compiler.xml index 44e86047..f0abae06 100644 --- a/.idea/compiler.xml +++ b/.idea/compiler.xml @@ -2,17 +2,28 @@ - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + diff --git a/.idea/gradle.xml b/.idea/gradle.xml index c613c422..712e58fe 100644 --- a/.idea/gradle.xml +++ b/.idea/gradle.xml @@ -15,6 +15,7 @@ +