From aef7d1fa6a69911e9312c857cc9bc5f5c2b20f18 Mon Sep 17 00:00:00 2001 From: "Erik C. Thauvin" Date: Mon, 3 Jan 2022 14:18:15 -0800 Subject: [PATCH] Updated dependencies and copyright. --- .circleci/config.yml | 61 ++-- .github/workflows/gradle.yml | 2 +- .idea/codeStyles/Project.xml | 15 + .idea/codeStyles/codeStyleConfig.xml | 2 +- .idea/compiler.xml | 10 - .idea/jarRepositories.xml | 5 + .idea/runConfigurations.xml | 10 + LICENSE.txt | 2 +- build.gradle.kts | 37 ++- .../gradle/wrapper/gradle-wrapper.properties | 2 +- examples/annotation-processor/java/gradlew | 269 ++++++++++------- .../kotlin/build.gradle.kts | 4 +- .../gradle/wrapper/gradle-wrapper.properties | 2 +- examples/annotation-processor/kotlin/gradlew | 269 ++++++++++------- examples/java/build.gradle | 4 +- .../gradle/wrapper/gradle-wrapper.properties | 2 +- examples/java/gradlew | 269 ++++++++++------- examples/kotlin/build.gradle.kts | 4 +- .../gradle/wrapper/gradle-wrapper.properties | 2 +- examples/kotlin/gradlew | 269 ++++++++++------- examples/test/build.gradle | 12 +- .../test/gradle/wrapper/gradle-wrapper.jar | Bin 55616 -> 59536 bytes .../gradle/wrapper/gradle-wrapper.properties | 2 +- examples/test/gradlew | 270 ++++++++++-------- examples/test/gradlew.bat | 25 +- gradle/wrapper/gradle-wrapper.properties | 2 +- gradlew | 269 ++++++++++------- settings.gradle.kts | 7 +- .../erik/gradle/semver/SemverConfig.kt | 2 +- .../semver/SemverIncrementBuildMetaTask.kt | 2 +- .../erik/gradle/semver/SemverIncrementTask.kt | 2 +- .../erik/gradle/semver/SemverPlugin.kt | 4 +- .../erik/gradle/semver/SortedProperties.kt | 2 +- .../net/thauvin/erik/gradle/semver/Utils.kt | 8 +- .../net/thauvin/erik/gradle/semver/Version.kt | 6 +- .../erik/gradle/semver/SemverConfigTest.kt | 2 +- .../gradle/semver/SortedPropertiesTest.kt | 4 +- .../thauvin/erik/gradle/semver/UtilsTest.kt | 8 +- .../thauvin/erik/gradle/semver/VersionTest.kt | 4 +- 39 files changed, 1091 insertions(+), 780 deletions(-) create mode 100644 .idea/codeStyles/Project.xml delete mode 100644 .idea/compiler.xml create mode 100644 .idea/runConfigurations.xml diff --git a/.circleci/config.yml b/.circleci/config.yml index 6c0190e..9f4cf5a 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -1,45 +1,54 @@ version: 2 defaults: &defaults working_directory: ~/repo - docker: - - image: circleci/openjdk:8-jdk environment: JVM_OPTS: -Xmx3200m TERM: dumb CI: true -jobs: - build_gradle: - <<: *defaults - - steps: - - checkout - - restore_cache: - keys: +defaults_gradle: &defaults_gradle + steps: + - checkout + - restore_cache: + keys: - gradle-dependencies-{{ checksum "build.gradle.kts" }} # fallback to using the latest cache if no exact match is found - gradle-dependencies- + - run: + name: Gradle Dependencies + command: ./gradlew dependencies + - save_cache: + paths: ~/.m2 + key: gradle-dependencies-{{ checksum "build.gradle.kts" }} + - run: + name: Run All Checks + command: ./gradlew check + - store_artifacts: + path: build/reports/ + destination: reports + - store_test_results: + path: build/reports/ - - run: - name: Gradle Dependencies - command: ./gradlew dependencies +jobs: + build_gradle_jdk16: + <<: *defaults - - save_cache: - paths: ~/.gradle - key: gradle-dependencies-{{ checksum "build.gradle.kts" }} + docker: + - image: cimg/openjdk:16.0 - - run: - name: Run All Checks - command: ./gradlew check --scan + <<: *defaults_gradle - - store_artifacts: - path: build/reports/ - destination: reports - - store_test_results: - path: build/reports/ + build_gradle_jdk8: + <<: *defaults + + docker: + - image: cimg/openjdk:8.0 + + <<: *defaults_gradle workflows: version: 2 - build_gradle: + gradle: jobs: - - build_gradle + - build_gradle_jdk8 + - 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/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml new file mode 100644 index 0000000..3ad4dc5 --- /dev/null +++ b/.idea/codeStyles/Project.xml @@ -0,0 +1,15 @@ + + + + + + + + + \ No newline at end of file diff --git a/.idea/codeStyles/codeStyleConfig.xml b/.idea/codeStyles/codeStyleConfig.xml index d91f848..79ee123 100644 --- a/.idea/codeStyles/codeStyleConfig.xml +++ b/.idea/codeStyles/codeStyleConfig.xml @@ -1,5 +1,5 @@ - \ No newline at end of file diff --git a/.idea/compiler.xml b/.idea/compiler.xml deleted file mode 100644 index 6c0fa41..0000000 --- a/.idea/compiler.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml index a0e051e..56b596e 100644 --- a/.idea/jarRepositories.xml +++ b/.idea/jarRepositories.xml @@ -36,5 +36,10 @@