From 782fd2f649dde78148d277e6ced112176ed6aee0 Mon Sep 17 00:00:00 2001 From: "Erik C. Thauvin" Date: Tue, 27 Jul 2021 14:41:16 -0700 Subject: [PATCH] Upgrade to JDK 16, Kotlin 1.3.21 and Gradle 7.1.1 --- .circleci/config.yml | 8 +- .gitignore | 2 +- .idea/akismet-kotlin.iml | 2 - .idea/compiler.xml | 6 + .idea/jarRepositories.xml | 10 + .idea/misc.xml | 2 +- build.gradle.kts | 20 +- config/detekt/baseline.xml | 14 +- config/detekt/detekt.yml | 551 ------------------ 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 +- settings.gradle.kts | 15 +- .../net/thauvin/erik/akismet/Akismet.kt | 4 +- 18 files changed, 57 insertions(+), 589 deletions(-) delete mode 100644 .idea/akismet-kotlin.iml create mode 100644 .idea/compiler.xml delete mode 100644 config/detekt/detekt.yml diff --git a/.circleci/config.yml b/.circleci/config.yml index 7bf833e..23a719e 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_jdk15: <<: *defaults docker: - - image: openjdk:14-jdk + - image: cimg/openjdk:15.0 <<: *defaults_gradle @@ -42,7 +42,7 @@ jobs: <<: *defaults docker: - - image: circleci/openjdk:8-jdk + - image: cimg/openjdk:8.0 <<: *defaults_gradle @@ -51,5 +51,5 @@ workflows: gradle: jobs: - build_gradle_jdk8 - - build_gradle_jdk14 + - build_gradle_jdk15 diff --git a/.gitignore b/.gitignore index f58d3e5..d7c72b2 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,3 @@ - !.vscode/extensions.json !.vscode/launch.json !.vscode/settings.json @@ -43,6 +42,7 @@ /**/.idea/**/replstate.xml /**/.idea/**/shelf /**/.idea/**/shelf/ +/**/.idea/**/sonarlint* /**/.idea/**/sqlDataSources.xml /**/.idea/**/tasks.xml /**/.idea/**/uiDesigner.xml diff --git a/.idea/akismet-kotlin.iml b/.idea/akismet-kotlin.iml deleted file mode 100644 index 78b2cc5..0000000 --- a/.idea/akismet-kotlin.iml +++ /dev/null @@ -1,2 +0,0 @@ - - \ No newline at end of file diff --git a/.idea/compiler.xml b/.idea/compiler.xml new file mode 100644 index 0000000..61a9130 --- /dev/null +++ b/.idea/compiler.xml @@ -0,0 +1,6 @@ + + + + + + \ 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 @@