From 4858c58978cdea500a6c80690513efb153fd705f Mon Sep 17 00:00:00 2001 From: "Erik C. Thauvin" Date: Fri, 18 Aug 2023 18:12:44 -0700 Subject: [PATCH] Move from Gradle to bld. Close #7 --- .circleci/config.yml | 53 +- .github/workflows/bld.yml | 53 ++ .github/workflows/gradle.yml | 49 -- .gitignore | 137 ++--- .idea/app.iml | 29 + .idea/bld.iml | 14 + .idea/checkstyle-idea.xml | 18 - .idea/checkstyleidea-libs/readme.txt | 6 - .idea/codeStyles/codeStyleConfig.xml | 5 - .idea/compiler.xml | 10 - .idea/copyright/BSD_3_Clause.xml | 6 + .idea/copyright/Erik_s_Copyright_Notice.xml | 6 - .idea/copyright/profiles_settings.xml | 3 - .idea/encodings.xml | 6 - .idea/inspectionProfiles/Project_Default.xml | 8 + .../inspectionProfiles/profiles_settings.xml | 7 - .idea/jarRepositories.xml | 45 -- .idea/kotlinc.xml | 7 - .idea/libraries-with-intellij-classes.xml | 65 --- .idea/libraries/bld.xml | 17 + .idea/libraries/compile.xml | 13 + .idea/libraries/runtime.xml | 14 + .idea/libraries/test.xml | 14 + .idea/misc.xml | 115 +--- .idea/modules.xml | 9 + .idea/modules/examples-kotlin_main.iml | 41 -- .idea/modules/examples-kotlin_test.iml | 48 -- .idea/runConfigurations/Run Tests.xml | 9 + .idea/scopes/Copyright.xml | 3 - .idea/vcs.xml | 2 +- .vscode/launch.json | 11 + .vscode/settings.json | 15 + README.md | 12 +- appveyor.yml | 9 +- .../javax.annotation.processing.Processor | 33 ++ .../net/thauvin/erik/semver/Constants.class | Bin 0 -> 1771 bytes .../net/thauvin/erik/semver/Version.class | Bin 0 -> 1302 bytes .../net/thauvin/erik/semver/VersionInfo.class | Bin 0 -> 4393 bytes .../erik/semver/VersionProcessor.class | Bin 0 -> 13084 bytes bin/main/net/thauvin/erik/semver/package.html | 12 + bin/main/semver-kt.mustache | 38 ++ bin/main/semver.mustache | 34 ++ .../thauvin/erik/semver/ConstantsTest.class | Bin 0 -> 1583 bytes .../thauvin/erik/semver/VersionInfoTest.class | Bin 0 -> 5276 bytes .../erik/semver/VersionProcessorTest.class | Bin 0 -> 2718 bytes .../net/thauvin/erik/semver/VersionTest.class | Bin 0 -> 2517 bytes bld | 2 + bld.bat | 4 + build.gradle | 221 -------- config/pmd.xml | 1 - docs/README.html | 517 +++++++++++------- gradle.properties | 0 gradlew | 248 --------- gradlew.bat | 92 ---- lib/bld/bld-wrapper.jar | Bin 0 -> 27266 bytes lib/bld/bld-wrapper.properties | 9 + pandoc.sh | 9 + pom.xml | 38 ++ preflightcheck.sh | 201 ------- settings.gradle | 19 - sonar-project.properties | 7 + .../net/thauvin/erik/semver/SemverBuild.java | 147 +++++ .../net/thauvin/erik/semver/Constants.java | 3 +- .../java/net/thauvin/erik/semver/Version.java | 2 +- .../net/thauvin/erik/semver/VersionInfo.java | 204 +++---- .../thauvin/erik/semver/VersionProcessor.java | 28 +- .../java/net/thauvin/erik/semver/package.html | 32 -- .../javax.annotation.processing.Processor | 32 ++ src/main/resources/semver-kt.mustache | 60 +- src/main/resources/semver.mustache | 50 +- .../thauvin/erik/semver/ConstantsTest.java | 4 +- .../thauvin/erik/semver/VersionInfoTest.java | 4 +- .../erik/semver/VersionProcessorTest.java | 4 +- .../net/thauvin/erik/semver/VersionTest.java | 2 +- updatewrappers.sh | 60 -- 75 files changed, 1183 insertions(+), 1793 deletions(-) create mode 100644 .github/workflows/bld.yml delete mode 100644 .github/workflows/gradle.yml create mode 100644 .idea/app.iml create mode 100644 .idea/bld.iml delete mode 100644 .idea/checkstyle-idea.xml delete mode 100644 .idea/checkstyleidea-libs/readme.txt delete mode 100644 .idea/codeStyles/codeStyleConfig.xml delete mode 100644 .idea/compiler.xml create mode 100644 .idea/copyright/BSD_3_Clause.xml delete mode 100644 .idea/copyright/Erik_s_Copyright_Notice.xml delete mode 100644 .idea/copyright/profiles_settings.xml delete mode 100644 .idea/encodings.xml create mode 100644 .idea/inspectionProfiles/Project_Default.xml delete mode 100644 .idea/inspectionProfiles/profiles_settings.xml delete mode 100644 .idea/jarRepositories.xml delete mode 100644 .idea/kotlinc.xml delete mode 100644 .idea/libraries-with-intellij-classes.xml create mode 100644 .idea/libraries/bld.xml create mode 100644 .idea/libraries/compile.xml create mode 100644 .idea/libraries/runtime.xml create mode 100644 .idea/libraries/test.xml create mode 100644 .idea/modules.xml delete mode 100644 .idea/modules/examples-kotlin_main.iml delete mode 100644 .idea/modules/examples-kotlin_test.iml create mode 100644 .idea/runConfigurations/Run Tests.xml delete mode 100644 .idea/scopes/Copyright.xml create mode 100644 .vscode/launch.json create mode 100644 .vscode/settings.json create mode 100644 bin/main/META-INF/services/javax.annotation.processing.Processor create mode 100644 bin/main/net/thauvin/erik/semver/Constants.class create mode 100644 bin/main/net/thauvin/erik/semver/Version.class create mode 100644 bin/main/net/thauvin/erik/semver/VersionInfo.class create mode 100644 bin/main/net/thauvin/erik/semver/VersionProcessor.class create mode 100644 bin/main/net/thauvin/erik/semver/package.html create mode 100644 bin/main/semver-kt.mustache create mode 100644 bin/main/semver.mustache create mode 100644 bin/test/net/thauvin/erik/semver/ConstantsTest.class create mode 100644 bin/test/net/thauvin/erik/semver/VersionInfoTest.class create mode 100644 bin/test/net/thauvin/erik/semver/VersionProcessorTest.class create mode 100644 bin/test/net/thauvin/erik/semver/VersionTest.class create mode 100755 bld create mode 100644 bld.bat delete mode 100644 build.gradle delete mode 100644 gradle.properties delete mode 100755 gradlew delete mode 100644 gradlew.bat create mode 100644 lib/bld/bld-wrapper.jar create mode 100644 lib/bld/bld-wrapper.properties create mode 100755 pandoc.sh create mode 100644 pom.xml delete mode 100755 preflightcheck.sh delete mode 100644 settings.gradle create mode 100644 sonar-project.properties create mode 100644 src/bld/java/net/thauvin/erik/semver/SemverBuild.java delete mode 100755 updatewrappers.sh diff --git a/.circleci/config.yml b/.circleci/config.yml index 64d62be..65723f0 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -1,54 +1,41 @@ -version: 2 +inversion: 2 defaults: &defaults working_directory: ~/repo environment: JVM_OPTS: -Xmx3200m TERM: dumb - CI: true + CI_NAME: "CircleCI" -defaults_gradle: &defaults_gradle +defaults_gradle: &defaults_bld 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" }} + name: Download the dependencies + command: ./bld download - run: - name: Run All Checks - command: ./gradlew check - - store_artifacts: - path: build/reports/ - destination: reports - - store_test_results: - path: build/reports/ + name: Run tests with bld + command: ./bld compile test jobs: - build_gradle_jdk17: + bld_jdk20: + <<: *defaults + + docker: + - image: cimg/openjdk:20.0 + + <<: *defaults_bld + + bld_jdk17: <<: *defaults docker: - image: cimg/openjdk:17.0 - <<: *defaults_gradle - - build_gradle_jdk11: - <<: *defaults - - docker: - - image: cimg/openjdk:11.0 - - <<: *defaults_gradle + <<: *defaults_bld workflows: version: 2 - gradle: + bld: jobs: - - build_gradle_jdk20 - - build_gradle_jdk17 + - bld_jdk17 + - bld_jdk20 diff --git a/.github/workflows/bld.yml b/.github/workflows/bld.yml new file mode 100644 index 0000000..79093d1 --- /dev/null +++ b/.github/workflows/bld.yml @@ -0,0 +1,53 @@ +name: bld-ci + +on: [ push, pull_request, workflow_dispatch ] + +jobs: + build-bld-project: + runs-on: ubuntu-latest + + env: + COVERAGE_SDK: "17" + + strategy: + matrix: + java-version: [ 17, 20 ] + + steps: + - name: Checkout source repository + uses: actions/checkout@v3 + with: + fetch-depth: 0 + + - name: Set up JDK ${{ matrix.java-version }} + uses: actions/setup-java@v3 + with: + distribution: 'zulu' + java-version: ${{ matrix.java-version }} + + - name: Grant execute permission for bld + run: chmod +x bld + + - name: Download the dependencies + run: ./bld download + + - name: Run tests with bld + run: ./bld compile jacoco + + - name: Remove pom.xml + if: success() && matrix.java-version == env.COVERAGE_SDK + run: rm -rf pom.xml + + - name: SonarCloud Scan + uses: sonarsource/sonarcloud-github-action@master + if: success() && matrix.java-version == env.COVERAGE_SDK + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }} + + - name: Upload coverage reports to Codecov + uses: codecov/codecov-action@v3 + if: success() && matrix.java-version == env.COVERAGE_SDK + env: + CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }} + diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml deleted file mode 100644 index 13384a8..0000000 --- a/.github/workflows/gradle.yml +++ /dev/null @@ -1,49 +0,0 @@ -name: gradle-ci - -on: [ push, pull_request, workflow_dispatch ] - -jobs: - build: - runs-on: ubuntu-latest - - env: - GRADLE_OPTS: "-Dorg.gradle.jvmargs=-XX:MaxMetaspaceSize=512m" - SONAR_JDK: "17" - - strategy: - matrix: - java-version: [ 17, 20 ] - - steps: - - uses: actions/checkout@v3 - with: - fetch-depth: 0 - - - name: Set up JDK ${{ matrix.java-version }} - uses: actions/setup-java@v3 - with: - distribution: 'zulu' - java-version: ${{ matrix.java-version }} - - - name: Grant execute permission for gradlew - run: chmod +x gradlew - - - name: Cache SonarCloud packages - if: matrix.java-version == env.SONAR_JDK - uses: actions/cache@v3 - with: - path: ~/.sonar/cache - key: ${{ runner.os }}-sonar - restore-keys: ${{ runner.os }}-sonar - - - name: Test with Gradle - uses: gradle/gradle-build-action@v2 - 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 sonar --info diff --git a/.gitignore b/.gitignore index 097f727..091e664 100644 --- a/.gitignore +++ b/.gitignore @@ -1,84 +1,57 @@ - -!.vscode/extensions.json -!.vscode/launch.json -!.vscode/settings.json -!.vscode/tasks.json -*.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/* -/**/.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__ +.DS_Store +build +lib/bld/** +!lib/bld/bld-wrapper.properties +!lib/bld/bld-wrapper.jar +lib/compile/ +lib/runtime/ +lib/standalone/ +lib/test/ + +# IDEA ignores + +# User-specific +.idea/**/workspace.xml +.idea/**/tasks.xml +.idea/**/usage.statistics.xml +.idea/**/dictionaries +.idea/**/shelf + +# AWS User-specific +.idea/**/aws.xml + +# Generated files +.idea/**/contentModel.xml + +# Sensitive or high-churn files +.idea/**/dataSources/ +.idea/**/dataSources.ids +.idea/**/dataSources.local.xml +.idea/**/sqlDataSources.xml +.idea/**/dynamic.xml +.idea/**/uiDesigner.xml +.idea/**/dbnavigator.xml + +# Gradle +.idea/**/gradle.xml + +# Mongo Explorer plugin +.idea/**/mongoSettings.xml + +# mpeltonen/sbt-idea plugin +.idea_modules/ + +# JIRA plugin 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/ -hs_err_pid* -kobaltBuild -kobaltw*-test -lib/kotlin* -libs/ -local.properties -out/ -pom.xml.next -pom.xml.releaseBackup -pom.xml.tag -pom.xml.versionsBackup -proguard-project.txt -project.properties -release.properties -target/ -test-output -venv + +# Cursive Clojure plugin +.idea/replstate.xml + +# SonarLint plugin +.idea/sonarlint/ + +# Editor-based Rest Client +.idea/httpRequests + +local.properties \ No newline at end of file diff --git a/.idea/app.iml b/.idea/app.iml new file mode 100644 index 0000000..787b59b --- /dev/null +++ b/.idea/app.iml @@ -0,0 +1,29 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/bld.iml b/.idea/bld.iml new file mode 100644 index 0000000..e63e11e --- /dev/null +++ b/.idea/bld.iml @@ -0,0 +1,14 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/checkstyle-idea.xml b/.idea/checkstyle-idea.xml deleted file mode 100644 index 17101f8..0000000 --- a/.idea/checkstyle-idea.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/.idea/checkstyleidea-libs/readme.txt b/.idea/checkstyleidea-libs/readme.txt deleted file mode 100644 index 71cc7ff..0000000 --- a/.idea/checkstyleidea-libs/readme.txt +++ /dev/null @@ -1,6 +0,0 @@ -This folder contains libraries copied from the "semver" project. -It is managed by the CheckStyle-IDEA IDE plugin. -Do not modify this folder while the IDE is running. -When the IDE is stopped, you may delete this folder at any time. It will be recreated as needed. -In order to prevent the CheckStyle-IDEA IDE plugin from creating this folder, -uncheck the "Copy libraries from project directory" option in the CheckStyle-IDEA settings dialog. diff --git a/.idea/codeStyles/codeStyleConfig.xml b/.idea/codeStyles/codeStyleConfig.xml deleted file mode 100644 index d91f848..0000000 --- a/.idea/codeStyles/codeStyleConfig.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - \ No newline at end of file diff --git a/.idea/compiler.xml b/.idea/compiler.xml deleted file mode 100644 index a857b2a..0000000 --- a/.idea/compiler.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/.idea/copyright/BSD_3_Clause.xml b/.idea/copyright/BSD_3_Clause.xml new file mode 100644 index 0000000..956f692 --- /dev/null +++ b/.idea/copyright/BSD_3_Clause.xml @@ -0,0 +1,6 @@ + + + + \ No newline at end of file diff --git a/.idea/copyright/Erik_s_Copyright_Notice.xml b/.idea/copyright/Erik_s_Copyright_Notice.xml deleted file mode 100644 index ef51a2d..0000000 --- a/.idea/copyright/Erik_s_Copyright_Notice.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - \ No newline at end of file diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml deleted file mode 100644 index 1419e40..0000000 --- a/.idea/copyright/profiles_settings.xml +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/.idea/encodings.xml b/.idea/encodings.xml deleted file mode 100644 index 97626ba..0000000 --- a/.idea/encodings.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml new file mode 100644 index 0000000..7e0a3c7 --- /dev/null +++ b/.idea/inspectionProfiles/Project_Default.xml @@ -0,0 +1,8 @@ + + + + \ No newline at end of file diff --git a/.idea/inspectionProfiles/profiles_settings.xml b/.idea/inspectionProfiles/profiles_settings.xml deleted file mode 100644 index dd4c951..0000000 --- a/.idea/inspectionProfiles/profiles_settings.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - \ No newline at end of file diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml deleted file mode 100644 index b23fa44..0000000 --- a/.idea/jarRepositories.xml +++ /dev/null @@ -1,45 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/kotlinc.xml b/.idea/kotlinc.xml deleted file mode 100644 index 5806fb3..0000000 --- a/.idea/kotlinc.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - \ No newline at end of file diff --git a/.idea/libraries-with-intellij-classes.xml b/.idea/libraries-with-intellij-classes.xml deleted file mode 100644 index 9fa3156..0000000 --- a/.idea/libraries-with-intellij-classes.xml +++ /dev/null @@ -1,65 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/.idea/libraries/bld.xml b/.idea/libraries/bld.xml new file mode 100644 index 0000000..abca604 --- /dev/null +++ b/.idea/libraries/bld.xml @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/compile.xml b/.idea/libraries/compile.xml new file mode 100644 index 0000000..9bd86aa --- /dev/null +++ b/.idea/libraries/compile.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/runtime.xml b/.idea/libraries/runtime.xml new file mode 100644 index 0000000..2ae5c4b --- /dev/null +++ b/.idea/libraries/runtime.xml @@ -0,0 +1,14 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/test.xml b/.idea/libraries/test.xml new file mode 100644 index 0000000..b80486a --- /dev/null +++ b/.idea/libraries/test.xml @@ -0,0 +1,14 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml index 90755e7..ea78ec7 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,118 +1,13 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - + + \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml new file mode 100644 index 0000000..55adcb9 --- /dev/null +++ b/.idea/modules.xml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/.idea/modules/examples-kotlin_main.iml b/.idea/modules/examples-kotlin_main.iml deleted file mode 100644 index 4aeac9a..0000000 --- a/.idea/modules/examples-kotlin_main.iml +++ /dev/null @@ -1,41 +0,0 @@ - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/modules/examples-kotlin_test.iml b/.idea/modules/examples-kotlin_test.iml deleted file mode 100644 index 4b23562..0000000 --- a/.idea/modules/examples-kotlin_test.iml +++ /dev/null @@ -1,48 +0,0 @@ - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/runConfigurations/Run Tests.xml b/.idea/runConfigurations/Run Tests.xml new file mode 100644 index 0000000..4f6af10 --- /dev/null +++ b/.idea/runConfigurations/Run Tests.xml @@ -0,0 +1,9 @@ + + + + \ No newline at end of file diff --git a/.idea/scopes/Copyright.xml b/.idea/scopes/Copyright.xml deleted file mode 100644 index 7fb840b..0000000 --- a/.idea/scopes/Copyright.xml +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml index 94a25f7..35eb1dd 100644 --- a/.idea/vcs.xml +++ b/.idea/vcs.xml @@ -1,6 +1,6 @@ - + \ No newline at end of file diff --git a/.vscode/launch.json b/.vscode/launch.json new file mode 100644 index 0000000..7a56afd --- /dev/null +++ b/.vscode/launch.json @@ -0,0 +1,11 @@ +{ + "version": "0.2.0", + "configurations": [ + { + "type": "java", + "name": "Run Tests", + "request": "launch", + "mainClass": "net.thauvin.erik.semver.SemverTest" + } + ] +} diff --git a/.vscode/settings.json b/.vscode/settings.json new file mode 100644 index 0000000..c83239c --- /dev/null +++ b/.vscode/settings.json @@ -0,0 +1,15 @@ +{ + "java.project.sourcePaths": [ + "src/main/java", + "src/main/resources", + "src/test/java", + "src/bld/java" + ], + "java.configuration.updateBuildConfiguration": "automatic", + "java.project.referencedLibraries": [ + "${HOME}/.bld/dist/bld-1.7.1.jar", + "lib/compile/*.jar", + "lib/runtime/*.jar", + "lib/test/*.jar" + ] +} diff --git a/README.md b/README.md index 84e3efc..d993dd6 100644 --- a/README.md +++ b/README.md @@ -1,8 +1,16 @@ # Semantic Version Annotation Processor -[![License (3-Clause BSD)](https://img.shields.io/badge/license-BSD%203--Clause-blue.svg?style=flat-square)](https://opensource.org/licenses/BSD-3-Clause) [![release](https://img.shields.io/github/release/ethauvin/semver.svg)](https://github.com/ethauvin/semver/releases/latest) [![Maven Central](https://maven-badges.herokuapp.com/maven-central/net.thauvin.erik/semver/badge.svg)](https://maven-badges.herokuapp.com/maven-central/net.thauvin.erik/semver) +[![License (3-Clause BSD)](https://img.shields.io/badge/license-BSD%203--Clause-blue.svg?style=flat-square)](https://opensource.org/licenses/BSD-3-Clause) +[![Java](https://img.shields.io/badge/java-17%2B-blue)](https://www.oracle.com/java/technologies/javase/jdk17-archive-downloads.html) +[![bld](https://img.shields.io/badge/1.7.1-FA9052?label=bld&labelColor=2392FF)](https://rife2.com/bld) +[![release](https://img.shields.io/github/release/ethauvin/semver.svg)](https://github.com/ethauvin/semver/releases/latest) +[![Maven Central](https://maven-badges.herokuapp.com/maven-central/net.thauvin.erik/semver/badge.svg)](https://maven-badges.herokuapp.com/maven-central/net.thauvin.erik/semver) +![Sonatype Nexus (Snapshots)](https://img.shields.io/nexus/s/net.thauvin.erik.httpstatus/httpstatus?server=https%3A%2F%2Foss.sonatype.org) -[![Quality Gate Status](https://sonarcloud.io/api/project_badges/measure?project=ethauvin_semver&metric=alert_status)](https://sonarcloud.io/dashboard?id=ethauvin_semver) [![GitHub CI](https://github.com/ethauvin/semver/actions/workflows/gradle.yml/badge.svg)](https://github.com/ethauvin/semver/actions/workflows/gradle.yml) [![Build status](https://ci.appveyor.com/api/projects/status/nbv4mxd1gpxtx69o?svg=true)](https://ci.appveyor.com/project/ethauvin/semver) [![CircleCI](https://circleci.com/gh/ethauvin/semver/tree/master.svg?style=shield)](https://circleci.com/gh/ethauvin/semver/tree/master) +[![Quality Gate Status](https://sonarcloud.io/api/project_badges/measure?project=ethauvin_semver&metric=alert_status)](https://sonarcloud.io/dashboard?id=ethauvin_semver) +[![GitHub CI](https://github.com/ethauvin/semver/actions/workflows/gradle.yml/badge.svg)](https://github.com/ethauvin/semver/actions/workflows/gradle.yml) +[![Build status](https://ci.appveyor.com/api/projects/status/nbv4mxd1gpxtx69o?svg=true)](https://ci.appveyor.com/project/ethauvin/semver) +[![CircleCI](https://circleci.com/gh/ethauvin/semver/tree/master.svg?style=shield)](https://circleci.com/gh/ethauvin/semver/tree/master) An [annotation processor](https://docs.oracle.com/javase/8/docs/api/javax/annotation/processing/Processor.html) that automatically generates a `GeneratedVersion` class based on a [Mustache](https://mustache.github.io/) template and containing the [semantic version](https://semver.org/) (major, minor, patch, etc.) that is read from a [Properties](https://docs.oracle.com/javase/tutorial/essential/environment/properties.html) file or defined in the [annotation](https://docs.oracle.com/javase/tutorial/java/annotations/basics.html). diff --git a/appveyor.yml b/appveyor.yml index 0d75649..3eebf3d 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -8,23 +8,20 @@ build: verbosity: detailed build_script: - - gradlew.bat assemble --info --no-daemon + - bld.bat download compile test_script: - - gradlew.bat check --info --no-daemon + - bld.bat test branches: only: - master - 1.2.1-dev -cache: - - C:\Users\appveyor\.gradle - environment: matrix: - JAVA_HOME: C:\Program Files\Java\jdk17 - - JAVA_HOME: C:\Program Files\Java\jdk19 + - JAVA_HOME: C:\Program Files\Java\jdk20 matrix: fast_finish: true diff --git a/bin/main/META-INF/services/javax.annotation.processing.Processor b/bin/main/META-INF/services/javax.annotation.processing.Processor new file mode 100644 index 0000000..5ae1016 --- /dev/null +++ b/bin/main/META-INF/services/javax.annotation.processing.Processor @@ -0,0 +1,33 @@ +# +# javax.annotation.processing.Processor +# +# Copyright (c) 2016-2023, Erik C. Thauvin (erik@thauvin.net) +# All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions are met: +# +# Redistributions of source code must retain the above copyright notice, this +# list of conditions and the following disclaimer. +# +# Redistributions in binary form must reproduce the above copyright notice, +# this list of conditions and the following disclaimer in the documentation +# and/or other materials provided with the distribution. +# +# Neither the name of this project nor the names of its contributors may be +# used to endorse or promote products derived from this software without +# specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" +# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +# DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE +# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR +# SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER +# CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, +# OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# + +net.thauvin.erik.semver.VersionProcessor diff --git a/bin/main/net/thauvin/erik/semver/Constants.class b/bin/main/net/thauvin/erik/semver/Constants.class new file mode 100644 index 0000000000000000000000000000000000000000..b2993072af612ad38c72cef451680df8ee1988f8 GIT binary patch literal 1771 zcmai!`*Pbv6vodwNv*iKv!NV&$Cl>Q zzG1YH8$m{k8(gz_k=YiU-It28c}uf2$FvlB2TRDd5GU7VBIRvJnb$N`XAa^y9fj_) zER(GRt>w4}<1+VnlfyNyyJpML&E~`pqObM5C{=rdH1I?9BtIT}hlp;QTXtq$bb~@4 zFq%Ia`oVEuq|p4vE6s`$KSH8~wHn3ZSN|C*mN$)LRp?VjbA9h@5Wl#biL1~T*|HzL zv^eUOD;HvCXDhy5cF zJKj+MomY$jcDKFQ&v^22Ha+zdMz@Ury{d4_RP4bp?uuPMbGMXVIfK&<%-ig5P|B-;(xkV*PE2 zZ-L*H_&xBp#CO2=Bz_;PN?Zj$koZIJ#}a=6{!HS}!Cy-J5d28u$KbCe*1$E1>)>69 z_rSWu`(Q)j29zpg9f<#LaUwf7C0tCjboV(~f0EN#X+Ni@e~-@U2RtjVCi;zL>38}O TZwq5<`iXu9F>>)N(J%i2PDOQJ literal 0 HcmV?d00001 diff --git a/bin/main/net/thauvin/erik/semver/Version.class b/bin/main/net/thauvin/erik/semver/Version.class new file mode 100644 index 0000000000000000000000000000000000000000..239b8a216bbbdd2ff65989948fd56e55d92ae657 GIT binary patch literal 1302 zcmaizYflqF6o${xmKG>dZVDoTsFjLzyhNI??gr(rp?)9x*^vyJ_0e((qQ zqm1t^y-Wy+ADW$c&il@}%=FLSU%!dyExj(%n4q8ikCtvXK3ewVd#%sN(K zP^7$|N?UfNtR>O*Rm2Tpr)`*hlsw^aoM?==;HL74xASeg$0l z68<4YDq%N)T`s0cfGHc40j6zm1z^So6@XbA%mK{XU;$u}t`4&7(KUc2Td@eRY%8t< ztk{ZWfEzYQD_y;4xoIm_p;)s)YFW3zEr1Oh+y=N~gS!A#8>DC4vq2SL(*~)cW`p|x uTQ;ZxJg~twK-~rojnPBg$QV7M$M~*b^#t>K%Jht$(~ETZg9Ot{di4*(IUSz> literal 0 HcmV?d00001 diff --git a/bin/main/net/thauvin/erik/semver/VersionInfo.class b/bin/main/net/thauvin/erik/semver/VersionInfo.class new file mode 100644 index 0000000000000000000000000000000000000000..8351bcffd22f36dddae0af8ec78fffc5b46a908f GIT binary patch literal 4393 zcma)9TXP)675+xImDgiz)&|EIYy(8JQ}b?RdQ63mh1}@s+EQ3|y_rD^n^zW`sjG|b z(^M%}oFF*uR28YJ&LzK2s-j@m6TGqJl;@lo6|bl{p=_3|)z!GFC?}xWmet8JYo=EB zBl9){s^-+4P`KLebv-vcY@xZcYtll?h(E2eXvSA;Y{N}i+=5#(*ty2b(qa&*s*T&Q z%fgN2`FdS>;e=aNV{WD52Ab;B23WY=Ml0IdvDX4*zTZX$?d`aO?sSWw)25t)Jo)ce zo}x`^I*zZrztct*?Sgu3Y=SN5E*m#Qvaj0M9Lc_BV~g;BH`EgbBc+=%;8%;2Pj-Pd82(D5{F>+EVgL&7pDp*$t%v;<9~GveS`osXitDM=8| z3VKL_sMnm6AZpno5=1S#Akow4F^Qf=Pe|BkK!#U9j=zOH*Y(eWJ)^>7iSwVFE}u(T zGqQT%+c`ZRT_1sC(ec+XI{i0LdM0@RQHB6S{o&X+~;WYVh&AsPWE`-!V{gvM#V2DYSc4qXkk++ zWcbINT6{6=U`>*5GPok8C6`>boC?uRCZE$d<1L*<(P|e-oOr^uiPr*M{5AV#)+4$SF*~Cm;Cv9S)FjD0BlJV`Ch5n6dm*ZFbL~TjkSE%pANEk4L{G|XT0jG zRo(R#{5e&K&O?;x6Hb|xRv&?1Sa>}dop^Obc+&BvD=OGO>icu^wZX<@BqVDTCl+hU zu>3+|ebkr+lj)2pMx08erKC2yX@EBY1KiEZ&wOOZ01sVL7MX5%kD@phtEC zJ+cYtku5-vto$5zawj%7K5ypiPu!Ia3J>J}g6;XgV#gA8=W~0OurHrGu!N3$u4@V1 z`Q|0`XmLT{K@I!zxvwvwU*my%Zg2@h`IaRN|5p@EupLL) zJC9*6M$n1-(1YXX!wC$qFc0G-XGNUi|6|m&Bh$F@KF-AKKF8=paDUT3mQs$c{cWP zoS`jYHzv@9hv?ZPzp2jAw}){SkKh8%L-Fb3Q7qyy?d8ppC$X3G3EzN2KP^l#4pEv4 zdJeSa-^af9=y(&u2%Zzkok|3&btPD3qjE=D*)u9n8jgp0x67M&((f&xN$lZyJ?d5Pv=Kc#vb?71ZCrR-%5HUB%PDAJLlI!`Z%-cO5djif_g5uHsohENRxaY_G1H zpYVczO7t1a(m(mJ_%D{Df8#Fv2c!5TVdZ#y120qmJX)@y7gmNgw(=S1-!;y(sBJ~W zSJ$w^D2>-?MsnDs!)VOzeN*LNfO-B1@Z6(*Xb-1Ko z3fD_!uAa1Aw~|X*6u7UBY9e0JbA{_=vyX)|*8y_fu@0B?ZQ**wY}dgwS1-8=>u^c$ z7p_;$cJ-yX`pI=@9WMEP5U%f=x%$&wN62+_9WMC>5w0JYxdzf)MRG;WzcKdm9V1*n zG;<|da&#uf$yHj%F8LOcFRmXk%T4$(e!_7Z=f9-%SBdAZ@h0EMA4k8z@9;Ku{12CW B25tZV literal 0 HcmV?d00001 diff --git a/bin/main/net/thauvin/erik/semver/VersionProcessor.class b/bin/main/net/thauvin/erik/semver/VersionProcessor.class new file mode 100644 index 0000000000000000000000000000000000000000..38b56762ba015bd17d9e380a9de42f16f3291a53 GIT binary patch literal 13084 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 + + + Semantic Version Annotation Processor + + +An annotation processor that automatically generates a GeneratedVersion class containing the semantic +version (major, minor, patch, etc.) that is read from a Properties file or defined in the annotation. + +@since 1.0 + + diff --git a/bin/main/semver-kt.mustache b/bin/main/semver-kt.mustache new file mode 100644 index 0000000..0a58f86 --- /dev/null +++ b/bin/main/semver-kt.mustache @@ -0,0 +1,38 @@ +/* +* This file is automatically generated. +* Do not modify! -- ALL CHANGES WILL BE ERASED! +*/ + +package {{packageName}} + +import java.util.Date + +/** +* Provides semantic version information. +* +* @author Semantic Version Annotation Processor +*/ +object {{className}} { +@JvmField +val PROJECT = "{{project}}" +@JvmField +val BUILDDATE = Date({{epoch}}L) +@JvmField +val MAJOR = {{major}} +@JvmField +val MINOR = {{minor}} +@JvmField +val PATCH = {{patch}} +@JvmField +val PRERELEASE = "{{preRelease}}" +@JvmField +val PRERELEASE_PREFIX = "{{preReleasePrefix}}" +@JvmField +val BUILDMETA = "{{buildMeta}}" +@JvmField +val BUILDMEATA_PREFIX = "{{buildMetaPrefix}}" +@JvmField +val SEPARATOR = "{{separator}}" +@JvmField +val VERSION = "{{version}}" +} diff --git a/bin/main/semver.mustache b/bin/main/semver.mustache new file mode 100644 index 0000000..cd7c567 --- /dev/null +++ b/bin/main/semver.mustache @@ -0,0 +1,34 @@ +/* +* This file is automatically generated. +* Do not modify! -- ALL CHANGES WILL BE ERASED! +*/ + +package {{packageName}}; + +import java.util.Date; + +/** +* Provides semantic version information. +* +* @author Semantic Version Annotation Processor +*/ +public final class {{className}} { +public static final String PROJECT = "{{project}}"; +public static final Date BUILDDATE = new Date({{epoch}}L); +public static final int MAJOR = {{major}}; +public static final int MINOR = {{minor}}; +public static final int PATCH = {{patch}}; +public static final String PRERELEASE = "{{preRelease}}"; +public static final String PRERELEASE_PREFIX = "{{preReleasePrefix}}"; +public static final String BUILDMETA = "{{buildMeta}}"; +public static final String BUILDMETA_PREFIX = "{{buildMetaPrefix}}"; +public static final String SEPARATOR = "{{separator}}"; +public static final String VERSION = "{{version}}"; + +/** +* Disables the default constructor. +*/ +private {{className}}() { +throw new UnsupportedOperationException("Illegal constructor call."); +} +} diff --git a/bin/test/net/thauvin/erik/semver/ConstantsTest.class b/bin/test/net/thauvin/erik/semver/ConstantsTest.class new file mode 100644 index 0000000000000000000000000000000000000000..c8c9fdee06825dd20f0e81d4e482e065ffcb7024 GIT binary patch literal 1583 zcma)6+fo}x5IrLVyND$Qaf_Xp_!=aGSmVUTSQr~~aWDcWpomzx)gVpKg0xb0XQ}vC z@&kF!OAJm`D$jY#PvkS=oLxyEOdecYHPdrDeY*Sf{`K$cKL9+$_Xc7DH(jM|U6H|| zjpSNnP8YXfnCfqi)>?W%P5?B~1ts-y*a<{j733j$rKbU`4# zR4=Opy3lK(8$ALSa*nGugW9h0@^ZJT1d_RWNmdKebHa6NGp;L+FEEjNCo)+9OOw>H z`auR&&4(Aa0#`dVRd9TVsEe*!*HSx-K;Uw&?(Ny(ee#y4Cw3TD)b zQpLo$fXJA*B9Lf!YD-m>^qH<CJKRR-5OmhS z(=$46mej-=^LIiifmN(q$YFz&lw0<999?-U+O`&oVR@fh_#9ub>P`9Ny?~7{nkt?z zZMqOfux%laF9nQ>^fx22Y_B3I=yu6SvLpO3@yuOJH^TlpCrJ7_+jK7*?Z&(D7Rvnj z*9%1M-)7YhHe{pKuZit?;FZ*>6Ls{NKgD$D9#=sP@Gk?7)IWMS8eG|&1?TQtuVDU4 zBZdUW@EEv*K8{xN0_T3NC@`MJaG`Z;fO81sN5H^LJf0jp!cbRN@?vxPfK&1^zmJY^ zHF<;I$DxtpcZk3H$PNj6sUy5}x2Xl{||Tu9oo(Pa~>VqJ*!vsG3+p0Xxj!EK$C~3sNi+C(Lg1 f>}y)zaAz2?H|+Dc0b#J$41!{aXW#NHhVT9ZXs&N& literal 0 HcmV?d00001 diff --git a/bin/test/net/thauvin/erik/semver/VersionInfoTest.class b/bin/test/net/thauvin/erik/semver/VersionInfoTest.class new file mode 100644 index 0000000000000000000000000000000000000000..8c5f8b425d3329db982cadd38abb544806ef3bfe GIT binary patch literal 5276 zcma)A33yyZ9sf$xUn*D;Ic>L>Afi=76ctfW3mR+m|+=tE41`@gd0&O1PH@s?QihbwsA>v#7e+!r20_aE`z@ZCfCFE@QH*S)oNP z#Zt|v2} zR&`pqm^05{j&foqE>T@}slXJcvvc=03YzA_5+8~51!aGEs7bAyHtoxm5+5^MVU>S8 z;LV)W$$M41G=g|A#t5@emqSoSG9%f1sX;{juz3I+$ixWB_qiYE76;S9*Phr zsKQ&ge_w7WWZWntFaz;xV<`B;{)~Wz2R@1T$n;f|KHYo6LSGqtHT$ z#|#yXaz7%gOl+0dW>OhzpB;=PH2*~OtzWXgP%eX(MFO5On(6EJX8F%&CDJ!DpZwn-1YQH1#T{8!kW_Vhe zg8H7s_l<`U!NQ9{eMg8B)Af?XkMQH5b(iIHeH=h+-4hddg%Qx_>#(2Bv>fO9EZLV) zr#@bl_?ePP(Ee3C)vI|$;=jt*E&PI8^{Pp(1R9$gv$+cz7dEyQRpBsIbm|uJu89V@A=-Nt`N0&U70QMrn)b^B{0j` z(^aM;*;9u<;V%jNS>V7u+^r=3s-{r&kUHHh{5>cqJq8_(C6%s!O8hHe3+CCsLpD9n zhSaBKdspH=nk^q3+wTQz!9dfPV&gaxY<7k+AGM7oDuV_nH;hxJYN=`|YLwK(GEQc7 zE((j+QC*GZtPcn=4FRC_)JjpO^o-M))@QaD&xuY2(Qt4gnii>-VxkhMk6^R2%`CCHY>Jg2UM7Wi}%sqAhYpXjqTa8hbC zu#%SKa(>Y-xOrB=KyFR3R?HJ^3DL?fD__pj*^%6!*Am>(gYYkR`*?R*ukz9^a9jLZ z8FB{-PjItqGG1|3S1va=obT8@_%URZ;Hvd`Zw&UcWBkFZtRw!62vsa~GnwwR?{(DI zh!#s6!BQ6~{%;md>^s?+&3XkLVy~DG3)nil`8t;M3DF@ioKF+|)OE|&6C)q0ud`bzY8hDl6W8gDG*j^pe_5u5Y zhJIcNy++Kl`wdKO8n!8)HuQ|04e9hX0P}W{P&t-sF^#dA&zLS?v^sc&U4*$f21j8r zGqDsau?%P7c=V$ad7Okxu>x1&6l}n$xQ7ptjW`{faR#0u*Yh|VFX0@#hI8>IT)cx` z4t*EzqpzGJrpe@Jc&r>%OxN`Qky8fSbXU8>kca6Rsj@HHiVrDjIXjnC+aC=KY2E2CjT}V`IL{+8z^R4)$Dv3(nUKe2o zfA_Ot(p(R6HH6v7p&jS5K#Dj4!%Y4KO!9gR;9`v65?sdr*YRz0Coab$xDs1fBs+06 zUc|L{m6SJdJ>JHR95OeFdTbB};8rmkw~NDYr&xr$#YwnVWN}}tOmbnF{Fb)xZ&dG! zfn)jZ#P7zc8F9a2VShL5!0YtzjV?VmnzrB%92`L?Mw+(ak9+|9Ev$$VE+g^}B5y~? z6-3@4^4|!#mdN`&sYFE-#YdX9i7EvpBIpJ};}j$#=mA0#6tqtS-9c!Qf+k1M)WE2~ zkYMv*!$9G7F_qmS_Am2?6*ozku~ouO@-`~92S;o#5IRIb4xw_d_k!whKO^`6r{qQ^ z^+6nohxn(8huO7{VjW*CL;TL;38rxqZeVBM#P3^}&IkF#cnsU|EOzjYzMYBP!Ta?# zyn-k3mU=<(l`sj<=mbsm_&P0U@Tn9Kbuc-o}+&3VuC3vsxZ&s8md9Vw0y H3o-3~xTS0A literal 0 HcmV?d00001 diff --git a/bin/test/net/thauvin/erik/semver/VersionProcessorTest.class b/bin/test/net/thauvin/erik/semver/VersionProcessorTest.class new file mode 100644 index 0000000000000000000000000000000000000000..5166fb7ce0118d1cc550c6ad4c7f9900aa28fa20 GIT binary patch literal 2718 zcma)8YgZFj6y29ZW{88zsQ9WCYi$#PM37bmMNvV6;i1sjU~M~uOBe|=I5VMY-|y!y zX!|GHRnb*fyV|e)6a7~IMOXJt1~WXmaIseA-gC}9XPasw~+~Mtb&q#+M6A(#zzf=i9C`?zu(j`>r=B{Xj!pV8?B1$;y;1r<56+zAcM^ zK-1!il|Xy$Sv~d%XpE$y2prz*7_A%6*p40a3&fJCyg>Y-J0lZ_q1iwa5*oG(B%d{S z0^88s1Od~)7Bp(uC2(Yu!-|3gcGk}AF`z*g*q*Z;Ia*nmmfoZ_U6%BibBk6vZ+W)b zhr)O;XZr%3o29vmZ|1x$V9+7knaNw_ilm3c;N7BJ3`m-<;gGnSt3m3XVUUYGKd^FBG6VpkS&*G$tn*NRUbUH64-aW;so}B z%-g=rJO>=d4XXYK@?g&ON*M*6U1HTW8AV~As@cm1l1K^Y41KX|`8>2Unab6}R)u{! z(oA{wY5p3Hk@7WG8ZzWzlj0@Nfi45xI3du&pqFH^Y8?`A|) z!xKfg!eq?@vw8(5HM}aYw~lYMje%1*Ezs=Cphl-6j*Xn0O6Aq@J_BcPmW^(+IP=t; zj)JO9+bU3@D2gf+X*joeLuZ{?H-UZ(7`T9oB$~X0b1$%KRXIXNbPQ5+{MhkhCwrIN znRzRnUa-7?bE)Gpi%@rv+`uT6Ko(au46_801{v^u=>-OI7!feo3)~IfsaRz;#VQ6u z5Rt0ZOj%sMLiBGbO7;U+cJ2C4*hITOll=_fFSW*u(| zh%U8$+kk~>24^>|oEA70?U?^(Cz4IrFgj-Fxm(99@7M0mE**2+pU`oe4SHXCu8uMV zJvw+>$J%<@bS&~QSX_tSTlGZLAT%Msl7AFt`DF#Sl_^^%asR9?rY z0=w6_CtWEWpA*$Om12&%FE=_y64_#cG`7~lucis=C=* zbrI)pH{v*f?dZXNuJ=)5&>3BDe}G?s=jc9$gIw$UK94rMfET%Ir0yucD)0~7DS+Ab zU(m9Qm(2F~Z|Eq*%+85r9M7fW%jiif9mTOijH^~EdjCNGNXIhHo0rU?N4Ub}sCmtt z;Ia;Le>LCJXhkmp^%3M*{`KPu&Q;;I)dGibTbayj$P-#O_TUCyCuahM%~KGCFoh?N zF-5N4$feC&=B;JCbt7#SO<7x%OuM$2Hy6}mC0)0%mhRL-n#7I+~zMxT^;9mZ( z1YBZu2hoBd5_uU%NN)#*DY?o!eHbGgt?L-&ERW$wUb=s>)&8MG^-HY)Pr?G|_#0p0 TYmz>K@2jOy1^9+`4fysyUe(o; literal 0 HcmV?d00001 diff --git a/bin/test/net/thauvin/erik/semver/VersionTest.class b/bin/test/net/thauvin/erik/semver/VersionTest.class new file mode 100644 index 0000000000000000000000000000000000000000..0047ff2e10bbbcca280af20cac1aa963856e6a30 GIT binary patch literal 2517 zcmai!OH&g;5XXB0fdwLO-w#kkUXlexQQn9TknoTo<;BA!4q+j?8+Rv^DKB2Uc=6)J zix)2*Jm|?P4}JhYlx5E(Y~t8e95%bt-M@eLbkF4XpP#<~U>2S>LX1J5C!{U+c=6Ej zY!NsIb|~CK5!gE-2p!+s7NKl}dIs(L{E*vu?&a)_%)ZE?wShs;F*t*U8OL+v9D};S zp&bVGOa2Sd40X_wfJU$ww51$RtQXyk2)219FBo*D{4CG!@W4^)im_hqIU$4o)G-NF zz0(X@x##(kOSOYi0Y$q8hf>uYEaiC^Vpvn!$$4BB1B{sbKVoL2hN&vri;?*BoKndY zo&1Y6AvuHYe^k;kaJ<~K1*dWUV`GyH5>f1`C|Ph0JK}1vEpluIV%K?P!9@ma1lwUa zG}p_ZMRCc34#pa?YD??f6&Cbi*Vjs_6AYRUL@7K{yoL^~mShlj`Mw|Mv8*t#^h!$) zD4*jgpQYd0iiNZkc=mwjL^;VAjxOuF$z9)1idWn%sL{m>TxRzW)Nc)rV+~m3mdFbp zVsW=|#~Hoj6IHX0yjzY8%8_{Ds{W%5%wS7KahRq@^YaWk&{5%|&NLPRU!7MA?qSJm zrC!yT-p#U6r_^pOu~1$YL?9gzTJQ)7iQy>bSB%)|P!xE;r5{-E7z@H?CL)uTS;h`X zfi2+@cf5f!bW3=r)O||2#ZdC>9yY69;>omNi$Ux_O)BjdgRFSys7AKeT)(6`x6lhX zD}3U3dC%d4mj_o(_+{gp;X6M31De0%M+_49+n|l3a00&*q`=yAkbSTdPt&^1bW9r zUz6w*fliy~8xox*&^Z%*OQH(|x@e;BNOXxn@0;j*5`93R4^8v~i7pf9iiv(C(NzLX dndm1HT_ezS6a7r0n*{pAM8A+|TK^$z{{@|4QCt83 literal 0 HcmV?d00001 diff --git a/bld b/bld new file mode 100755 index 0000000..824b742 --- /dev/null +++ b/bld @@ -0,0 +1,2 @@ +#!/usr/bin/env sh +java -jar "$(dirname "$0")/lib/bld/bld-wrapper.jar" "$0" --build net.thauvin.erik.semver.SemverBuild "$@" \ No newline at end of file diff --git a/bld.bat b/bld.bat new file mode 100644 index 0000000..ab43bcd --- /dev/null +++ b/bld.bat @@ -0,0 +1,4 @@ +@echo off +set DIRNAME=%~dp0 +if "%DIRNAME%" == "" set DIRNAME=. +java -jar "%DIRNAME%/lib/bld/bld-wrapper.jar" "%0" --build net.thauvin.erik.semver.SemverBuild %* \ No newline at end of file diff --git a/build.gradle b/build.gradle deleted file mode 100644 index 478fc4b..0000000 --- a/build.gradle +++ /dev/null @@ -1,221 +0,0 @@ -// import com.github.spotbugs.snom.SpotBugsTask -import org.apache.tools.ant.taskdefs.condition.Os - -plugins { - id 'java' - id 'jacoco' - id 'maven-publish' - id 'pmd' - id 'signing' - id 'com.github.ben-manes.versions' version '0.47.0' - id 'net.thauvin.erik.gradle.semver' version '1.0.4' - // id 'com.github.spotbugs' version '5.0.14' - id 'org.sonarqube' version '4.2.1.3168' -} - -defaultTasks 'check' - -group = 'net.thauvin.erik' - -final def mavenName = 'SemVer' -final def mavenDescription = 'Semantic Version Annotation Processor' -final def mavenUrl = 'https://github.com/ethauvin/semver' -final def mavenLicense = 'The BSD 3-Clause License' -final def mavenLicenseUrl = 'http://opensource.org/licenses/BSD-3-Clause' -final def mavenScmCon = 'https://github.com/ethauvin/semver.git' -final def mavenScmDevCon = 'git@github.com:ethauvin/semver.git' - -def isNonStable = { String version -> - def stableKeyword = ['RELEASE', 'FINAL', 'GA'].any { it -> version.toUpperCase().contains(it) } - def regex = /^[0-9,.v-]+(-r)?$/ - return !stableKeyword && !(version ==~ regex) -} - -ext.versions = [ - pmd: '6.54.0', - // spotbugs: '4.7.3' -] - -repositories { - mavenLocal() - mavenCentral() - maven { url 'https://oss.sonatype.org/content/repositories/snapshots' } -} - -dependencies { - implementation 'com.github.spullara.mustache.java:compiler:0.9.10' - - // spotbugsPlugins 'com.h3xstream.findsecbugs:findsecbugs-plugin:1.12.0' - // spotbugsPlugins 'com.mebigfatguy.sb-contrib:sb-contrib:7.6.0' - - // compileOnly "com.github.spotbugs:spotbugs-annotations:$versions.spotbugs" - // testCompileOnly "com.github.spotbugs:spotbugs-annotations:$versions.spotbugs" - - testImplementation 'org.testng:testng:7.8.0' -} - - -tasks.withType(JavaCompile) { - options.encoding = 'UTF-8' -} - -java { - sourceCompatibility = JavaVersion.VERSION_17 - targetCompatibility = JavaVersion.VERSION_17 - withSourcesJar() - withJavadocJar() -} - -tasks.named("dependencyUpdates").configure { - rejectVersionIf { - isNonStable(it.candidate.version) - } -} - -pmd { - toolVersion = versions.pmd - ignoreFailures = true - ruleSets = [] - ruleSetFiles = files("${projectDir}/config/pmd.xml") - consoleOutput = true -} - -publishing { - publications { - mavenJava(MavenPublication) { - from components.java - groupId = project.group - artifactId = rootProject.name - - pom { - name = mavenName - description = mavenDescription - url = mavenUrl - licenses { - license { - name = mavenLicense - url = mavenLicenseUrl - } - } - developers { - developer { - id = 'ethauvin' - name = 'Erik C. Thauvin' - email = 'erik@thauvin.net' - url = 'https://erik.thauvin.net/' - } - } - scm { - connection = 'scm:git:' + mavenScmCon - developerConnection = 'scm:git:' + mavenScmDevCon - url = mavenUrl - } - } - } - } - repositories { - maven { - name = 'ossrh' - project.afterEvaluate { - url = project.version.contains('SNAPSHOT') - ? 'https://oss.sonatype.org/content/repositories/snapshots/' - : 'https://oss.sonatype.org/service/local/staging/deploy/maven2/' - } - credentials(PasswordCredentials) - } - } -} - -signing { - useGpgCmd() - sign publishing.publications.mavenJava -} - -javadoc { - doFirst { - title = "$mavenDescription $project.version API" - } - options.with { - source = '17' - tags = ['created'] - author = true - //addBooleanOption('html4', true) - links('https://docs.oracle.com/en/java/javase/17/docs/api/') - //addStringOption('Xdoclint:none', '-quiet') - } -} - -test { - testLogging { - exceptionFormat = 'full' - events('passed', 'skipped', 'failed') - } - - useTestNG() - - finalizedBy jacocoTestReport -} - -// spotbugs { -// toolVersion.set("${versions.spotbugs}") -// excludeFilter.set(file("$projectDir/config/spotbugs/excludeFilter.xml")) -// } - -// tasks.withType(SpotBugsTask).configureEach { -// reports { -// xml.required = false -// html.required = true -// } -// } - -tasks.register('release') { - group = 'Publishing' - description = 'Releases new version to local maven repository.' - dependsOn(wrapper, clean, publishToMavenLocal) - doFirst { - println "Version: $version" - } -} - -tasks.register('pandoc', Exec) { - group = 'Documentation' - def pandoc_args = ['--from', 'gfm', - '--to', 'html5', - '--metadata', "pagetitle=$mavenDescription", - '-s', - '-c', 'github-pandoc.css', - '-o', 'docs/README.html', - 'README.md'] - if (Os.isFamily(Os.FAMILY_WINDOWS)) { - commandLine(['cmd', '/c', 'pandoc'] + pandoc_args) - } else { - executable = 'pandoc' - args(pandoc_args) - } - standardOutput = new ByteArrayOutputStream() - ext.output = { - return standardOutput.toString() - } -} - -jacocoTestReport { - dependsOn test - reports { - xml.required = true - html.required = true - } -} - - -sonarqube { - properties { - property('sonar.organization', 'ethauvin-github') - property('sonar.projectKey', 'ethauvin_semver') - property('sonar.host.url', 'https://sonarcloud.io') - property('sonar.sourceEncoding', 'UTF-8') - } -} - -tasks.sonar { - dependsOn 'jacocoTestReport' -} diff --git a/config/pmd.xml b/config/pmd.xml index e23c3fa..add20da 100644 --- a/config/pmd.xml +++ b/config/pmd.xml @@ -25,7 +25,6 @@ - diff --git a/docs/README.html b/docs/README.html index 2eab8e6..8758e21 100644 --- a/docs/README.html +++ b/docs/README.html @@ -5,83 +5,135 @@ Semantic Version Annotation Processor - - - + + -

Semantic Version Annotation Processor

-

License (3-Clause BSD) release Maven Central
-Known Vulnerabilities Quality Gate Status Build Status Build status CircleCI

-

An annotation processor that automatically generates a GeneratedVersion class based on a Mustache template and containing the semantic version (major, minor, patch, etc.) that is read from a Properties file or defined in the annotation.

-

This processor was inspired by Cédric Beust's version-processor and works well in conjunction with the Semantic Version Plugin for Gradle.

+

Semantic Version +Annotation Processor

+

Java

+

+

An annotation +processor that automatically generates a +GeneratedVersion class based on a Mustache template and containing +the semantic version (major, minor, +patch, etc.) that is read from a Properties +file or defined in the annotation.

+

This processor was inspired by Cédric Beust's version-processor +and works well in conjunction with the Semantic +Version Plugin for Gradle.

Table of Contents

  • Examples
    • @@ -95,7 +147,8 @@ code span.wa { color: #60a0b0; font-weight: bold; font-style: italic; } /* Warni
  • Gradle
  • Kotlin
      @@ -107,34 +160,50 @@ code span.wa { color: #60a0b0; font-weight: bold; font-style: italic; } /* Warni
      • Using annotation elements:
      - +
      import net.thauvin.erik.semver.Version;
+
+@Version(major = 1, minor = 0, patch = 0, preRelease = "beta")
+public class A {
+// ...
      - - -

      View Examples

      +
      import net.thauvin.erik.semver.Version;
+
+@Version(properties = "version.properties")
+public class A {
+// ...
      +
      # version.properties
+version.major=1
+version.minor=0
+version.patch=0
+version.prerelease=beta
      +

      View +Examples

      Template

      -

      Upon running the annotation processor, a source file GeneratedVersion.java is automatically generated with static methods to access the semantic version data. The source is based on a fully customizable Mustache template.

      -

      To use your own template, simply create a version.mustache file in the project's root directory. The processor will automatically look for it.

      +

      Upon running the annotation processor, a source file GeneratedVersion.java +is automatically generated with static methods to access the semantic +version data. The source is based on a fully customizable Mustache template.

      +

      To use your own template, simply create a +version.mustache file in the project's root directory. The +processor will automatically look for it.

      To specify your own template name, use:

      - +
      @Version(template = "version.mustache")
+public class A {
+// ...

      Default Template

      -

      The default template implements the following static variables:

      +

      The default +template implements the following static variables:

      @@ -152,7 +221,8 @@ code span.wa { color: #60a0b0; font-weight: bold; font-style: italic; } /* Warni - + @@ -203,17 +273,19 @@ code span.wa { color: #60a0b0; font-weight: bold; font-style: italic; } /* Warni
      BUILDDATE The build date.java.util.Datejava.util.Date
      VERSION

      Custom Template

      A very simple custom template might look something like:

      - -

      The mustache variables automatically filled in by the processor are:

      +
      /* version.mustache */
+package {{packageName}};
+
+import java.util.Date;
+
+public final class {{className}} {
+    public final static String PROJECT = "{{project}}";
+    public final static Date DATE = new Date({{epoch}}L);
+    public final static String VERSION = "{{semver}}";
+}
      +

      The mustache variables automatically filled in by the processor +are:

      @@ -284,13 +356,17 @@ code span.wa { color: #60a0b0; font-weight: bold; font-style: italic; } /* Warni - +
      String
      {{semver}} or {{version}}{{semver}} or +{{version}} The full semantic version. String
      -

      Please also look at this example using java.time

      +

      Please also look at this example +using java.time

      Elements & Properties

      The following annotation elements and properties are available:

      @@ -335,7 +411,8 @@ code span.wa { color: #60a0b0; font-weight: bold; font-style: italic; } /* Warni - + @@ -384,7 +461,8 @@ code span.wa { color: #60a0b0; font-weight: bold; font-style: italic; } /* Warni - + @@ -395,89 +473,150 @@ code span.wa { color: #60a0b0; font-weight: bold; font-style: italic; } /* Warni
      preReleasePrefixversion.prerelease.prefixversion.prerelease.prefix The pre-release prefix. -
      type Either java or kt for Kotlin.Either java or +kt for Kotlin. java
      -

      In order to easily incorporate with existing projects, the property keys may be assigned custom values:

      - - +

      In order to easily incorporate with existing projects, the property +keys may be assigned custom values:

      +
      @Version(
+  properties = "example.properties",
+  keysPrefix = "example."
+  majorKey = "maj",
+  minorKey = "min",
+  patchKey = "build",
+  preReleaseKey = "rel",
+  buildMetaKey = "meta",
+  projectKey = "project"
+)
+public class Example {
+// ...
      +
      # example.properties
+example.project=Example
+example.maj=1
+example.min=0
+example.build=0
+example.rel=beta
+example.meta=
+# ...
      -

      ⚠️ keysPrefix is a new element staring in 1.1.0 and may break older versions when using custom property keys.
      -⚡ A quick fix is to include keysPrefix="" in the annotation to remove the default version. prefix.

      +

      ⚠️ +keysPrefix is a new element staring in 1.1.0 +and may break older versions when using custom property keys.
      +⚡ A quick fix is to include +keysPrefix="" in the annotation to remove the default +version. prefix.

      Maven

      -

      To install and run from Maven, configure an artifact as follows:

      - -

      Please look at pom.xml in the examples/java directory for a sample:

      - +

      To install and run from Maven, configure an artifact as +follows:

      +
      <dependency>
+    <groupId>net.thauvin.erik</groupId>
+    <artifactId>semver</artifactId>
+    <version>1.2.0</version>
+</dependency>
      +

      Please look at pom.xml +in the examples/java +directory for a sample:

      +
      mvn verify

      Gradle

      Class Generation

      -

      To install and run from Gradle, add the following to build.gradle:

      -
      dependencies {
-    annotationProcessor 'net.thauvin.erik:semver:1.2.0'
-    compileOnly 'net.thauvin.erik:semver:1.2.0'
-}
-
-tasks.withType(JavaCompile) {
-    options.compilerArgs += [ "-Asemver.project.dir=$projectDir" ]
-}
-
      -

      The directory containing the configuration files (version.properties, version.mustache) must be specified using the semver.project.dir processor argument.

      -

      The GeneratedVersion.java class will be automatically created in the build/generated directory upon compiling.

      -

      Please look at build.gradle in the examples/java directory for a sample.

      +

      To install and run from Gradle, add +the following to build.gradle:

      +
      repositories {
+    mavenCentral()
+}
+
+dependencies {
+    annotationProcessor 'net.thauvin.erik:semver:1.2.0'
+    compileOnly 'net.thauvin.erik:semver:1.2.0'
+}
+
+tasks.withType(JavaCompile) {
+    options.compilerArgs += [ "-Asemver.project.dir=$projectDir" ]
+}
      +

      The directory containing the configuration files +(version.properties, version.mustache) must be +specified using the semver.project.dir processor +argument.

      +

      The GeneratedVersion.java +class will be automatically created in the build/generated +directory upon compiling.

      +

      Please look at build.gradle +in the examples/java +directory for a sample.

      Class & Source Generation

      -

      In order to also incorporate the generated source code into the source tree, add the following to build.gradle:

      -
      tasks.withType(JavaCompile) {
-    options.annotationProcessorGeneratedSourcesDirectory = file("${projectDir}/src/generated/java")
-}
-
      -

      The GeneratedVersion.java file will now be located in src/generated.

      +

      In order to also incorporate the generated source code into the +source tree, add the following to build.gradle:

      +
      tasks.withType(JavaCompile) {
+    options.generatedSourceOutputDirectory.set(file("${projectDir}/src/generated/java"))
+}
      +

      The GeneratedVersion.java +file will now be located in src/generated.

      Kotlin

      -

      The annotation processor also supports Kotlin.

      -

      To generate a Kotlin version file, simply specify the type as follows:

      - -

      The Kotlin default template implements the same static fields and functions as the Java template.

      -

      Please look at the examples/kotlin project for a build.gradle.kts sample.

      +

      The annotation processor also supports Kotlin.

      +

      To generate a Kotlin version file, simply specify the +type as follows:

      +
      import net.thauvin.erik.semver.Version
+
+@Version(properties = "version.properties", type="kt")
+open class Main {
+// ...
      +

      The Kotlin +default template implements the same static fields and functions as +the Java template.

      +

      Please look at the examples/kotlin +project for a build.gradle.kts +sample.

      Kotlin & Gradle

      -

      To install and run from Gradle, add the following to build.gradle.kts:

      - -

      The directory containing the configuration files (version.properties, version.mustache) must be specified using the semver.project.dir processor argument.

      +

      To install and run from Gradle, add +the following to build.gradle.kts:

      +
      var semverProcessor = "net.thauvin.erik:semver:1.2.0"
+
+dependencies {
+    kapt(semverProcessor)
+    compileOnly(semverProcessor)
+}
+
+kapt {
+    arguments {
+        arg("semver.project.dir", projectDir)
+    }
+}
      +

      The directory containing the configuration files +(version.properties, version.mustache) must be +specified using the semver.project.dir processor +argument.

      Auto-Increment

      -

      Incrementing the version is best left to your favorite build system. For a solution using Gradle, please have a look at the Semver Version Plugin for Gradle.

      -

      There are also full examples in both Java and Kotlin showing how to use both the plugin and annotation processor concurrently.

      +

      Incrementing the version is best left to your favorite build system. +For a solution using Gradle, please have a look at the Semver Version +Plugin for Gradle.

      +

      There are also full examples +in both Java +and Kotlin +showing how to use both the plugin and annotation processor +concurrently.

      diff --git a/gradle.properties b/gradle.properties deleted file mode 100644 index e69de29..0000000 diff --git a/gradlew b/gradlew deleted file mode 100755 index fcb6fca..0000000 --- a/gradlew +++ /dev/null @@ -1,248 +0,0 @@ -#!/bin/sh - -# -# Copyright © 2015-2021 the original authors. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# https://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - -############################################################################## -# -# Gradle start up script for POSIX generated by Gradle. -# -# Important for running: -# -# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is -# noncompliant, but you have some other compliant shell such as ksh or -# bash, then to run this script, type that shell name before the whole -# command line, like: -# -# ksh Gradle -# -# Busybox and similar reduced shells will NOT work, because this script -# requires all of these POSIX shell features: -# * functions; -# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», -# «${var#prefix}», «${var%suffix}», and «$( cmd )»; -# * compound commands having a testable exit status, especially «case»; -# * various built-in commands including «command», «set», and «ulimit». -# -# Important for patching: -# -# (2) This script targets any POSIX shell, so it avoids extensions provided -# by Bash, Ksh, etc; in particular arrays are avoided. -# -# The "traditional" practice of packing multiple parameters into a -# space-separated string is a well documented source of bugs and security -# problems, so this is (mostly) avoided, by progressively accumulating -# options in "$@", and eventually passing that to Java. -# -# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, -# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; -# see the in-line comments for details. -# -# There are tweaks for specific operating systems such as AIX, CygWin, -# Darwin, MinGW, and NonStop. -# -# (3) This script is generated from the Groovy template -# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt -# within the Gradle project. -# -# You can find Gradle at https://github.com/gradle/gradle/. -# -############################################################################## - -# Attempt to set APP_HOME - -# Resolve links: $0 may be a link -app_path=$0 - -# Need this for daisy-chained symlinks. -while - APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path - [ -h "$app_path" ] -do - ls=$( ls -ld "$app_path" ) - link=${ls#*' -> '} - case $link in #( - /*) app_path=$link ;; #( - *) app_path=$APP_HOME$link ;; - esac -done - -# This is normally unused -# shellcheck disable=SC2034 -APP_BASE_NAME=${0##*/} -APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit - -# Use the maximum available, or set MAX_FD != -1 to use that value. -MAX_FD=maximum - -warn () { - echo "$*" -} >&2 - -die () { - echo - echo "$*" - echo - exit 1 -} >&2 - -# OS specific support (must be 'true' or 'false'). -cygwin=false -msys=false -darwin=false -nonstop=false -case "$( uname )" in #( - CYGWIN* ) cygwin=true ;; #( - Darwin* ) darwin=true ;; #( - MSYS* | MINGW* ) msys=true ;; #( - NONSTOP* ) nonstop=true ;; -esac - -CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar - - -# Determine the Java command to use to start the JVM. -if [ -n "$JAVA_HOME" ] ; then - if [ -x "$JAVA_HOME/jre/sh/java" ] ; then - # IBM's JDK on AIX uses strange locations for the executables - JAVACMD=$JAVA_HOME/jre/sh/java - else - JAVACMD=$JAVA_HOME/bin/java - fi - if [ ! -x "$JAVACMD" ] ; then - die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME - -Please set the JAVA_HOME variable in your environment to match the -location of your Java installation." - fi -else - JAVACMD=java - if ! command -v java >/dev/null 2>&1 - then - die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. - -Please set the JAVA_HOME variable in your environment to match the -location of your Java installation." - fi -fi - -# Increase the maximum file descriptors if we can. -if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then - case $MAX_FD in #( - max*) - # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. - # shellcheck disable=SC3045 - MAX_FD=$( ulimit -H -n ) || - warn "Could not query maximum file descriptor limit" - esac - case $MAX_FD in #( - '' | soft) :;; #( - *) - # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. - # shellcheck disable=SC3045 - ulimit -n "$MAX_FD" || - warn "Could not set maximum file descriptor limit to $MAX_FD" - esac -fi - -# Collect all arguments for the java command, stacking in reverse order: -# * args from the command line -# * the main class name -# * -classpath -# * -D...appname settings -# * --module-path (only if needed) -# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. - -# For Cygwin or MSYS, switch paths to Windows format before running java -if "$cygwin" || "$msys" ; then - APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) - CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) - - JAVACMD=$( cygpath --unix "$JAVACMD" ) - - # Now convert the arguments - kludge to limit ourselves to /bin/sh - for arg do - if - case $arg in #( - -*) false ;; # don't mess with options #( - /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath - [ -e "$t" ] ;; #( - *) false ;; - esac - then - arg=$( cygpath --path --ignore --mixed "$arg" ) - fi - # Roll the args list around exactly as many times as the number of - # args, so each arg winds up back in the position where it started, but - # possibly modified. - # - # NB: a `for` loop captures its iteration list before it begins, so - # changing the positional parameters here affects neither the number of - # iterations, nor the values presented in `arg`. - shift # remove old arg - set -- "$@" "$arg" # push replacement arg - done -fi - - -# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' - -# Collect all arguments for the java command; -# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of -# shell script including quotes and variable substitutions, so put them in -# double quotes to make sure that they get re-expanded; and -# * put everything else in single quotes, so that it's not re-expanded. - -set -- \ - "-Dorg.gradle.appname=$APP_BASE_NAME" \ - -classpath "$CLASSPATH" \ - org.gradle.wrapper.GradleWrapperMain \ - "$@" - -# Stop when "xargs" is not available. -if ! command -v xargs >/dev/null 2>&1 -then - die "xargs is not available" -fi - -# Use "xargs" to parse quoted args. -# -# With -n1 it outputs one arg per line, with the quotes and backslashes removed. -# -# In Bash we could simply go: -# -# readarray ARGS < <( xargs -n1 <<<"$var" ) && -# set -- "${ARGS[@]}" "$@" -# -# but POSIX shell has neither arrays nor command substitution, so instead we -# post-process each arg (as a line of input to sed) to backslash-escape any -# character that might be a shell metacharacter, then use eval to reverse -# that process (while maintaining the separation between arguments), and wrap -# the whole thing up as a single "set" statement. -# -# This will of course break if any of these variables contains a newline or -# an unmatched quote. -# - -eval "set -- $( - printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | - xargs -n1 | - sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | - tr '\n' ' ' - )" '"$@"' - -exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat deleted file mode 100644 index 93e3f59..0000000 --- a/gradlew.bat +++ /dev/null @@ -1,92 +0,0 @@ -@rem -@rem Copyright 2015 the original author or authors. -@rem -@rem Licensed under the Apache License, Version 2.0 (the "License"); -@rem you may not use this file except in compliance with the License. -@rem You may obtain a copy of the License at -@rem -@rem https://www.apache.org/licenses/LICENSE-2.0 -@rem -@rem Unless required by applicable law or agreed to in writing, software -@rem distributed under the License is distributed on an "AS IS" BASIS, -@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -@rem See the License for the specific language governing permissions and -@rem limitations under the License. -@rem - -@if "%DEBUG%"=="" @echo off -@rem ########################################################################## -@rem -@rem Gradle startup script for Windows -@rem -@rem ########################################################################## - -@rem Set local scope for the variables with windows NT shell -if "%OS%"=="Windows_NT" setlocal - -set DIRNAME=%~dp0 -if "%DIRNAME%"=="" set DIRNAME=. -@rem This is normally unused -set APP_BASE_NAME=%~n0 -set APP_HOME=%DIRNAME% - -@rem Resolve any "." and ".." in APP_HOME to make it shorter. -for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi - -@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" - -@rem Find java.exe -if defined JAVA_HOME goto findJavaFromJavaHome - -set JAVA_EXE=java.exe -%JAVA_EXE% -version >NUL 2>&1 -if %ERRORLEVEL% equ 0 goto execute - -echo. -echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. - -goto fail - -:findJavaFromJavaHome -set JAVA_HOME=%JAVA_HOME:"=% -set JAVA_EXE=%JAVA_HOME%/bin/java.exe - -if exist "%JAVA_EXE%" goto execute - -echo. -echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. - -goto fail - -:execute -@rem Setup the command line - -set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar - - -@rem Execute Gradle -"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* - -:end -@rem End local scope for the variables with windows NT shell -if %ERRORLEVEL% equ 0 goto mainEnd - -:fail -rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of -rem the _cmd.exe /c_ return code! -set EXIT_CODE=%ERRORLEVEL% -if %EXIT_CODE% equ 0 set EXIT_CODE=1 -if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% -exit /b %EXIT_CODE% - -:mainEnd -if "%OS%"=="Windows_NT" endlocal - -:omega diff --git a/lib/bld/bld-wrapper.jar b/lib/bld/bld-wrapper.jar new file mode 100644 index 0000000000000000000000000000000000000000..e96bdc73bd304a7f6911304c8b5fefcb75913bf8 GIT binary patch literal 27266 zcmaI7V{9&5u*X}sySA}wJ+*BkE#yx|1oqB2oPB@6(Kq)IdKMAAvq~=F=Z8cS@G{l5RgaN z=_wf?9sL3Vkd9_{dahZCahYZR_(67hddYQG3P9hcLb7Rp>fNtpZEJg7R;&8vyX$cpsoAwUj8c6G1GNLh zvQY08-K!*k*7?fwqFi95w9}<%U_~2U3=;}brm}i=ks19RZ_9cktp-a0qIpE3LCQ|E zn~2c=%CcENr}=}<7u={pl~jQ=)&&`B`#|45T4EVQaaJ`b+EG8L3FJganpb&X%0Z*c z5*i7D#n&nA2H7qtvoW^z*ak$KJ$@#O#~fyM%VtHhl}T`flJW@mS_j=K){XjwFFJx|5NM?} z0#JxwN%PQB7yEc;1Or0h-4&^6yFk?r=KPi9MY+1Hj(uW>geK+NYFteEYjDcJJXP0v zCS!$a6585K(fr0Qx{~GZqlUAzH1_Bi`l9SjhPB+Y0F4q z@yUq%$nk0!T(I4Dm!^?WX}`FUSyTf0VM(f7Qs3_6?ypa1Tjngoy;fw$jg(W(BLU(_ z`&+FRj-tU6XNRVOBKpY&R~3ro_wpT?HsGRAPtu3P$~}}ZHHM^7J5%TK)w)~Ekei4V z+V3#3W0f2ad|Bd)LJSbK2r^)Sks2ZXae#|-DMb1N52D{&S!sqKu`(W+sc(!q^2-HZ zeNAPrx2>(#Th~@XLPQ&mb4=t%!$RAF;}(DtCDyR7>k=r{O}8n6Wj1apE>O@Tka4y_ z2=*7#)3MXan{kzJlM6fQDTKLWjd0fnsfs#4sc*dqsKFz5gLDH^8zt@)6glf)#M3uW zp9q1zVCvE-rLOUWvSW*`fy)8zJD8_nt50PAAst40xY6tt?EBv;`8Y=(*hoPQP*sAI6yEmI5xSBvzL*Qsl)} zL*SSMM}3`F%Mcrvi_>Fg%(^Zs}vZ-KCWCZNzc$mJ)eW^zF?#S+;?|AlG zaC5tcK|PxuV-8qz06N3NGxp4mi+#H0hqGr0{a>!8?H>qUNm!3Hq->i3{~PH$R0ik_WpL#cl z2#{VWe^cKrlmd=3`_E^0A-F}e4Y0w^-MjA?cn?Bsy-e`bt!%7P=ksP>G{ul1XBaQ5rDQ^Bua*91$AloSLOWtIg~1xGj5_C)h z2z?|igW9b0X)?kt11!wPm$!umhKOpm?_K;iy78%oQ61+mXCszalys1qzD2FwB?aTC zB$NxdW$OqsBX2Mx!WXEb6wM+X6$7;x>pj^Z8I5w0 zGKG5clYk0zxZm7HhMSf+ZS1>BrJN(E(Ico=iM|Gm;uB@uaq7Fs<(daBim|xYK0;>; zi|ZCFt4ctCF*~dUyOWzTwGU{c(yNT(rEAF|%lin8P1EGmQ-Mt|xf+WcxXjq{fqE2M zngzP`LjD@$X|tXDABvGrS=Y`YDc0B8I(DMPsK}mbY)$U1p;~ab6 zu?xG9bmeSu7dP$|M(cK_$<4ym#*GE<*}VkHRXF6rB~)|gX(o1-1MsFl_hH|G!-O~O z3#i${X4oGZ6#`wf!yBQa053ehK+ZMPoh$L9<{(7zqC^MzhIqC>>L3koFPSX^GL##n zQePEE!ks~6uMO>h6xhZU)GZBPXb|h*>naD=b=1>KbZB!Oafs~g;yKi>o(N&ew%W0{ z7DuPwqI68Z-M}33<2*L@gP=5xRqWwyqCCQy?qAnBjpk9iTWarL<*z_rN9^Y9rVKjj z*BFqQsV($4#SV;sI)AJ~z)R6Y513m!y0G3x^VQlAmCVWTF@m6AMTnKC z=$uS$hZ(^;YFO0Ox0@o-dRhTHH-j6wrKH%Zyn<=ujEda8sLxdXT0(w<4#NWfqPG+Y z<>P7g*(2=P{3}Z`v4`vRwEW$9wO3pFmC6 zHq5WLmk|R%ABTb)zVu&4jgKVTPDiH2-(lq+>ORcD7{YBD26aRxDC{s2ve`Q{xQvUH zaM)jO5Q!`b`I~(6V>Y?!-f?ub4lL!`=t|IT(-?Fc3`#9n6P_Ex1t7dSA#!e+a$3 zh^|^b$Uj#rGoLZyZd$ja$comE`d)sK*pGoGIvFmsJ1IcrYfXb&ao)n%AZpmGu68fXK!IT`;jII?vln5F^D zgroeFxFT^IJwDJbOimn)*1f#Rh_(#fO%V5sR}ws@5Ylw$<^p=cNca|Z=dZWZ|ae$IWp1rq; z%QH`%jE`mo@Ji%aPuc}t1~#X5pB6%EGBIY|Y_#Smh$ zq{I#GBZ^GTi7bRX9?BE|E-Lp8!ZtW}GbwiDY5U5;vhCa`Y}R5{G14ucbb`ho$fJ=5 zRAoJ@iK(OG%A-k(f`B_w0Cptlt2RNjaC2%p{^`S7U2gv>g8-Q6JYK9|%AV*I6omeW z*OL8Ye5sk6XeoJ?1_43LQ`r(0>aMdLSr*mq zBP8f5I!9m~@$5L30%5v625bIXOVU@cir4sGK$`{$ z@AznDIl^3>q;d+(%}HlfPpFkw^3NL|ZGuki*hkiX+7HoA^||nNh~#Y&#DcW(j@#_- zIqVR~0|zqE2}r+v3MKYOCZIDj^i50K7I^0Gw|>9qrz2%P7y@sS<4ZhDTdoBQMeY`1 zeRmaSjaa~p-ZEseochVbj{;RtnWo+gMTZh~7YIOny)ff=`X*#NB^5Ttsc}I!+*-MV zn11ush8_#Og^=f`gy;HLIWQ7FkOhV1A|FRSKV+wUVp4*kcYPcyBd12e5^OTxoP)# z#Bh!}hvmeLONgG~eLi>s>Wa(<7*M#dF}Sg`>GYe9=8mSW*k7DTPN*af@nqi~;e~6X z#r~oWD}Pt`h{)A~b0AxX4_8~nr7=A-@uFj{-eSEu>Ne&+=% z$EB<%PB4S;{ruizJSL)hEBjOycR6?h5u%3)D?B%Pzw1a`cuyn$`IA|9&!oNNF`_u$ zPWQ$kCla$}@+AIw75q7r^mFw1>ev?hujP2s9q?Ay_VdN#HN=E)C6MML|Gg$BZIMX; zL(x``Fxqm;d{75wp2qrDpydcfZz#p12AWp#SmSWFl**9068#7VbRx}xY#HU*Oq12$ z23IH{agFpnWlo7}62f;jK8$pBor}~ma|B7Llg6Nm7pQ3!Gep*%`{@ClS1?%Tz`&z~ zMojo3ONa>eU%L%$5NKq{E*bmKwt7_QNVBJMNT*r=8y+|Z!4f&h^Cr}0J2MEQBf&Zh zWFA-x58fhK@F3Y9(uNgdjC9YQhqcS1wT@#1*RT@Si!xVot6LET${KaWyXIQ>(x;b~ zRgfslwl1@}g2A}p@9%3EJ6B3;H;-(vI3T`D_g*Mca<;*D@9(Q+U5E;?G#w71yjcJW z%97{m&0v!-dJQDmwu(q2xuxpc4R zC#OL5T8M}WS(u!9T#H%G@jr$dDeei@ft55Ys-2}YDy0QUhXgRk@Hdxub!R%40KY=H zwq>wYhE>dNCG!wLhSqVVatk}~n?;`ZW^NqjmC9Mm5y|bNO7a$RL1Wd{QY%g)!X;?F zMM7Md3sz0gSj8zomuL@IpQ-r+M(d(dYZYQu5l1c*9RXobY~A`-72#BU1w$o3o5^2O z%JkgFBh#w2bao#Q>ns9w>8Hb{WrX(TT$nrCqJk#z=glY4#MM|??bsnWf5P$~DqW<8=Kxg#UZ5bA1^ zhU1G#&9-Hk0up)%nzGYg-phZep;p2^lwt5wrFHWSgd?xIOV%~7G{_1#npzN(X@K_; z41NyyOEoX9Pd&F}U5V^$C`V$ocZ6n@UD|eO480Y{^wUi-T|Y31)~vS#Gq17&JtqB3 z#Ix@puT?dI+&mRf>UO~+ZEel5Y<33(jaA0`g0&5NzE`Lza?_>?;$$WAYvNSYHK^Qy zeWiXjVbwO{-2$Zpb8$^9rB_Q2&|hQC+0ote5I2_ac2~AG7s1=})4@Rg zQApQ3;B)1|>jy~G?oQ{#JH9Fcbt~(@5U=6){;O^8cWn-TCKP0dI-Af##6A3B74_@- zOuG3ti5_T0J)ofV9n_aw9k!MU^&Xznx&qN$F^LXq?d>fN@pJWeh6~B4&ehumC)3NA z3*_i+Jx$M}O1bHE^qS7MOHWf~^tDW}G#TxU2YYlCOfjd~;^^c3LJjJBtei`8wU0Nh zS*=IPoXu5dc*|={Miw*USXlj=<%DU5J;^0-5+^mddj%j-)zdBrvz5nqQ%n6^;}Js9 zsBodm`6TimS?&_V&-rZlhvVN;OD*OyVvPrru>d+QlLzGGd2U_~KzVx$+Uh?abkAa; z8jK7mrsX1go~=ld>Owr`I>CSV#fva=mDWI8T?NZuR@1cNoOV79yY-1-b>4r-A!oUE zR%g@7RyV!wUaB?`eeKOIBDmeyBvaK%e~L0tYZ*J zUgC7RVC94^9y=SUYV5y>CE-9U`dzkzrjBn5|dGxh< zU>dUw{9U%f8ohZj-8?jpX5iw-NbXm!YXmr-2y7SgPO}Yt#W1ryfB(9z`aKGP7z^st zBXnfpyiU13gEO-2d(olsG46m{%cOxn*dW-WsU+79Ehf&cjAtFgQ2cE?9kPLh{y^RF zl@msI^yY8pJ{5n@lfnPmj(*bI##n`Z2jNeb-|Tv;pxf&GSPu0_hm+u9G_vA8rP}%G zjrOdqETTQ~{OjR9Sut4RS$XRqswkdoyph}1Q@dO96=R%(YyheqzLVl&PjA{O7Wr+( z2-OkVm{{p|H|3c3tK$-v?p)s(H@O!pJ|0Sz$YQJW?S@dB?XET1Mb2ZC$!TA~)eWqt zdvD@Fj({)t8isE!?filh5TQUdwXf*heI{V&0p@E-J+)g?T)%l^BFu0O)E>q60LeoK zWpx6ub0)x)I?`C&FWAe)(r;@x^C~;+=!+Yo970_=ba_Y9v1GpDVOn3ZI8s7uWstkl zSopPBiYqDv>Ty^nEUuA0{$lgF<;`6^Ba8`YZJbO~`WyV{QYAb;t!U5{NxiGUYMS`i zyF}*lUh?$n%sP(%h~D|CMBmyzl)kzTB^0Lz*x9?=bDHVjHHredKNvu%QH)HRnV%Ne56Z2zHT9?};C z!qyqFc1l%tTMdkEdrNO!#-`MIx~1TdL42qPajK+EK@MI_V)15 zDaILWv{Ss@GRJ&@9O`{qs(zRs!3ERg=f&1_e()l97e9Du0jdisXu8`bO57bD(PU%8 z0(>KQYViyEG!8LBb+E7R#eqcSkfQ)VsbX68D`XZ9dtm(6kTx^DIu3H2&Rjr)b3Wtq zCHY^Df@c}UO4qo(03PCM1)R`6O$>so%h+ik`eSRsLCUQTul)2Q9uJG1;Krb0s$~yugh$y)ZRX-C9FsZ8+%0&e$`e1T$(x~4N^h9PzhD&Q?x)~QLLWSMR+ws;Q zq8hJSD|+bu)c^*Z9t;|e;N~M1*uX?QK$s30GZjlKb4Z$YuXrde`4?uI!?F$HSFpD7 zbmH1Ao$t?&zZ%!Kxc6jnJRh$2akZbpu`wv>=onq`(s}}eozO_Dj$^KA4F~&cEFLG~ z#U&jk^1ze4+EcCfmo?F0T1gFrT@gzpWwLOd(vO{jadE-JcZ~bC4L^=OF*~m zr^q)S`kRzW;Dnk|k?`T^2YnKn_gJ9VXCC~=D+S4O^H%81QT~mEO5pGLk7G*yQ%b(b zTZ8$xeZeQ4{0AJB|JHwl(n)#G_i)9&z^FUEP<)}HbQq@d>y?$a-fQv&y0b*|gqcirJm#~z@d zWAbOlIZnzA#53eBUFnBZDq+!fT~H4(ZgV~?QLz-2{Pm_hC9n7raKxAu?U;)y{|S2r z=%1EaHCB;C1P2_$d+PXM()w)J9cuQ-6Ycbv{R3cQ4NL=tp0Y%&EuhhoT2YCv=dLRE zde(hvx=O7$UH*4BtGcHy;GpIi);w7xLdJM`9$wK^?Gll8Q{F|!2Cr!B^#=qQ>bIa* zHMB+Id*M6EuJBjJY9S@KEotb_d~r(+uhdMbsT4OYf_aVImMB+C=EE62LiPI1Eg+%a z4@?R6>zOx0s0!k-7=tse{OP+?d!~hqGHf4l;fDZ?VJb5P4@) z)#R#t3rQeGY<9E)cy6ZTH3Sz(Qv}K#=vG9Icq22fgj=GvDW-h}=5sCXPuLhvUk-PU z+a*eB%B8@XzquSO7!a5i;3f4XbD3hTE2?`*a-oH%m_c5pC!VWR&*&*h2x>4yW~fvr zmFw|vI^&6h{nZ(*i1um{lV@)HBnKH2Cu;TuW3tPK>g-MgCrfFx>V_p-y3ZJNCJO~7 z7jiaJcuAbWF|XBy@?|G9mu^;6bjpjxcgl5^DHA)iu;d5- zB>CNqh3Iu7q>HF^)3)$f$tta7n}Uu5`48QPLMq=_WjkMZBwgpq$J0XN* z7Q^v^?ipyWd_I)Gt_bi<&nkq_zVw6fqIp>;zu5U4ZdpXX^!mxQD}xY>>`s6W$|61h zKOXFlpKJ&_%sx7|>X$HD;Sl+s*x7U>WXuZv3pIlo^64FV!y7l4WC;#0nC6TaQjok* zMv01~pJnMTT=|^`LQ~XQf~m&H)i^Qcg*qP5Il&3vcAN@dJEE_K{cK-W#>XQO~qo?EK=Tm6ytu{!Aw zH`ORpyFcT0h7S?mXW$r!j8i(d6odX*{oaIk*o?bq0$+X)foqL!c!tk0v>5*h%Aqz* zUg13ewIWlpMPG&+z=}Z;48fm@zLW{yOzdc+r~c;0)X!aBLq$m~jT9-JCg|wYs%etO zFCCq1q_~FK{|O(xL20Ymj8m!X=weOy0f3gU%`o;k0K z3)!vFh#^33;Bz=f>)a^ zUDvAi@%fln-KO1gBV`#bFzA_joLdA;N2U>UT3N>;>JwsSGOzryq01Q_X{>B-=S=(N ze-2!4Fsp}ntI-t`CEAy4F^wr4MHoL<_b%1r{JT>%pNDD^oEl6`xH_ZLT2vPUl~Rg( z5PICjZ^-!R555P}Uk5d5P304!$5Bz?S@)UxWpCu|rTFkU+I||w4p1{=IjMJanB7sv zRimE*3-1gT@9y)bx>WJ*f`$HF%xW;O-;lfXLlt0WSm7X~BoGg_>l8kutc;=bP#rQR}5Mx9MZBB@fc_EsQ4BeZV z{P_TyXuCkeYxW3i^b@ZycGj>ov?pYe5}i8*LSIRIq1iH0R%poz;HhSk=DKHOiE{SgJja5-#z*SsoS`qV!m&99H%z*> zhh%W~T=0Kn&~|a)|CFHZ((4s;_-URd2+t@>3m!54{(!zqh==mi;kkUT3@|x39WyyF zlj6y}x=$nOum{K-aSf^YwuZr-^))FP&aF03ZXD`TWEOwV{AH~F&S=&-KQMdJJRvYn zdo)b3J@jIOfD9}Xa3T?t1RhAB%tXSPzFwMrHMTfJJLp< zTuV8Q>19>(>|DEK<n6oTTEkjO17;PqrmY#rh&ogx9?Vcjk4(k< z%$?AZe_U=8v!$hvc`HX6)wm-h0aZ&6%d*hBFFyq984A%|%3IF|K@ ziDOv?ah52~B-}8!W0VD&wP^P`fP4G*g<4kGH~7KnfOl5e?ofKZUdhZw|Ap`B-a!s} z^8Tgg3>nLa(lh8Ko4WJHmw*evlLd0O9792#MWBSMjGJV*$3OYjw@K#y73K9;+wtmb zx5qZR{5icSxx~O~SbOYQugqG!Kg6ZR(o&&;ChQp3rv=`BFEszx%m>CZ+vu$K_*wRv zNU8!PMg^dMHwoW&mv}r68YZxNLyX46tD4h z6m8vg{AP}8P4k-3La9)e`qsFz>=1od6;}9xC2s>aAFPn_fGq!;OHEdZZ_3A@y)dC~ zXuKo;L3?`iTMz>GWL1;1Ie*dzK)b%wy`R^_CMb%pL5UxL1B@bW(WWt3+A!UtvwZz- z=Q!^QfTbU{JT+6OeJ?4UrDF(t)#5;2{^RA@;LcP*w(mr^p8aLQC^z3=Bt511wn#8>PI5B2WiO1H zQ7?^z@I)t6TX7JBA7p3PxbR?0c>vhx4k$S*;KfnQ;FFLm)L|sUatu&4fuC4PcG6Tt z1f$aAA-ha=LU^Jc7-!+}gfw?^DloC?a91|8OiYBzO1Yd5y(~|`e7kyw?aqTf9!T_Q zx9+#`mvKwsr{Tdq+mPzyqHagWL9!gg0Uj2Doe0O!-0{a0oZ4=XzzzeLuuQYdZv}ZG zX$w;XDfqF-(>oJ5Tc^I|uK9ylt}<}H6ZlgEPo!?ZG2Ho%%R9Fd+}a!q1aOiV0JW*~<7 zAq;Nzo|~6)O8pz|#U&FRqoejYt%``1NB@9N#YVCQV?keoF&R({XV)8rh=+;Z58C51 zgB{F}pEd`X;*ROF_=ly%I4Ys?5xmL_;gR@y^&EV5aXGW;nD5mWkIP|F;lj4^Gb<-_ z#6j<4o*#!sfU2E^Bm6!$#dlii*q{j0V&X8V_uypo;^ zI~2wwEo0Ue|D>T;+@on=Va6eH*(v^NL;W^TmQG87A5myfVk4pFq@YJ=N@>Kf`&`_9 zX{IfME3zYMXvGf?8O$H?oc6DN+hB~V0+#J)wgu01h``A0WrOKrBwJDLQ-j}DPg`hN z0IIyujz6@|3+wV13yf?Yq`xng;jVMR&_B!CSJ2-Az^#!f2N1o&+=FoR;9uR6pBZ&1 z0)>~uk1o9)pgu3kUHUze`WOrgYYXlI?}X?A?jmm^tP9xIF-z99><_W``!SZwHt1&q zK8P!Lp`#GURN~4jz){g-e{&fiJg_9#fnl`~V1L8V`QlSA2Neu**RojO$Z zQj=R*lMgeLXRY+A32+jbMErh&@dqANx%xT8J#K5n-jet|_YU=L zL9d4Z)i=z+59F|aGGe5F;Zy#(<~=6*oIV>%4d||1fjo}#5#Ogo9yR=!2aVabwzZ4=VP4uGs76Sm4$dCoNd_<`r&xG{Ow}8jAz5I zLM!^3Es!4YQrQ#NxCsEAdlF>ws!lm#_^qHC1O`8tdY+Ehiay5yEbDhWBT=L9QR(L zqSPfiytiSS{!cx)o|38LhmYK243P(DjL-*49fN%OLIK!gxJ-=oKhe42N3;%2M+}^} zQj_}4BIG}FYUcFkg_2-E-C4%lqk7Wek}@FZjtv&%@d_? z_>NgVwX*|*;^^R5cEpA;_Cqpb!WSnf3|#V2pWNX&Ch1saix+gE>+jo+uc^j5tQH1R z91+4#-t<55?+EKw05xBRqrY>dCc-Cs|p?MvYWDG!DUC2@q3dAVchs}>!=(_mLroa%IFGVxl(c` z+?5Hm3Ng8IJFZ|aQznG*OqXBNuPaXMzH+mL63064WxSDoRHuX8G${OB`md&$c?{7bR-R23sc^#^PKBK6^r%}$)Fd=m(Yj8N9m07ub*bf%*~jMxa+<}SAN-;) z_CsN+*r|6x^o8CrG>0a4rzUbbj^R~5LCjksq| zH6QO*H68C#q%@MMqzp~?;MK?te643TbOI_#?7-|AlLLykt%`fb*UO8*A{MD=m=UWo zuq0~6UI;zgK8e$@E(UVRwgM{hAFK8ny_HfZGiAySyXU z9kOW8J#NcAc9;QsAowfQ@>|vVZQ)m)lbnN8ciI_vQ-><=H=$~GOY$ejD*k5f*}R>I zr;?0a<-Rj8LI%Hw6{fn#O?BNoV|imFGK1x6iIm^OFYEI?rE&aUf^N<}KDQP=1k;XF zw2w~$E5WWmf|@e)NB=6HWRqB3yiXGm2|?imGpxTcNZ+U&H^MD0j_V`W(z%Oo%rMo~ zz85au_Vg?ifuiISFOUdrGqS>q--KJ1XsmWQT&7Z)^#kU5_{nlf13LN~N*&G7q+7F^WPGF zMm*=Pp6ofx5gL-ColSpNQDsZ#=fts9B-28MACW9Wz6C(*fHwP#g#llQXb^9X79rwK zwJDAzGhQ#&V2hp%*MpLbFV0L-x^iVtklg4$)Hg+S$mu^$o3V%l8_Q?OJZe}NUX3r* z3+PH*66@_JkKFf2yqQbivMdkaKH7^L15VJ?paduq$K#s;vnX*Ur(CyXq8nBB%)y`-EMc zziWtHFG-s^6m~!{K45%n6m}{F>Zn!RFXI`os^l-@b3-rmzU~)r9%gy?+ihiK~hnfkjswli*1_8OT`oE|d z>i>h95&0izM#kRI#MJ430h-t(YkO27^sqf@^tP!*r4S{n>e}Z&Gj(f7X4b{T_e)kW zwX6&B;5>h_u7$(IzO?~n4lJ5J{K)ZwV$HqJEP4i(;Q1X#8%RGklJLzXJ zgj+39{xB*KEDF9;psP3!ecN!{O96oc>aQ142{*?>Ur3`VH7*EzD0My7S}Z^5Pz9%uW-eUObl`bIaLV3 z6|7Pf++Boi=LF&_W|^jFMlY-=yK zgrrm6i4PVVS?OFLwMse-N}bBCTAgoXo!20>vk|2!E&Gf5V&B)u!h^B31mm4z_~hPHldZCibtuW#*3>wA~=miiX|CG5{0*T30Z9w6BF&-LCa&%Ye+ zS@*ujkJbNHV)HoP0Vp#|H}^@uWhv8z>?RFqHVM~pGIj}I>~s5k9$yU1bEr>y6gbiI z=Soy%bq~prjxUbbsN&(v5*Oyv_Mbe+774O<@h=eT;=;R(WjwWm9W`wbMg$F9RjZ3| zqbk^+@urQ4Hs#`>+M(R#^-&_mf*0->^;hLxeUeNrU1< zvWXMx`Zy43XhnFa%*xsz$I>msRgv{8+tz5{Kt?byC_9)g8&OEo3NBl4G1x&{N3n?s z;Q_yIEqrC~894}az(3H_O5J#Lv1+=bC}&Z=H~?_{1?a9yF3hr@*<=kJ{Q~t$eruvB z4{OnQe)eQdpZ#wOs=zDK+tCb-YN$=nM$^Gvr!Cif-iMngBU~{tF2D8{oD%$qiL91* zu~2lyFN$XJWrPPAI?b{>|Kjg5VF0^DWJ)t47X#cAM5!4a+ZmV@*H0Pax)!CMjNB zIs!*YqI8RbbLV(Lbg8J5Fq0*?-efrt9(LYLrk)b{cAMfa&(ub*qxSDEW)Dk!#%-LM z{47w_?2TW|7exhf+VGn+=jI*}Z4i#u85wfKWswt(T3y}2+Tc5IMcN-;L4Q4#Ze|Va zdC`A)TR>BwM?Z=21Y_g|-lceqoEV68)OUMlrME4}AcfxZ5k`PL#M~NJtQ7!PLV~*u zXR$HDlrJ6f2ZuQk zSkrT~n0G!gpme3wnLN9Lb_PA>pHxVz7PB!)1D+;+=~>UaS_Sd(bO|qL&`avr&m*{y zZX22Y#)K1Jxxx%J3Y^&yIzy^oJ2xwPAX|e&tz91ObxC%~A?#Wy*dlv;<4epH+ESck zaL0Bj|2#<4CleVdk+S1`k_x^_+{Vh<-s6b&oej?cy~r<=ZKO)c;4N61nQ^BH5@e!ai7BxZ#1Xsg$HlauwIV3Bx^bj1a}!OD0YE|1?g{Ys&D7O4JiWId#EBVQ;?y*SUTSb`O)v7AOE~4yb=u|kM-i;VP z6sa@AWFd^aX^GjVJ^$u;D3GUBV!ly)NogJB6BCHOvo#&~y?H2cS5xvmag=$M4Xw8# zRH#bcraa;C^)8AWkmF1AL`xx|!l+YWS#~B_E-wG96}X=fWkg@)g4oHqb?0w#1I8qU z_KN?xz7G^2os*XRYFl+786OLBgrPvbffen>ond~O?e$W9EbF}6sl|z{6@PY`q->-y zglf5usAQDdOQ{92)0!bT>c}x?*p+a1qiG$TH8wCT$F}LY5$iODJG+j)pFQTJYj_xJ zyNSt(g@}tnxHLh4YZ_O^3i-y|`4iWmcd6e5^!UK^GWW)jN0I)7Yd$1p0mNFyF( z=~GSIE_h)B$p-&gS$Npnli?z{v4!%GCgqSmj*F=rFYt<=HbTW8-ba$lU~AObNqlP} z4+0D*{uVT0k5d=Ut0fvp7Ad1OX)=NGJCVYgZ`?GgTw=8mQC*J^}E1Dk`IF| zV%O?6pfx)^rpc>vZXNWqv=E!5z$0DQ&oW>wtB~Akh8;OdeXQ8GgpxnS(Lgc?am!R5 zJ)kYh5MqrxvY0%7`(aC(2L#U@Y-I35Nlk#*c*`}zYoN|Cz2fI(w~&>VDu=h0ESJm< zxh9GFGLx9Zc9+W_;(6o^KH^*w_?j1VGj#X>wahXlH=1kVA61G*;K(UsWtyAIQp!yR zhh&okos$AeVakE~vU)}ia10|f+=Pw2vCC1g|WVain{z60e@o$sd!Zp-cE1g^Ag;o4)lnqZ+q& zm)#7F1g(tPRGiQ-7b*i6<*_DixrN?*N9q9~gSh>~0d?&chma{>YA9WO; zhsXS3lpCgZcDu<1MeA0|Jjh&%oDY)m7p)Z;u&>M}nm(O6eDu0mVg=m#zizXSOzkV& z-`^GLwMZW@o-CL!q|y3<>e*hoccJ@!7g>y>SFzw(z)l6!lBwj6aoojn@0r}qIBk|{ zY8%!z&>>p~Us_xsPNwS1xP62Swof7i@^%s%_|Ct*gseF|tV4*uNUq+b$o-`+JD=70 zvr*v(vp3Mba9~7J)TaY;t_-y|l`p<%ZND&H5PG&sm1^8S2>sfe;m5kZMQ{c$Er^HL ztO*klM^}czJVvKR%l2I~_>b}h#blF$bWH|Fk9}fHD3~avQk34uxVqAFeAOINIr7Rk z;)bCtF-fD+CxzN@oXjib9FdUa)v;4BRXYFE&qJko@Ii9~>i>6MBo8UNWfPV=UzhDN(a1@RasI6oDDZBS^*A;VeL)ClD# zxA-PL>J~9Xz;A!oFJ-bXtwq|MuwV$K=NG8I{I&(-TU7E z@73>_soGOrwf0nXPuJ|4wRXE`4trV>_e}0AJU+v|bxvN!a->*OW2~tu9K6KziR_c~ zX_ImsM<_0p)wefUR!l9&PWn8GAcGO!Xzc4~W^)W?kmpRlf887r;dsytMCt#$^JU_e z_w<;dsIN|iW-|hx`0)=p7-pee7fz{_$k#&lz$0|Wq-2ecEiKhV(}>F*j^!;osQAVS z1)M7fML55O84LF-2-GR@>*shFozElMOWCv&-itICQ^tC>#eyJOy!q*m3~f!b<22Ag zrZh!m;gKZtt=}nBr(Ac6v)J~#urBwR;1|if5~l~_(4C}>w#OeTU-wH2`Y!Qbh=`>s!TnXt)?0B+^AVA1H*AI(qCK;jsA{2}^U@_c1KsaYBHD^DuTe_O^~d zhxKN&zA8<{bNK#lvNm4R_I^v1Jkgk~Jg$ty09oJZ0iR{SysxMlg&8 zz1%kwEK7wHrQBA!i1DOS1d@fpv+2<_GUYEA<{oUQjtXCtztw(O%j4ftxX_G6lu$^_ z8Rt{^CF-T%$~A_bwyW@9*W!~dQ%aNTyI~T?{F7RWQdj?DRA1t*5nEQXfhyBWM+KW? zZRYU4^4*ds7yddjW@b0}N2K%gTP^5fp~B3TO`UE}UG?X(KV>knKRfhAq;`Dy9^Ov{ ziOFP&qparT*0vhk zX0~AEo&|e7z2J`l(qs88g=T6(8z7Rh#x?X}YgNT&A6^@%VD|9wvk#mDZ_Q z9NBV=NAzs&_V}dcdgx)dq1r&xd4;Y#W@X$d$~UnHd|bU-??He`3riOT;Tm?`DzJ{* zvRX0XyJXo{U)p8L8z@72rL)>~H>WSR7i{+TGpeKfSc&Rq6jAwC*JH92G+($f!SFg?`)IZbWz0KPlCgeE*Rhj`BvW)m{U{KiaqFf(i*&;C^6svw0Rh@XF%UPVpeqm@H zWoNm`px03##B_GTz|+!PZ-fvqtd<7Cv@W;XFVd$FZ?SE}QB*0Zp4#QFUNync+3Xg_ zVW=6_`Zj87k1eESo>|P;@qVkS6IV+v5kx>?m>FQoFkfsLAe0k2r^$|+IMSCiEqb3V z%1Jq)Rm#xK1WmwbH|2R{oWChNm0n%78d}oK0G-1i;{eB~9noqgwuOsgbwO34&c~vz zc5`~*;{3g-vtIr%ChzCP;Awi0FFV`d6^aB}Nm-uJbcmv=m8Ndhr$4vUlD}rAHF3aH zZf(djo6fl+QVR=`wi`X9)p%yK+o*mifzn1rs}{t`N8_L}XHiG1{c(@iGNy4TZ%u;s ze25^`7jIS_j%3H;H4do3ws`HZX*l*b?!T z;bIk;t!vxPGqH^lD}wl@OA23Ki9F^o6V4D~$#eONK+4*f6Y(=s@6Du?mMmKK2E%bz zyVC>?Ue-`V_%RkrKT{Y_C6k;Cr%hi#J z7QXz8?PY0-{rdEptO!mqx~bCT&GLnLn^x1jp~?abfb1%p>dLi}0J>cDqYRdr5F*?d zkV2vTZ_P1n!0FYI);#Wpb*6WlGNTx;L!kAlf`!Oo@E;l)AaSsTKC28L&vj z#=o$8E2TCNyResAb6dp~*J5g@)?#W}Hh;2=!zFpPnkXep_vJTQiBy?8Cr?)27`%*! z2d_IYUvDBO-G0MbTXY-X96`}e$EaD%(zUV~Z|SOE*XUp2pj3jLK5YLja@1|HSDdg^ z(GVf6#orCMoB$dYEm2ll5A9>*FJ{+m03jaX9_6ui(0Ec_ckrP%J-9{ggDK{*JRob3 zPkvchNL8z8v9h%fZzdixH4VAl-e_>6K_!QmH{4)e>IlDNVDp4K{}H=R`Nqc?2UZJHBG1XazLKDR5prG7i=w}Wve zI;8ILDzaJm796koHGfCno0=DEDl(qh^df#A5=}VeoDVtXV?^K8_p_9e6bSee##=Ke z%ni)oWY>4Un{IG$q23Eklr+V%1*{zBi)ttxB)=UgJf+%fU9k}DnooMHjVK%{^EE}j z^-%tND_QgV=mn>Ci~G2x__ljKlh9`_TmQoi$1YyVcYTq+byavn6{-eVPW$w?>dt0k zByw3i>~c2=KGS4P%Xhx1a{-_a5_`nk1E+yio~M#$g|g3FEO6V|t4XQ&ZS-u3YPmZd zTA{7v?`AYJ99CRT%b66*8nSEI+$gpsPI;QDrXA+{wu71qTd61CR0I zGR_n8;5b&LeL)-3ryZP=80NvgmgtA4N+$%Esb)uZK=B9nrxbK>Fbt7@8tQ(!8M4k1Bb^Hz8svWO$Oe z79nf3%ApVORIjz;k~O?s!yORv4Uv)s`*-UdXF_Xc<@nsJl6+&EqnIzXKHAD;u_1(m z=XSrGL7!r$kTyob>X%?of`v)@ANJdGgjkcCJT8zk#Z1=OzEzHYXwjd-jcN_`EA6V0 z9a>tc4yROicRzd z8?2XXYs`;#fX+FR+9czIspVcZsAl-SM?U=uDpNo~e;0tPU1Q2q#;s~7Q3srt#m<-b zg@zf&%E4}M{7x-4nx`ZGV3wuAaD$(TgA9=)C+3jlxX)5+;Y^1bLH`bj#hu6Ee& zH^fI8x>502I7k0=@{v-8wec5u#HMf2mZY+90Z*A$XnZ+X&uWbP)NK>prcQq(JwKkP zu1s5c9U1&7sh04f^wg6u;8qwho$Dkwl!}i>S9SeD&PJRa(6V@DhkVZH;F;u^`x4r= zfb0NhhTL*W+;ZY<##^5xcc7+sOv27*Z3eF2lApJlCQKw_Y|314z?gS<(v&&tHO3+1KZ;`-j|_V?4HgKPwuKM z0(kju`-JB+q@-AtY{02|roEsZHwbyHo4g_h8a$d+`O1nC*v}y0J4tb7g)r$zlZ^=U+5w~! zK)(w~6&J$=TU$iNXT(NhM19|H@~PHM6K(eR_15^Ivcj!tCLpo<(rxA7!8I?p*v?I` zG*9gnlK*gm?rySbLP*M-f3^|Cs`==epoTK1&RINtdh=w**Odr}c`ZHV4V9+cx?&>MTH=n_es?rOIpZ>3A@P7)k9Ap=dFCg`^D>gc7mkiEfq;w! z{Q|J{?1O-z1kJIY=bZ4L**gOTo-5vtteKLH)X96({rV(hL1YPL=poo^_-#biZElyS zmxqqL3k>6MsnH(ME|?A%^hT!=X=q=u5$ZVxPE|oU$1kj6ch2&L=m}Z;VLbAYSARZN zHhKFIy3JL5i5)V%hMtu$6DX3UTs$A_Q-vhriw)`px z_BzEK^}zbIOg*%UWgf^p7s-i-9ZsUk>~`?HADAHZb+ADq#Un-FfZ+C3f*+G}n`Wyq zLX5O2DqF#N#7=ZN^hv*z>wAmDy8j;%%7nKysC}2I%kp+Gf5yz+8DSeYO*v=z;wyw= zME}8L)k44%66bumL;^R8%28mG&qX(3#oA1P*3nXzsGFTqXVc-a|L7m~i3;eMPPSU* zWTkuYz-Lvr&*LX<@ErN&ZYRQeGRD3B-7>MND^h6lwoi!e7i7n41Mb+I`}q9OwU3Bf z;t32W*=Qu}nA=zIU4`-K(L5%k@!}*hKd1!9YSVG{=RI~a7e7$#AV&R^7&l)*0Lhj3 zeC!%Wpl{uo11s6Io=gd&Y+?NV0LeNnBDKLE(! zxAOFjZM$|^>7F;a8LSg}Rdz1kLDW_85$^!@g$@cA|l$f zT@-pN?TaN0gt&Wu;?K7`4zKNyY%jdCi*xfdc>_6c0l2YFqCu{d?%cn3SXD>h{eF=U z!wi0W8%srcxe+d5*SSCd(LM`_)gqjd+%O-A#;QTPqcyK#&3ePjjK4KfAM;y8`G5yTywdUu#M%L?V!Xj>ByO+bK z>88tzyjCh>+ucFmhX|YRNtaW!RL*v9#oVsmyy-u<58!VWr4g*d|A#O z9&SvxxsaHNfPe+rFMzbnK@eO++_T3PN5w6<6eT`*1XTnpx(MGA{Lqdtrba=kD=z;% zOV68av3y7?jgHgEU)i68wOQpG%BU1UVjLubbX4_e&XAI1*1FL@`uMZdiD<8}tm_>h{88qKWmPk4l>t?WLp>6x?= zXF5Pw5d^RKnzSNh8bVJp!&+sOnEZjdmV>oIcx#?3lvJAhJdNw&I~<**>47+T#_9_9 zyM(1H@PXCLJYD6xC07eXy%wDwpQt*ERPM&43|v6n-T;KaI_$E>sMGq-4j^o<;!*J9 zqw}NUL#{aPJpYU5EWkbbgP*|18w0Sh!7wHok zN$F!vvDba&P_PG*uO^D>E8-h?IW-(&`Q{fJTGfsRd_VQ!LZS?&G1{aP#39cDWq0`W zf%2@sFhr0K3)8+b)Xj_v++{g>(DJbFN5O*xbUtXx9MSKgF;{=g!|yz=NpO}ohLr7V zZpI9C8t`Uo=1$^@u$TfP!KQ$?gqn)EyhA3lk z>-s9>6G;;+BozM(F2s%Jxp^(U0Vj8P+}IEU;U;0fljh(6_K31+JPsa zEW{MK9Z`8yb5MRZoJTru@b=nOR2Y?CEGdZ5F4&c9RF=JXK~&7@>VDw%0wPz&5v#%h zGY}!=DbIYvyg3wdmR^BK=4BH9m(k{FFT#vBp@lFet=Z@r7`q209(L;`5ehM4U(U1Iu+RaLBcU`smk1TrdYW|OMk>}=L_oT7aK)He3V!WloS>= zb;^IJK>yNRS5q>MTB5m&qLTuo;*aj9;?F4kwqoC&@S2{{LrsBeN%ArTk*})WZ;c8{ zEgto=`D{m)kTp@_hNmkqYCYi9Bg%ia=a7H;P4A5~KS!+?k*YBf=YxVV$LJ9e0BkZP z5NV6StvztbHLrHp8O%Lr^@1Z#Y8us%^laI_~7{ehG%L@LIN@|H@}gmNiH zEt_iGrtVYRkUCzMHy_iGpFp7Yo}bQ_!l+Mn)zGf|*E^yr63~V$fmDGg8Wiybekg)q zC#>!j-Ydh%0>2QeV}ruRkBp1&qN?6lgX2zjVkUL{ySbPTutlGXm*YP){$TB~n4|gC zbPI&d+6d-b5*$UE=UxumF)ik^3X{Y1FQ$5Mt4Xb(P`vUK%wT7(2>zn^wJxAWN^Zq> z26<~NY?N-+H5=Xrt^%=844fB-{pKTAkdn4jBVNT6WWBfcH9IhtAKslfE%s5SVx~O0 zD2aNnO^&eu=$#+Fv-Ysfh-137Y;h!i@L&sjI)pmsvD()$K-RG)(_yLx--=rjwgYSZ zAcU|VrkktC*fT|)4mdH>O`}fVDTywP%g}XC*RAu>!0}@1ja_(YTt!aoARLrNIm*}= zykz{v(hx>6X?9l|2)qMpR7bvl6980f7CN5w%;g(ucb?O;J3%Mw@d%{ z@*xdf9;PCciA2({^T}f$jXZ|$t}ofEKiNy{XQ%0yAL-Q(jmVuF6-V5RIXRbhrdvH| zSz!BzbOB>s<^?(Vmyc-$Fzu41c;X^rOX=6q872N)Ku;xtDGnx{A<;DI-i?H5jZp4u zKY9O4eaLzr_-fm548z%ouHE+Rkws;Z19DSXS1uga@vwB7BnD}AJ_JUMew`P@b_5+W zLdh-N-z$=iMVruA`4Fyc0~Qyb$2OxIJmD0@9~oV66%HH)tWqg9lBxSyKT}FgrMI!7 z3>bQUv{O^ROo@eO;^Okii6W&hqaX*9ZZ~T!gJUu zJI%!msk=gQWBYnCuU4x+oK`PK|_FPC?Jwj+kg~~t@hjkuDItGMK10FwI!!u!` z&ADE)!VHq>_muU&W+JT|pq4l4c75^ z95L~?P|ZTwz-W&WuBT6zqU;-PkfRaOuI`C@0vEjFe$mN&y|-)i$*fm@Ne0cwtY~KB)?9x z{@g4W936HL)-ANZ|1)eiI6CMMWE&9;)z8e^+xWf7HM;x|-|;mNv~(cf(dd7#3Z{fV zlJAdpFw`~Vd}ZC?=*?$C>t3v@SLX5Zy?%6i1_B$$Pj9Mfr(Hnz*-!?>QGVDf`8@Z6 zmcUy`W>5e2nHO?g6yX_&pkH)>1SA&&&-JL9h=Kw!Hofp^IA z=KAL06`?1>V_qyUXQ!`dw}2MMQihr7*(#Vba*zaFX1j!AkOV^#97YPlt-=Tz$i8)` zQF)V#9o(q|bV2FA!GS8hfW_Vk+|l>HU`0eLUK3lR6Ko=RgQ1@(4XfA;>wwM56NLm^ zxLY;tCpX!Vuq_6@MmO{Fdc?1i9LKnN!mnBk1zs)hq@p2%nlzVi?wHeNSEHgw?{Mzy z6`;9yCwE@)I$oD@^}aweoqwAr^-i(kVW=LLNa5onp98;0{Sv6H8Tf+ffYVc!JJmBg zy}Qz~_R{K!+EcuA?YC|K78TIOvOS76JNH*DW5N=y75g%W69v>OW}mtwPs^008dndt zE1>`}wBrXj75{Tx)G)tJ^Ce70HiLS zKaoYj93r@MU6ECp)2U1~{Hiki4=Sc{;SCDCbHYm^NQ0bngnyw~c-&;DEvp(|6X+>a zVg~M;N3;2H38i;xm(uOk4C;-=Oi0nNz4V~6Nm@VP=VhmI^ChgZewsT-&taZ%Usx0z zO(?VM)+4|MP7o<|2oA_jyoJOAUZ^$301p;$*8?%$b{=!hkb$n-t24=MdISQ!p|#+B zmEwbSosG|h%tdAnn2*i!HeYcH;h#B81*dWC&_n2*+g|%mU`79P-mEU&FiD z5;RcT$2MNQ>Lx<>$IU~{FNDVN9@yqJ{_5In!;2?@J_R~Jqjc{r!DA3jy|6+$P0>2d zSm~Ao@ww6D(E|Feb%pANvco#0UN8v%+|9FNUd9NfF21W1c5O#2ExdMtQ_<=k&@9Y;Vb5qyr$EivjP)QLuReX>w zFU>2n52Kg&<7vm7iQ}|%PrI}ICAlR>KOi+o)IBVS@tF2aqx;q1=e2y97M*s^G( zh|L|zVTvGaGX;6%SdhlPo(>^~QJH&qAjYOY!Dg4_jO9oN-MWEaC)!tr< znE;E2vqp%0tqK9~H(M<%Yoopq*NvOTZxXD>v99^%E$y-DABUgFX7I(j(`+r%>9c4@ zvsEj;5tVY;wBs*Yqu`Gyl(1WEGgnWsgL5(u^jm$4GlT+%Q8?~2K_z_N^y-2@Ji$0E z!MJbU9UFRJR4+6p0-!iBe-MoYX@ndd>^_zek;I^5uGOR@Cq();!r^tfC)Lrs%r z;hJB~abjzB+pXrzv1il)TlBg0a*ox_Drp8ilwgFT$=4K?(x+T z?^{_nuXDw97%b5J&KA?|w3x{GH&tp(d`?e#P9KQTOzAdQt%K?_q402!aJd~9!U{gS!D+={3o&RzbkBgmlnHlE zV`ZozJ> z?`|-R7KL&?+p`WNUX<_kp7ZeR_li!E4D=IQkva5 zLM*B?Q@__r^Yjv!vl zT3b`=wd?2fP$uW7=ggEx-EUBTakzC8;tBkj-uc_W|Hk3w_*V|MrMJ1Ivpdkq@gH<< zfUB#ME8zb){ujABEon^YgBW_mTe9UQI<$+(@epm)4MYWQ2DHR&fvZ!)5cfdy3GpJ$ zRe)fUH!It=KQzg(j!*#`Gu%Q}URCznTUFWf!TB$YUK|{0wy?0seO@&gOvH>`y$8AH zmf{~9>0L3Ys0b&D*i|+;Dh9P9A);XpZ@ldE_S!4>@oZ-h6k+o$F)V2*NX1T)9EtWf ztWp)9JeXf)PJ5p~#l?5`nxx7U*sDV3&5!JI({ja19dWCs_!e+ zEMLRQnr$JGH25*10BVG_4#We~wuRKg!4{hR(~cp+KF(>lAq)3H#=iPDyDIv=QyDve zz#;e{NW6-wBV7b1NC>h2_}fKxy1Re>E{Oy8SKJBb5ft=8ws_T`p(S%&z)5$|23krj*gbD|5F?CZy^j% zo^o6eMIU*~8TPcDr>5kLd!P*lC4GmNH-Jh@gruY06_vl(Xi&uEv)lLhOmW#4NAnpe ziILq_?@@)EkC%*^cdt?qXqK=CS<3PxiGZ-dl=ryrA z>CL_9BOeah4)V~1q*P2_H$$3&CtjClP~C>SS*6rg_$XMF@W&xs;jt$yT~BJiHeU9* zx}^0ut$AD_=SSII8a-C~RskAn-U`;mqaZ7$4&K=8P~RB-kp}DuiC;9TShhXosZpVc zc0X8WU4z#Wm?bo0bwJLfW{SbqKj4th*aq~_>2jUZkiB^^mJ{xG0$=@~nIA5rC+Bh@ zCD@|!7QEBCHFn1={7H9T-I*iwMDW#Al}g8ELWlNcY$LSZZh;j*YsTh73aF=Q0$96D zqSIj!E2ECQgZQl|=|NacSoV z5QRSPoo{A`1aKC`-g+uN@!M-SN7rak58yCE4cn?>Sk+XoQhUVwNH_NyQ@(LJND!eh&52j(E3)-daA)R*=@PSQ zBt;uHxwZ=>;#A6G5ACmvBQ}p`P%^8{~PxIDS`QSoPWN+e-+-p4Z-4H zaQ=VG@V`&+&uITu2mZDV%YT{RKURf*NBn2}|H_iT4bA3Xaz;fS2KFx}-1|ZFUZ9lU I-4GD}10dZC>;M1& literal 0 HcmV?d00001 diff --git a/lib/bld/bld-wrapper.properties b/lib/bld/bld-wrapper.properties new file mode 100644 index 0000000..5daccca3 --- /dev/null +++ b/lib/bld/bld-wrapper.properties @@ -0,0 +1,9 @@ +bld.downloadExtensionJavadoc=false +bld.downloadExtensionSources=true +bld.extension-pmd=com.uwyn.rife2:bld-pmd:0.9.2 +bld.extension-jacoco=com.uwyn.rife2:bld-jacoco-report:0.9.0 +bld.extensions-testng=com.uwyn.rife2:bld-testng:0.9.1-SNAPSHOT +bld.repositories=MAVEN_CENTRAL,RIFE2_SNAPSHOTS,RIFE2_RELEASES +bld.downloadLocation= +bld.sourceDirectories= +bld.version=1.7.1 diff --git a/pandoc.sh b/pandoc.sh new file mode 100755 index 0000000..2ac666d --- /dev/null +++ b/pandoc.sh @@ -0,0 +1,9 @@ +#!/bin/sh + +pandoc --from gfm \ +--to html5 \ +--metadata "pagetitle=Semantic Version Annotation Processor" \ +-s \ +-c docs/github-pandoc.css \ +-o docs/README.html \ +README.md diff --git a/pom.xml b/pom.xml new file mode 100644 index 0000000..8bb99f9 --- /dev/null +++ b/pom.xml @@ -0,0 +1,38 @@ + + + 4.0.0 + net.thauvin.erik.semver + semver + 1.2.1-SNAPSHOT + SemVer + Semantic Version Annotation Processor + https://github.com/ethauvin/semver + + + The BSD 3-Clause License + http://opensource.org/licenses/BSD-3-Clause + + + + + com.github.spullara.mustache.java + compiler + 0.9.10 + compile + + + + + ethauvin + Erik C. Thauvin + erik@thauvin.net + https://erik.thauvin.net/ + + + + scm:git:https://github.com/ethauvin/semver.git + scm:git:git@github.com:ethauvin/semver.git + https://github.com/ethauvin/semver + + diff --git a/preflightcheck.sh b/preflightcheck.sh deleted file mode 100755 index 76c698d..0000000 --- a/preflightcheck.sh +++ /dev/null @@ -1,201 +0,0 @@ -#!/bin/bash - -# set source and test locations -src="src/main/java/net/thauvin/erik/semver" -test="src/test/java/net/thauvin/erik/semver" -# e.g: .java, .kt, etc. -ext=".java" -java8=true -# e.g: -declare -a examples=( - "examples/java run runExample" - "examples/kotlin run runJava runExample runJavaExample") -# e.g: empty or javadoc, etc. -gradle_doc="javadoc pandoc" -# e.g. empty or sonarqube -gradle_sonar="sonar" -# gradle options for examples -gradle_opts="--console=plain --no-build-cache --no-daemon" -# maven arguments for examples -maven_args="compile exec:java" - -# -# Version: 1.1.5 -# - -if [ "$java8" = true ]; then - export JAVA_HOME="$JAVA8_HOME" - export PATH="$(cygpath "$JAVA_HOME")/bin:$PATH" -fi - -pwd=$PWD -red=$(tput setaf 1) -cyan=$(tput setaf 6) -std=$(tput sgr0) -date=$(date +%Y) - -pause() { - read -p "Press [Enter] key to continue..." -} - -checkCopyright() { - if [ "$(grep -c "$date" "$1")" == "0" ]; then - echo -e " Invalid: ${red}$f${std}" - else - echo -e " Checked: $1" - fi -} - -runGradle() { - cd "$1" || exit 1 - clear - reset - echo -e "> Project: ${cyan}${1}${std} [Gradle]" - shift - ./gradlew $@ || exit 1 - pause - cd "$pwd" -} - -runKobalt() { - cd "$1" || exit 1 - if [ -f kobalt/src/Build.kt ]; then - clear - reset - echo -e "> Project: ${cyan}${1}${std} [Kobalt]" - shift - ./kobaltw $@ || exit 1 - pause - fi - cd "$pwd" -} - -runMaven() { - cd "$1" || exit 1 - if [ -f pom.xml ]; then - clear - reset - echo -e "> Project: ${cyan}${1}${std} [Maven]" - shift - mvn $@ || exit 1 - pause - fi - cd "$pwd" -} - -updateWrappers() { - clear - ./updatewrappers.sh - pause -} - -checkDeps() { - clear - echo -e "${cyan}Checking depencencies...${std}" - gradle --console=plain dU || exit 1 - read -p "Check Examples depencencies? [y/n] " cont - clear - case $cont in - [Nn]) return ;; - *) for ex in "${!examples[@]}"; do - runGradle $(echo "${examples[ex]}" | cut -d " " -f 1) dU - # runKobalt $(echo "${examples[ex]}" | cut -d " " -f 1) checkVersions - runMaven $(echo "${examples[ex]}" | cut -d " " -f 1) versions:display-dependency-updates - if [ "$ex" -eq "${#examples}" ]; then - read -p "Continue? [y/n]: " cont - clear - case $cont in - *) continue ;; - [Nn]) return ;; - esac - fi - done ;; - esac -} - -gradleCheck() { - clear - echo -e "${cyan}Checking Gradle build....${std}" - gradle $gradle_opts clean check $gradle_doc $gradle_sonar || exit 1 - pause -} - -runExamples() { - for ex in "${!examples[@]}"; do - runGradle ${examples[ex]} clean $gradle_opts - # runKobalt ${examples[ex]} clean - runMaven $(echo "${examples[ex]}" | cut -d " " -f 1) clean $maven_args - done -} - -examplesMenu() { - clear - echo -e "${cyan}Examples${std}" - for ex in "${!examples[@]}"; do - printf ' %d. %s\n' $(($ex + 1)) $(echo "${examples[ex]}" | cut -d " " -f 1) - done - echo " $((${#examples[@]} + 1)). Run All Examples" - read -p "Enter choice [1-${#examples[@]}]: " choice - clear - case $choice in - [0-9]) if [ "$choice" -gt "${#examples[@]}" ]; then - runExamples - examplesMenu - else - runGradle ${examples[$(($choice - 1))]} - # runKobalt ${examples[$(($choice - 1))]} - runMaven $(echo "${examples[$(($choice - 1))]}" | cut -d " " -f 1) $maven_args - examplesMenu - fi ;; - *) return ;; - esac -} - -validateCopyrights() { - clear - echo -e "${cyan}Validating copyrights...${std}" - for f in "LICENSE.txt" ${src}/*${ext} ${test}/*${ext}; do - if [ -f "$f" ]; then - checkCopyright "$f" - fi - done - pause -} - -everything() { - updateWrappers - checkDeps - gradleCheck - runExamples - validateCopyrights -} - -showMenu() { - clear - echo "${cyan}Preflight Check${std}" - echo " 1. Update Wrappers" - echo " 2. Check Dependencies" - echo " 3. Check Gradle Build" - echo " 4. Run Examples" - echo " 5. Validate Copyrights" - echo " 6. Check Everything" -} - -readOptions() { - local choice - read -p "Enter choice [1-6]: " choice - case $choice in - 1) updateWrappers ;; - 2) checkDeps ;; - 3) gradleCheck ;; - 4) examplesMenu ;; - 5) validateCopyrights ;; - 6) everything ;; - *) exit 0 ;; - esac -} - -while true; do - showMenu - readOptions -done diff --git a/settings.gradle b/settings.gradle deleted file mode 100644 index 0b39698..0000000 --- a/settings.gradle +++ /dev/null @@ -1,19 +0,0 @@ -/* - * This settings file was auto generated by the Gradle buildInit task - * by 'erik' at '1/13/16 1:03 PM' with Gradle 2.10 - * - * The settings file is used to specify which projects to include in your build. - * In a single project build this file can be empty or even removed. - * - * Detailed information about configuring a multi-project build in Gradle can be found - * in the user guide at https://docs.gradle.org/2.10/userguide/multi_project_builds.html - */ - -/* -// To declare projects as part of a multi-project build use the 'include' method -include 'shared' -include 'api' -include 'services:webservice' -*/ -rootProject.name = 'semver' - diff --git a/sonar-project.properties b/sonar-project.properties new file mode 100644 index 0000000..3c63dd8 --- /dev/null +++ b/sonar-project.properties @@ -0,0 +1,7 @@ +sonar.organization=ethauvin-github +sonar.projectKey=ethauvin_semver +sonar.coverage.jacoco.xmlReportPaths=build/reports/jacoco/test/jacocoTestReport.xml +sonar.sources=src/main/java/ +sonar.tests=src/test/java/ +sonar.java.binaries=build/main,build/test +sonar.java.libraries=lib/compile/*.jar diff --git a/src/bld/java/net/thauvin/erik/semver/SemverBuild.java b/src/bld/java/net/thauvin/erik/semver/SemverBuild.java new file mode 100644 index 0000000..8c5de48 --- /dev/null +++ b/src/bld/java/net/thauvin/erik/semver/SemverBuild.java @@ -0,0 +1,147 @@ +/* + * SemverBuild.java + * + * Copyright (c) 2016-2023, Erik C. Thauvin (erik@thauvin.net) + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, this + * list of conditions and the following disclaimer. + * + * Redistributions in binary form must reproduce the above copyright notice, + * this list of conditions and the following disclaimer in the documentation + * and/or other materials provided with the distribution. + * + * Neither the name of this project nor the names of its contributors may be + * used to endorse or promote products derived from this software without + * specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR + * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, + * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +package net.thauvin.erik.semver; + +import rife.bld.BuildCommand; +import rife.bld.Project; +import rife.bld.extension.JacocoReportOperation; +import rife.bld.extension.PmdOperation; +import rife.bld.extension.TestNgOperation; +import rife.bld.publish.*; +import rife.tools.exceptions.FileUtilsErrorException; + +import java.io.IOException; +import java.nio.file.Path; +import java.util.List; + +import static rife.bld.dependencies.Repository.*; +import static rife.bld.dependencies.Scope.compile; +import static rife.bld.dependencies.Scope.test; +import static rife.bld.operations.JavadocOptions.DocLinkOption.NO_MISSING; + +public class SemverBuild extends Project { + public SemverBuild() { + pkg = "net.thauvin.erik.semver"; + name = "SemVer"; + version = version(1, 2, 1, "SNAPSHOT"); + + var description = "Semantic Version Annotation Processor"; + var url = "https://github.com/ethauvin/semver"; + + javaRelease = 17; + + downloadSources = true; + repositories = List.of(MAVEN_CENTRAL, SONATYPE_SNAPSHOTS); + + scope(compile) + .include(dependency("com.github.spullara.mustache.java", "compiler", + version(0, 9, 10))); + scope(test) + .include(dependency("org.testng", "testng", version(7, 8, 0))); + + javadocOperation().javadocOptions() + .tag("created.on", "a", "Created on:") + .windowTitle(name + ' ' + version.toString() + " API") + .docLint(NO_MISSING); + + publishOperation() + .repository(version.isSnapshot() ? repository(SONATYPE_SNAPSHOTS_LEGACY.location()) + .withCredentials(property("sonatype.user"), property("sonatype.password")) + : repository(SONATYPE_RELEASES.location()) + .withCredentials(property("sonatype.user"), property("sonatype.password"))) + .repository(MAVEN_LOCAL) + .info(new PublishInfo() + .groupId(pkg) + .artifactId(name.toLowerCase()) + .name(name).version(version) + .description(description) + .url(url) + .developer(new PublishDeveloper() + .id("ethauvin") + .name("Erik C. Thauvin") + .email("erik@thauvin.net") + .url("https://erik.thauvin.net/")) + .license(new PublishLicense() + .name("The BSD 3-Clause License") + .url("http://opensource.org/licenses/BSD-3-Clause")) + .scm(new PublishScm() + .connection("scm:git:" + url + ".git") + .developerConnection("scm:git:git@github.com:ethauvin/" + name.toLowerCase() + ".git") + .url(url)) + .signKey(property("sign.key")) + .signPassphrase(property("sign.passphrase"))); + } + + public static void main(String[] args) { + new SemverBuild().start(args); + } + + @BuildCommand(summary = "Generates JaCoCo Reports") + public void jacoco() throws IOException { + new JacocoReportOperation().fromProject(this).execute(); + } + + @BuildCommand(summary = "Runs PMD analysis") + public void pmd() { + new PmdOperation() + .fromProject(this) + .failOnViolation(true) + .ruleSets("config/pmd.xml") + .execute(); + } + + private void rootPom() throws FileUtilsErrorException { + PomBuilder.generateInto(publishOperation().info(), publishOperation().dependencies(), + Path.of(workDirectory.getPath(), "pom.xml").toFile()); + } + + @BuildCommand(summary = "Run tests with TestNG") + public void test() throws Exception { + new TestNgOperation() + .fromProject(this) + .packages("net.thauvin.erik.semver") + .execute(); + } + + @Override + public void publish() throws Exception { + super.publish(); + rootPom(); + } + + @Override + public void publishLocal() throws Exception { + super.publishLocal(); + rootPom(); + } +} diff --git a/src/main/java/net/thauvin/erik/semver/Constants.java b/src/main/java/net/thauvin/erik/semver/Constants.java index 27c0733..8dbc3d5 100644 --- a/src/main/java/net/thauvin/erik/semver/Constants.java +++ b/src/main/java/net/thauvin/erik/semver/Constants.java @@ -36,9 +36,10 @@ package net.thauvin.erik.semver; * The Constants class holds the constant variables used throughout this project. * * @author Erik C. Thauvin - * @created 2016-01-13 + * @created.on 2016-01-13 * @since 1.0 */ +@SuppressWarnings("PMD.DataClass") public final class Constants { /** * The default metadata prefix. diff --git a/src/main/java/net/thauvin/erik/semver/Version.java b/src/main/java/net/thauvin/erik/semver/Version.java index 98b18db..9e73b07 100644 --- a/src/main/java/net/thauvin/erik/semver/Version.java +++ b/src/main/java/net/thauvin/erik/semver/Version.java @@ -41,7 +41,7 @@ import java.lang.annotation.Target; * The Version class implements the annotation interface. * * @author Erik C. Thauvin - * @created 2016-01-13 + * @created.on 2016-01-13 * @since 1.0 */ @SuppressWarnings("SameReturnValue") diff --git a/src/main/java/net/thauvin/erik/semver/VersionInfo.java b/src/main/java/net/thauvin/erik/semver/VersionInfo.java index 297dc08..3fb3437 100644 --- a/src/main/java/net/thauvin/erik/semver/VersionInfo.java +++ b/src/main/java/net/thauvin/erik/semver/VersionInfo.java @@ -36,7 +36,7 @@ package net.thauvin.erik.semver; * The VersionInfo class is used to hold and retrieve the semantic version values. * * @author Erik C. Thauvin - * @created 2016-01-16 + * @created.on 2016-01-16 * @since 1.0 */ @SuppressWarnings("PMD.DataClass") @@ -101,15 +101,6 @@ public class VersionInfo { return buildMeta; } - /** - * Sets the build meta-data. - * - * @param buildMeta The new build meta-data. - */ - public void setBuildMeta(final String buildMeta) { - this.buildMeta = buildMeta; - } - /** * Returns the meta-data prefix. * @@ -119,15 +110,6 @@ public class VersionInfo { return buildMetaPrefix; } - /** - * Sets the meta-data prefix. - * - * @param buildMetaPrefix The meta-data prefix. - */ - public void setBuildMetaPrefix(final String buildMetaPrefix) { - this.buildMetaPrefix = buildMetaPrefix; - } - /** * Returns the class name. * @@ -137,15 +119,6 @@ public class VersionInfo { return className; } - /** - * Sets the class name. - * - * @param className The new class name. - */ - public void setClassName(final String className) { - this.className = className; - } - /** * Returns the build epoch/Unix timestamp. * @@ -164,15 +137,6 @@ public class VersionInfo { return major; } - /** - * Sets the major version. - * - * @param major The new major version. - */ - public void setMajor(final int major) { - this.major = major; - } - /** * Returns the major version. * @@ -182,15 +146,6 @@ public class VersionInfo { return minor; } - /** - * Sets the minor version. - * - * @param minor The new minor version. - */ - public void setMinor(final int minor) { - this.minor = minor; - } - /** * Returns the package name. * @@ -200,15 +155,6 @@ public class VersionInfo { return packageName; } - /** - * Sets the package name. - * - * @param packageName The new package name. - */ - public void setPackageName(final String packageName) { - this.packageName = packageName; - } - /** * Returns the patch version. * @@ -218,15 +164,6 @@ public class VersionInfo { return patch; } - /** - * Sets the patch version. - * - * @param patch The new patch version. - */ - public void setPatch(final int patch) { - this.patch = patch; - } - /** * Returns the pre-release version. * @@ -236,15 +173,6 @@ public class VersionInfo { return preRelease; } - /** - * Sets the pre-release version. - * - * @param preRelease The new pre-release version. - */ - public void setPreRelease(final String preRelease) { - this.preRelease = preRelease; - } - /** * Returns the pre-release prefix. * @@ -254,15 +182,6 @@ public class VersionInfo { return preReleasePrefix; } - /** - * Sets the pre-release prefix. - * - * @param preReleasePrefix The new pre-release prefix. - */ - public void setPreReleasePrefix(final String preReleasePrefix) { - this.preReleasePrefix = preReleasePrefix; - } - /** * Returns the project name. * @@ -272,15 +191,6 @@ public class VersionInfo { return project; } - /** - * Sets the project name. - * - * @param project The new project name. - */ - public void setProject(final String project) { - this.project = project; - } - /** * Sames as {@link #getVersion()}. * @@ -299,15 +209,6 @@ public class VersionInfo { return separator; } - /** - * Sets the version separator. - * - * @param separator The new version separator. - */ - public void setSeparator(final String separator) { - this.separator = separator; - } - /** * Returns the full version string. * @@ -334,7 +235,106 @@ public class VersionInfo { + minor + separator + patch - + (preRelease.length() > 0 ? preReleasePrefix + preRelease : "") - + (buildMeta.length() > 0 ? buildMetaPrefix + buildMeta : ""); + + (!preRelease.isEmpty() ? preReleasePrefix + preRelease : "") + + (!buildMeta.isEmpty() ? buildMetaPrefix + buildMeta : ""); + } + + /** + * Sets the build meta-data. + * + * @param buildMeta The new build meta-data. + */ + public void setBuildMeta(final String buildMeta) { + this.buildMeta = buildMeta; + } + + /** + * Sets the meta-data prefix. + * + * @param buildMetaPrefix The meta-data prefix. + */ + public void setBuildMetaPrefix(final String buildMetaPrefix) { + this.buildMetaPrefix = buildMetaPrefix; + } + + /** + * Sets the class name. + * + * @param className The new class name. + */ + public void setClassName(final String className) { + this.className = className; + } + + /** + * Sets the major version. + * + * @param major The new major version. + */ + public void setMajor(final int major) { + this.major = major; + } + + /** + * Sets the minor version. + * + * @param minor The new minor version. + */ + public void setMinor(final int minor) { + this.minor = minor; + } + + /** + * Sets the package name. + * + * @param packageName The new package name. + */ + public void setPackageName(final String packageName) { + this.packageName = packageName; + } + + /** + * Sets the patch version. + * + * @param patch The new patch version. + */ + public void setPatch(final int patch) { + this.patch = patch; + } + + /** + * Sets the pre-release version. + * + * @param preRelease The new pre-release version. + */ + public void setPreRelease(final String preRelease) { + this.preRelease = preRelease; + } + + /** + * Sets the pre-release prefix. + * + * @param preReleasePrefix The new pre-release prefix. + */ + public void setPreReleasePrefix(final String preReleasePrefix) { + this.preReleasePrefix = preReleasePrefix; + } + + /** + * Sets the project name. + * + * @param project The new project name. + */ + public void setProject(final String project) { + this.project = project; + } + + /** + * Sets the version separator. + * + * @param separator The new version separator. + */ + public void setSeparator(final String separator) { + this.separator = separator; } } diff --git a/src/main/java/net/thauvin/erik/semver/VersionProcessor.java b/src/main/java/net/thauvin/erik/semver/VersionProcessor.java index 878f478..1c9f150 100644 --- a/src/main/java/net/thauvin/erik/semver/VersionProcessor.java +++ b/src/main/java/net/thauvin/erik/semver/VersionProcessor.java @@ -56,7 +56,7 @@ import java.util.Set; * The VersionProcessor class implements a semantic version annotation processor. * * @author Erik C. Thauvin - * @created 2016-01-13 + * @created.on 2016-01-13 * @since 1.0 */ @SuppressWarnings({"PMD.GuardLogStatement", "PMD.BeanMembersShouldSerialize"}) @@ -66,10 +66,24 @@ public class VersionProcessor extends AbstractProcessor { private Messager messager; + private static String getTemplate(final boolean isLocalTemplate, final Version version) { + final String template; + if (isLocalTemplate && Constants.DEFAULT_JAVA_TEMPLATE.equals(version.template())) { + template = Constants.DEFAULT_TEMPLATE_NAME; + } else if (Constants.DEFAULT_JAVA_TEMPLATE.equals(version.template()) && Constants.KOTLIN_TYPE + .equals(version.type())) { + template = Constants.DEFAULT_KOTLIN_TEMPLATE; + } else { + template = version.template(); + } + return template; + } + private void error(final String s) { log(Diagnostic.Kind.ERROR, s); } + @SuppressWarnings("PMD.UnusedPrivateMethod") private void error(final String s, final Throwable t) { log(Diagnostic.Kind.ERROR, t != null ? t.toString() : s); } @@ -77,7 +91,7 @@ public class VersionProcessor extends AbstractProcessor { private VersionInfo findValues(final Version version) throws IOException { final VersionInfo versionInfo = new VersionInfo(version); - if (version.properties().length() > 0) { + if (!version.properties().isEmpty()) { final File propsFile = getLocalFile(version.properties()); if (propsFile.isFile() && propsFile.canRead()) { note("Found properties: " + propsFile.getName() + " (" + propsFile.getAbsoluteFile().getParent() + ')'); @@ -180,15 +194,7 @@ public class VersionProcessor extends AbstractProcessor { versionInfo.setPackageName(packageElement.getQualifiedName().toString()); } note("Found version: " + versionInfo.getVersion()); - final String template; - if (isLocalTemplate && Constants.DEFAULT_JAVA_TEMPLATE.equals(version.template())) { - template = Constants.DEFAULT_TEMPLATE_NAME; - } else if (Constants.DEFAULT_JAVA_TEMPLATE.equals(version.template()) && Constants.KOTLIN_TYPE - .equals(version.type())) { - template = Constants.DEFAULT_KOTLIN_TEMPLATE; - } else { - template = version.template(); - } + final String template = getTemplate(isLocalTemplate, version); writeTemplate(version.type(), versionInfo, template); } catch (IOException | MustacheNotFoundException e) { diff --git a/src/main/java/net/thauvin/erik/semver/package.html b/src/main/java/net/thauvin/erik/semver/package.html index e37a084..1b1b126 100644 --- a/src/main/java/net/thauvin/erik/semver/package.html +++ b/src/main/java/net/thauvin/erik/semver/package.html @@ -1,35 +1,3 @@ - - diff --git a/src/main/resources/META-INF/services/javax.annotation.processing.Processor b/src/main/resources/META-INF/services/javax.annotation.processing.Processor index 44488e0..5ae1016 100644 --- a/src/main/resources/META-INF/services/javax.annotation.processing.Processor +++ b/src/main/resources/META-INF/services/javax.annotation.processing.Processor @@ -1 +1,33 @@ +# +# javax.annotation.processing.Processor +# +# Copyright (c) 2016-2023, Erik C. Thauvin (erik@thauvin.net) +# All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions are met: +# +# Redistributions of source code must retain the above copyright notice, this +# list of conditions and the following disclaimer. +# +# Redistributions in binary form must reproduce the above copyright notice, +# this list of conditions and the following disclaimer in the documentation +# and/or other materials provided with the distribution. +# +# Neither the name of this project nor the names of its contributors may be +# used to endorse or promote products derived from this software without +# specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" +# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +# DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE +# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR +# SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER +# CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, +# OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# + net.thauvin.erik.semver.VersionProcessor diff --git a/src/main/resources/semver-kt.mustache b/src/main/resources/semver-kt.mustache index 0151a5e..0a58f86 100644 --- a/src/main/resources/semver-kt.mustache +++ b/src/main/resources/semver-kt.mustache @@ -1,38 +1,38 @@ /* - * This file is automatically generated. - * Do not modify! -- ALL CHANGES WILL BE ERASED! - */ - +* This file is automatically generated. +* Do not modify! -- ALL CHANGES WILL BE ERASED! +*/ + package {{packageName}} import java.util.Date /** - * Provides semantic version information. - * - * @author Semantic Version Annotation Processor - */ +* Provides semantic version information. +* +* @author Semantic Version Annotation Processor +*/ object {{className}} { - @JvmField - val PROJECT = "{{project}}" - @JvmField - val BUILDDATE = Date({{epoch}}L) - @JvmField - val MAJOR = {{major}} - @JvmField - val MINOR = {{minor}} - @JvmField - val PATCH = {{patch}} - @JvmField - val PRERELEASE = "{{preRelease}}" - @JvmField - val PRERELEASE_PREFIX = "{{preReleasePrefix}}" - @JvmField - val BUILDMETA = "{{buildMeta}}" - @JvmField - val BUILDMEATA_PREFIX = "{{buildMetaPrefix}}" - @JvmField - val SEPARATOR = "{{separator}}" - @JvmField - val VERSION = "{{version}}" +@JvmField +val PROJECT = "{{project}}" +@JvmField +val BUILDDATE = Date({{epoch}}L) +@JvmField +val MAJOR = {{major}} +@JvmField +val MINOR = {{minor}} +@JvmField +val PATCH = {{patch}} +@JvmField +val PRERELEASE = "{{preRelease}}" +@JvmField +val PRERELEASE_PREFIX = "{{preReleasePrefix}}" +@JvmField +val BUILDMETA = "{{buildMeta}}" +@JvmField +val BUILDMEATA_PREFIX = "{{buildMetaPrefix}}" +@JvmField +val SEPARATOR = "{{separator}}" +@JvmField +val VERSION = "{{version}}" } diff --git a/src/main/resources/semver.mustache b/src/main/resources/semver.mustache index be65867..cd7c567 100644 --- a/src/main/resources/semver.mustache +++ b/src/main/resources/semver.mustache @@ -1,34 +1,34 @@ /* - * This file is automatically generated. - * Do not modify! -- ALL CHANGES WILL BE ERASED! - */ - +* This file is automatically generated. +* Do not modify! -- ALL CHANGES WILL BE ERASED! +*/ + package {{packageName}}; import java.util.Date; /** - * Provides semantic version information. - * - * @author Semantic Version Annotation Processor - */ +* Provides semantic version information. +* +* @author Semantic Version Annotation Processor +*/ public final class {{className}} { - public static final String PROJECT = "{{project}}"; - public static final Date BUILDDATE = new Date({{epoch}}L); - public static final int MAJOR = {{major}}; - public static final int MINOR = {{minor}}; - public static final int PATCH = {{patch}}; - public static final String PRERELEASE = "{{preRelease}}"; - public static final String PRERELEASE_PREFIX = "{{preReleasePrefix}}"; - public static final String BUILDMETA = "{{buildMeta}}"; - public static final String BUILDMETA_PREFIX = "{{buildMetaPrefix}}"; - public static final String SEPARATOR = "{{separator}}"; - public static final String VERSION = "{{version}}"; +public static final String PROJECT = "{{project}}"; +public static final Date BUILDDATE = new Date({{epoch}}L); +public static final int MAJOR = {{major}}; +public static final int MINOR = {{minor}}; +public static final int PATCH = {{patch}}; +public static final String PRERELEASE = "{{preRelease}}"; +public static final String PRERELEASE_PREFIX = "{{preReleasePrefix}}"; +public static final String BUILDMETA = "{{buildMeta}}"; +public static final String BUILDMETA_PREFIX = "{{buildMetaPrefix}}"; +public static final String SEPARATOR = "{{separator}}"; +public static final String VERSION = "{{version}}"; - /** - * Disables the default constructor. - */ - private {{className}}() { - throw new UnsupportedOperationException("Illegal constructor call."); - } +/** +* Disables the default constructor. +*/ +private {{className}}() { +throw new UnsupportedOperationException("Illegal constructor call."); +} } diff --git a/src/test/java/net/thauvin/erik/semver/ConstantsTest.java b/src/test/java/net/thauvin/erik/semver/ConstantsTest.java index 0847819..ace903e 100644 --- a/src/test/java/net/thauvin/erik/semver/ConstantsTest.java +++ b/src/test/java/net/thauvin/erik/semver/ConstantsTest.java @@ -38,13 +38,13 @@ import org.testng.annotations.Test; import java.util.ArrayList; import java.util.List; -import static org.testng.Assert.assertEquals; +import static org.testng.Assert.assertEquals; // NOPMD /** * The ConstantsTest class. * * @author Erik C. Thauvin - * @created 2019-04-14 + * @created.on 2019-04-14 * @since 1.0 */ public class ConstantsTest { diff --git a/src/test/java/net/thauvin/erik/semver/VersionInfoTest.java b/src/test/java/net/thauvin/erik/semver/VersionInfoTest.java index 47b0436..fe08c3f 100644 --- a/src/test/java/net/thauvin/erik/semver/VersionInfoTest.java +++ b/src/test/java/net/thauvin/erik/semver/VersionInfoTest.java @@ -37,13 +37,13 @@ import org.testng.annotations.Test; import java.util.Date; -import static org.testng.Assert.assertEquals; +import static org.testng.Assert.assertEquals; // NOPMD /** * The VersionInfoTest class. * * @author Erik C. Thauvin - * @created 2016-02-03 + * @created.on 2016-02-03 * @since 1.0 */ public class VersionInfoTest { diff --git a/src/test/java/net/thauvin/erik/semver/VersionProcessorTest.java b/src/test/java/net/thauvin/erik/semver/VersionProcessorTest.java index 5fe3e12..674bb31 100644 --- a/src/test/java/net/thauvin/erik/semver/VersionProcessorTest.java +++ b/src/test/java/net/thauvin/erik/semver/VersionProcessorTest.java @@ -38,13 +38,13 @@ import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; import java.util.Properties; -import static org.testng.Assert.assertEquals; +import static org.testng.Assert.assertEquals; // NOPMD /** * The VersionProcessorTest class. * * @author Erik C. Thauvin - * @created 2019-04-02 + * @created.on 2019-04-02 * @since 1.2.0 */ public class VersionProcessorTest { diff --git a/src/test/java/net/thauvin/erik/semver/VersionTest.java b/src/test/java/net/thauvin/erik/semver/VersionTest.java index 8c2a76e..0153b1d 100644 --- a/src/test/java/net/thauvin/erik/semver/VersionTest.java +++ b/src/test/java/net/thauvin/erik/semver/VersionTest.java @@ -38,7 +38,7 @@ import java.lang.annotation.Annotation; * The VersionTest class. * * @author Erik C. Thauvin - * @created 2019-04-02 + * @created.on 2019-04-02 * @since 1.2.0 */ @SuppressWarnings({"ClassExplicitlyAnnotation", "SameReturnValue", "java:S2187", "PMD.TestClassWithoutTestCases"}) diff --git a/updatewrappers.sh b/updatewrappers.sh deleted file mode 100755 index b841e09..0000000 --- a/updatewrappers.sh +++ /dev/null @@ -1,60 +0,0 @@ -#!/bin/bash - -# -# Version: 1.0.2 -# - -# set the examples directories -declare -a dirs=( - "${PWD##*/}" - "examples/java" - "examples/kotlin") -java8=true - -### - -pwd=$PWD -cyan=$(tput setaf 6) -green=$(tput setaf 2) -red=$(tput setaf 1) -std=$(tput sgr0) - -#if [ "$java8" = true ] -#then -# export JAVA_HOME="$JAVA8_HOME" -# export PATH="$(cygpath "$JAVA_HOME")/bin:$PATH" -#fi - -#kVer=$(kobaltw --version | awk '{print substr($2, 1, length($2)-1)}') -updateWrappers() { - curVer="$(gradle --version | awk '/Gradle/ {print $2}')" - if [ -d gradle ]; then - if [ "$curVer" != "$(./gradlew --version | awk '/Gradle/ {print $2}')" ]; then - gradle -q --console=plain wrapper - echo -e " $(./gradlew --version | awk '/Gradle/') ${green}UPDATED${std}" - else - echo -e " Gradle $curVer UP-TO-DATE" - fi - fi - # if [ -d kobalt ]; then - # kw=$(cut -d "=" -f 2 kobalt/wrapper/kobalt-wrapper.properties) - # if [ "$kw" = "$kVer" ] - # then - # echo -e " Kobalt $kw UP-TO-DATE" - # else - # echo -e "kobalt.version=$kVer" > kobalt/wrapper/kobalt-wrapper.properties - # echo -e " Kobalt $kVer ${green}UPDATED${std}" - # fi - # fi -} - -echo -e "Updating wrappers..." - -for d in "${!dirs[@]}"; do - if [ "$d" -ne 0 ]; then - cd "${dirs[d]}" || exit 1 - fi - echo -e " ${cyan}${dirs[d]}${std}" - updateWrappers - cd "$pwd" -done