From f0f04b8a6eeb64f34b1aeb2b838283fd473051ad Mon Sep 17 00:00:00 2001 From: "Erik C. Thauvin" Date: Sun, 24 Sep 2023 16:16:57 -0700 Subject: [PATCH 1/4] Added JDK 20 and make JDK 17 default --- .github/workflows/gradle.yml | 34 +++++++++++----------------------- .idea/kotlinScripting.xml | 6 ------ 2 files changed, 11 insertions(+), 29 deletions(-) delete mode 100644 .idea/kotlinScripting.xml diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index c39c63c..193e95b 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/gradle.yml @@ -1,6 +1,6 @@ name: gradle-ci -on: [push, pull_request, workflow_dispatch] +on: [ push, pull_request, workflow_dispatch ] jobs: build: @@ -8,20 +8,21 @@ jobs: env: GRADLE_OPTS: "-Dorg.gradle.jvmargs=-XX:MaxMetaspaceSize=512m" - SONAR_JDK: "11" + SONAR_JDK: "17" strategy: matrix: - java-version: [ 11, 18 ] + java-version: [ 11, 17, 20 ] steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 with: fetch-depth: 0 - name: Set up JDK ${{ matrix.java-version }} - uses: actions/setup-java@v1 + uses: actions/setup-java@v3 with: + distribution: 'zulu' java-version: ${{ matrix.java-version }} - name: Grant execute permission for gradlew @@ -29,36 +30,23 @@ jobs: - name: Cache SonarCloud packages if: matrix.java-version == env.SONAR_JDK - uses: actions/cache@v1 + uses: actions/cache@v3 with: path: ~/.sonar/cache key: ${{ runner.os }}-sonar restore-keys: ${{ runner.os }}-sonar - - name: Cache Gradle packages - uses: actions/cache@v2 - with: - path: | - ~/.gradle/caches - ~/.gradle/wrapper - key: ${{ runner.os }}-gradle-${{ matrix.java-version }}-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }} - restore-keys: | - ${{ runner.os }}-gradle-${{ matrix.java-version }}- - - name: Test with Gradle + uses: gradle/gradle-build-action@v2 env: AKISMET_BLOG: ${{ secrets.AKISMET_BLOG }} AKISMET_API_KEY: ${{ secrets.AKISMET_API_KEY }} - run: ./gradlew build check --stacktrace + with: + arguments: build check --stacktrace - name: SonarCloud if: success() && matrix.java-version == env.SONAR_JDK env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }} - run: ./gradlew sonarqube - - - name: Cleanup Gradle Cache - run: | - rm -f ~/.gradle/caches/modules-2/modules-2.lock - rm -f ~/.gradle/caches/modules-2/gc.properties + run: ./gradlew sonar --info diff --git a/.idea/kotlinScripting.xml b/.idea/kotlinScripting.xml deleted file mode 100644 index bc444de..0000000 --- a/.idea/kotlinScripting.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - \ No newline at end of file From 6a7a312818405ff2713ae9fc1807ccea8c492156 Mon Sep 17 00:00:00 2001 From: "Erik C. Thauvin" Date: Sun, 24 Sep 2023 16:22:29 -0700 Subject: [PATCH 2/4] Updated dependencies --- .gitignore | 1 - .gitlab-ci.yml | 2 +- .idea/kotlinc.xml | 2 +- .idea/misc.xml | 1 - build.gradle.kts | 51 ++-- config/detekt/baseline.xml | 4 +- .../-akismet-comment/-akismet-comment.html | 47 ++- .../-companion/-a-d-m-i-n_-r-o-l-e.html | 36 ++- .../-t-y-p-e_-b-l-o-g_-p-o-s-t.html | 36 ++- .../-companion/-t-y-p-e_-c-o-m-m-e-n-t.html | 36 ++- .../-t-y-p-e_-c-o-n-t-a-c-t_-f-o-r-m.html | 36 ++- .../-t-y-p-e_-f-o-r-u-m_-p-o-s-t.html | 36 ++- .../-companion/-t-y-p-e_-m-e-s-s-a-g-e.html | 36 ++- .../-companion/-t-y-p-e_-p-i-n-g-b-a-c-k.html | 36 ++- .../-companion/-t-y-p-e_-r-e-p-l-y.html | 36 ++- .../-companion/-t-y-p-e_-s-i-g-n-u-p.html | 36 ++- .../-t-y-p-e_-t-r-a-c-k-b-a-c-k.html | 36 ++- .../-companion/-t-y-p-e_-t-w-e-e-t.html | 36 ++- .../-akismet-comment/-companion/index.html | 60 ++-- .../-akismet-comment/author-email.html | 36 ++- .../-akismet-comment/author-url.html | 36 ++- .../-akismet-comment/author.html | 36 ++- .../-akismet-comment/blog-charset.html | 36 ++- .../-akismet-comment/blog-lang.html | 36 ++- .../-akismet-comment/content.html | 36 ++- .../-akismet-comment/date-gmt.html | 36 ++- .../-akismet-comment/equals.html | 36 ++- .../-akismet-comment/hash-code.html | 36 ++- .../-akismet-comment/index.html | 90 +++--- .../-akismet-comment/is-test.html | 36 ++- .../-akismet-comment/permalink.html | 36 ++- .../-akismet-comment/post-modified-gmt.html | 36 ++- .../-akismet-comment/recheck-reason.html | 36 ++- .../-akismet-comment/referrer.html | 36 ++- .../-akismet-comment/server-env.html | 36 ++- .../-akismet-comment/to-json.html | 36 ++- .../-akismet-comment/to-string.html | 36 ++- .../-akismet-comment/type.html | 36 ++- .../-akismet-comment/user-agent.html | 36 ++- .../-akismet-comment/user-ip.html | 36 ++- .../-akismet-comment/user-role.html | 36 ++- .../-akismet/-akismet.html | 47 ++- .../-akismet/-companion/date-to-gmt.html | 47 ++- .../-akismet/-companion/index.html | 42 ++- .../-akismet/-companion/json-comment.html | 36 ++- .../-akismet/app-user-agent.html | 36 ++- .../-akismet/blog.html | 36 ++- .../-akismet/check-comment.html | 36 ++- .../-akismet/debug-help.html | 36 ++- .../-akismet/error-message.html | 36 ++- .../-akismet/execute-method.html | 36 ++- .../-akismet/http-status-code.html | 36 ++- .../-akismet/index.html | 76 +++-- .../-akismet/is-discard.html | 36 ++- .../-akismet/is-verified-key.html | 36 ++- .../-akismet/logger.html | 36 ++- .../-akismet/pro-tip.html | 36 ++- .../-akismet/reset.html | 36 ++- .../-akismet/response.html | 36 ++- .../-akismet/submit-ham.html | 36 ++- .../-akismet/submit-spam.html | 36 ++- .../-akismet/verify-key.html | 36 ++- .../net.thauvin.erik.akismet/index.html | 27 +- .../nav-icons/abstract-class-kotlin.svg | 22 ++ docs/images/nav-icons/abstract-class.svg | 20 ++ docs/images/nav-icons/annotation-kotlin.svg | 9 + docs/images/nav-icons/annotation.svg | 7 + docs/images/nav-icons/class-kotlin.svg | 9 + docs/images/nav-icons/class.svg | 7 + docs/images/nav-icons/enum-kotlin.svg | 9 + docs/images/nav-icons/enum.svg | 7 + docs/images/nav-icons/exception-class.svg | 7 + docs/images/nav-icons/field-value.svg | 6 + docs/images/nav-icons/field-variable.svg | 6 + docs/images/nav-icons/function.svg | 7 + docs/images/nav-icons/interface-kotlin.svg | 9 + docs/images/nav-icons/interface.svg | 7 + docs/images/nav-icons/object.svg | 9 + docs/index.html | 24 +- docs/navigation.html | 10 +- docs/scripts/main.js | 10 +- docs/scripts/navigation-loader.js | 29 +- docs/scripts/platform-content-handler.js | 5 +- docs/scripts/prism.js | 31 +- .../symbol-parameters-wrapper_deferred.js | 83 ++++++ docs/styles/main.css | 2 +- docs/styles/prism.css | 168 +++++++++-- docs/styles/style.css | 268 ++++++++++++------ gradle.properties | 0 gradle/wrapper/gradle-wrapper.jar | Bin 59536 -> 63721 bytes gradle/wrapper/gradle-wrapper.properties | 4 +- gradlew | 31 +- gradlew.bat | 15 +- pom.xml | 14 +- 94 files changed, 1683 insertions(+), 1413 deletions(-) create mode 100644 docs/images/nav-icons/abstract-class-kotlin.svg create mode 100644 docs/images/nav-icons/abstract-class.svg create mode 100644 docs/images/nav-icons/annotation-kotlin.svg create mode 100644 docs/images/nav-icons/annotation.svg create mode 100644 docs/images/nav-icons/class-kotlin.svg create mode 100644 docs/images/nav-icons/class.svg create mode 100644 docs/images/nav-icons/enum-kotlin.svg create mode 100644 docs/images/nav-icons/enum.svg create mode 100644 docs/images/nav-icons/exception-class.svg create mode 100644 docs/images/nav-icons/field-value.svg create mode 100644 docs/images/nav-icons/field-variable.svg create mode 100644 docs/images/nav-icons/function.svg create mode 100644 docs/images/nav-icons/interface-kotlin.svg create mode 100644 docs/images/nav-icons/interface.svg create mode 100644 docs/images/nav-icons/object.svg create mode 100644 docs/scripts/symbol-parameters-wrapper_deferred.js create mode 100644 gradle.properties diff --git a/.gitignore b/.gitignore index d7c72b2..ac52a18 100644 --- a/.gitignore +++ b/.gitignore @@ -64,7 +64,6 @@ dist/ ehthumbs.db fabric.properties gen/ -gradle.properties hs_err_pid* kobaltBuild kobaltw*-test diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 7ff47e3..1601b0b 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,4 +1,4 @@ -image: gradle:7-jdk11 +image: gradle:8-jdk11 variables: GRADLE_OPTS: "-Dorg.gradle.daemon=false -Dorg.gradle.jvmargs=-XX:MaxMetaspaceSize=512m" diff --git a/.idea/kotlinc.xml b/.idea/kotlinc.xml index 4251b72..f8467b4 100644 --- a/.idea/kotlinc.xml +++ b/.idea/kotlinc.xml @@ -1,6 +1,6 @@ - \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml index 2e50429..1e1e260 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,4 +1,3 @@ -