From 8c86509e62a4881185b623226c092d74db364c90 Mon Sep 17 00:00:00 2001 From: "Erik C. Thauvin" Date: Tue, 27 Jul 2021 15:15:46 -0700 Subject: [PATCH] Upgrade to JDK 16, Kotlin 1.3.21 and Gradle 7.1.1 --- .circleci/config.yml | 8 ++--- .github/workflows/gradle.yml | 2 +- .gitignore | 1 + .idea/isgd-shorten.iml | 2 -- .idea/jarRepositories.xml | 10 +++++++ .idea/misc.xml | 2 +- build.gradle.kts | 12 ++++---- examples/build.gradle.kts | 4 +-- examples/gradle/wrapper/gradle-wrapper.jar | Bin 59203 -> 59536 bytes .../gradle/wrapper/gradle-wrapper.properties | 2 +- examples/gradlew | 2 +- gradle/wrapper/gradle-wrapper.jar | Bin 59203 -> 59536 bytes gradle/wrapper/gradle-wrapper.properties | 2 +- gradlew | 2 +- pom.xml | 4 +-- settings.gradle.kts | 17 +++++++++++ src/main/kotlin/net/thauvin/erik/isgd/Isgd.kt | 24 +++++++-------- .../kotlin/net/thauvin/erik/isgd/IsgdTest.kt | 28 +++++++++--------- 18 files changed, 74 insertions(+), 48 deletions(-) delete mode 100644 .idea/isgd-shorten.iml diff --git a/.circleci/config.yml b/.circleci/config.yml index d21cbc7..640a7b9 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -30,11 +30,11 @@ defaults_gradle: &defaults_gradle path: build/reports/ jobs: - build_gradle_jdk14: + build_gradle_jdk16: <<: *defaults docker: - - image: openjdk:14-jdk + - image: cimg/openjdk:16.0 <<: *defaults_gradle @@ -42,7 +42,7 @@ jobs: <<: *defaults docker: - - image: circleci/openjdk:8-jdk + - image: cimg/openjdk:8.0 <<: *defaults_gradle @@ -51,4 +51,4 @@ workflows: gradle: jobs: - build_gradle_jdk8 - - build_gradle_jdk14 + - build_gradle_jdk16 diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index 251e704..71b9695 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/gradle.yml @@ -12,7 +12,7 @@ jobs: strategy: matrix: - java-version: [ 1.8, 11, 15 ] + java-version: [ 1.8, 11, 16 ] steps: - uses: actions/checkout@v2 diff --git a/.gitignore b/.gitignore index a602396..13a066e 100644 --- a/.gitignore +++ b/.gitignore @@ -47,6 +47,7 @@ /**/.idea/**/uiDesigner.xml /**/.idea/**/usage.statistics.xml /**/.idea/**/workspace.xml +/**/.idea/sonarlint* /**/.idea_modules/ Thumbs.db __pycache__ diff --git a/.idea/isgd-shorten.iml b/.idea/isgd-shorten.iml deleted file mode 100644 index 78b2cc5..0000000 --- a/.idea/isgd-shorten.iml +++ /dev/null @@ -1,2 +0,0 @@ - - \ No newline at end of file diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml index ac476f9..5d3d4fc 100644 --- a/.idea/jarRepositories.xml +++ b/.idea/jarRepositories.xml @@ -26,5 +26,15 @@