From d6d0f72759a5f9a410a43b291d1c6ee8af58373a Mon Sep 17 00:00:00 2001 From: Joshua Schriever Date: Wed, 13 Nov 2024 04:46:28 -0600 Subject: [PATCH 1/2] update gradle, java, kotlin, agp, target sdk --- .editorconfig | 10 + .github/workflows/codeql.yml | 2 +- .github/workflows/release.yml | 2 +- .github/workflows/test.yml | 2 +- .gitignore | 1 + .idea/codeStyles/Project.xml | 3 - build.gradle.kts | 7 +- gordon-plugin/build.gradle.kts | 9 +- .../kotlin/com/banno/gordon/AndroidPlugin.kt | 2 +- .../kotlin/com/banno/gordon/TestResults.kt | 9 +- gradle.properties | 11 +- gradle/wrapper/gradle-wrapper.jar | Bin 53636 -> 43583 bytes gradle/wrapper/gradle-wrapper.properties | 4 +- gradlew | 304 +++++++++++------- gradlew.bat | 178 +++++----- test_app/build.gradle.kts | 12 +- .../android/gordontest/ParameterizedTest.kt | 10 +- test_feature/build.gradle.kts | 10 +- test_library/build.gradle.kts | 10 +- 19 files changed, 348 insertions(+), 238 deletions(-) create mode 100644 .editorconfig diff --git a/.editorconfig b/.editorconfig new file mode 100644 index 0000000..c137328 --- /dev/null +++ b/.editorconfig @@ -0,0 +1,10 @@ +[*.{kt,kts}] +ktlint_code_style = intellij_idea +ktlint_standard_annotation = disabled +ktlint_standard_class-signature = disabled +ktlint_standard_comment-spacing = disabled +ktlint_standard_condition-wrapping = disabled +ktlint_standard_multiline-if-else = disabled +ktlint_standard_spacing-between-declarations-with-annotations = disabled +ktlint_standard_trailing-comma-on-call-site = disabled +ktlint_standard_trailing-comma-on-declaration-site = disabled diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index 44952fd..000cc85 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -14,7 +14,7 @@ jobs: - uses: actions/setup-java@v4 with: distribution: 'zulu' - java-version: 17 + java-version: 21 - uses: gradle/actions/setup-gradle@v4 diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 02a90d8..2c099d8 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -16,7 +16,7 @@ jobs: - uses: actions/setup-java@v4 with: distribution: 'zulu' - java-version: 17 + java-version: 21 - uses: gradle/actions/setup-gradle@v4 diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 577dfc3..6087663 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -16,7 +16,7 @@ jobs: - uses: actions/setup-java@v4 with: distribution: 'zulu' - java-version: 17 + java-version: 21 - uses: gradle/actions/setup-gradle@v4 diff --git a/.gitignore b/.gitignore index 25ca081..18af7fb 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ build /captures .externalNativeBuild .cxx +.kotlin diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml index 3b7c16f..c803776 100644 --- a/.idea/codeStyles/Project.xml +++ b/.idea/codeStyles/Project.xml @@ -18,9 +18,6 @@ -