From 3dd75fa575721027fc74c808daddc8370c094d08 Mon Sep 17 00:00:00 2001 From: "Erik C. Thauvin" Date: Tue, 27 Jul 2021 15:10:13 -0700 Subject: [PATCH] Upgrade to JDK 16 and Kotlin 1.3.21 --- .circleci/config.yml | 12 +-- .github/workflows/gradle.yml | 2 +- .gitignore | 92 +++++++++++++----- .idea/compiler.xml | 9 -- .idea/jarRepositories.xml | 10 ++ .idea/libraries-with-intellij-classes.xml | 65 +++++++++++++ .idea/misc.xml | 3 +- .idea/modules.xml | 9 -- .idea/modules/kotlin.samples-kotlin.iml | 13 --- .idea/modules/kotlin.samples-kotlin.main.iml | 53 ---------- .idea/modules/kotlin.samples-kotlin.test.iml | 60 ------------ .idea/modules/pinboard-poster.main.iml | 56 ----------- .idea/modules/pinboard-poster.test.iml | 81 --------------- .idea/modules/samples-java.iml | 13 --- .idea/modules/samples-java.main.iml | 18 ---- .idea/modules/samples-java.test.iml | 18 ---- build.gradle.kts | 13 +-- pinboard-poster.iml | 14 +-- pom.xml | 4 +- samples/java/build.gradle | 5 + .../java/gradle/wrapper/gradle-wrapper.jar | Bin 59203 -> 59536 bytes .../gradle/wrapper/gradle-wrapper.properties | 2 +- samples/java/gradlew | 2 +- samples/kotlin/build.gradle.kts | 2 +- .../kotlin/gradle/wrapper/gradle-wrapper.jar | Bin 59203 -> 59536 bytes .../gradle/wrapper/gradle-wrapper.properties | 2 +- samples/kotlin/gradlew | 2 +- settings.gradle.kts | 20 ++-- 28 files changed, 181 insertions(+), 399 deletions(-) create mode 100644 .idea/libraries-with-intellij-classes.xml delete mode 100644 .idea/modules/kotlin.samples-kotlin.iml delete mode 100644 .idea/modules/kotlin.samples-kotlin.main.iml delete mode 100644 .idea/modules/kotlin.samples-kotlin.test.iml delete mode 100644 .idea/modules/pinboard-poster.main.iml delete mode 100644 .idea/modules/pinboard-poster.test.iml delete mode 100644 .idea/modules/samples-java.iml delete mode 100644 .idea/modules/samples-java.main.iml delete mode 100644 .idea/modules/samples-java.test.iml diff --git a/.circleci/config.yml b/.circleci/config.yml index d21cbc7..9f4cf5a 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,13 +42,13 @@ jobs: <<: *defaults docker: - - image: circleci/openjdk:8-jdk + - image: cimg/openjdk:8.0 <<: *defaults_gradle workflows: version: 2 gradle: - jobs: - - build_gradle_jdk8 - - build_gradle_jdk14 + jobs: + - build_gradle_jdk8 + - build_gradle_jdk16 diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index beab9bd..d381614 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 9dda44b..13a066e 100644 --- a/.gitignore +++ b/.gitignore @@ -2,46 +2,84 @@ !.vscode/launch.json !.vscode/settings.json !.vscode/tasks.json -**/*.class -**/.idea/**/dataSources.ids -**/.idea/**/dataSources.local.xml -**/.idea/**/dataSources/ -**/.idea/**/dbnavigator.xml -**/.idea/**/dictionaries -**/.idea/**/dynamic.xml -**/.idea/**/gradle.xml -**/.idea/**/libraries -**/.idea/**/shelf -**/.idea/**/sqlDataSources.xml -**/.idea/**/tasks.xml -**/.idea/**/uiDesigner.xml -**/.idea/**/usage.statistics.xml -**/.idea/**/workspace.xml +*.class *.code-workspace +*.ctxt *.iws +*.log +*.nar +*.rar *.sublime-* +*.tar.gz +*.zip .DS_Store .classpath .gradle +.history .kobalt +.mtj.tmp/ +.mvn/timing.properties +.mvn/wrapper/maven-wrapper.jar .nb-gradle .project +.scannerwork .settings .vscode/* -/bin -/build -/deploy -/dist -/gen -/gradle.properties -/local.properties -/out -/proguard-project.txt -/project.properties -/target -/test-output +/**/.idea/$CACHE_FILE$ +/**/.idea/$PRODUCT_WORKSPACE_FILE$ +/**/.idea/**/caches/build_file_checksums.ser +/**/.idea/**/contentModel.xml +/**/.idea/**/dataSources.ids +/**/.idea/**/dataSources.local.xml +/**/.idea/**/dataSources/ +/**/.idea/**/dbnavigator.xml +/**/.idea/**/dictionaries +/**/.idea/**/dynamic.xml +/**/.idea/**/gradle.xml +/**/.idea/**/httpRequests +/**/.idea/**/libraries +/**/.idea/**/mongoSettings.xml +/**/.idea/**/replstate.xml +/**/.idea/**/shelf +/**/.idea/**/shelf/ +/**/.idea/**/sqlDataSources.xml +/**/.idea/**/tasks.xml +/**/.idea/**/uiDesigner.xml +/**/.idea/**/usage.statistics.xml +/**/.idea/**/workspace.xml +/**/.idea/sonarlint* +/**/.idea_modules/ Thumbs.db +__pycache__ +atlassian-ide-plugin.xml +bin/ +build/ +cmake-build-*/ +com_crashlytics_export_strings.xml +crashlytics-build.properties +crashlytics.properties +dependency-reduced-pom.xml +deploy/ +dist/ ehthumbs.db +fabric.properties +gen/ +gradle.properties +hs_err_pid* kobaltBuild kobaltw*-test +lib/kotlin* +libs/ +local.properties +out/ pom.xml.asc +pom.xml.next +pom.xml.releaseBackup +pom.xml.tag +pom.xml.versionsBackup +proguard-project.txt +project.properties +release.properties +target/ +test-output +venv diff --git a/.idea/compiler.xml b/.idea/compiler.xml index 4e8da37..88fa664 100644 --- a/.idea/compiler.xml +++ b/.idea/compiler.xml @@ -4,18 +4,9 @@ - - - - - - - - - diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml index 3d4ac96..e5035ca 100644 --- a/.idea/jarRepositories.xml +++ b/.idea/jarRepositories.xml @@ -21,5 +21,15 @@