From f8101bb2e9c4841f824e9cff83b9669d890f4458 Mon Sep 17 00:00:00 2001 From: "Erik C. Thauvin" Date: Tue, 17 Mar 2020 22:39:29 -0700 Subject: [PATCH] Updated dependencies and copyright. --- .circleci/config.yml | 3 +- .gitignore | 53 +++++++++--------- .idea/jarRepositories.xml | 30 ++++++++++ .idea/misc.xml | 3 + .idea/modules/examples-kotlin_main.iml | 23 ++++++-- .idea/modules/examples-kotlin_test.iml | 23 ++++++-- LICENSE.txt | 2 +- README.md | 4 +- build.gradle | 47 ++++++++++------ config/checkstyle/checkstyle.xml | 26 ++++++--- config/pmd.xml | 34 +++++++---- .../java/gradle/wrapper/gradle-wrapper.jar | Bin 55616 -> 58695 bytes .../gradle/wrapper/gradle-wrapper.properties | 2 +- examples/java/gradlew | 33 +++++------ examples/java/gradlew.bat | 3 + .../kobalt/wrapper/kobalt-wrapper.properties | 2 +- .../kotlin/gradle/wrapper/gradle-wrapper.jar | Bin 55616 -> 58695 bytes .../gradle/wrapper/gradle-wrapper.properties | 2 +- examples/kotlin/gradlew | 33 +++++------ examples/kotlin/gradlew.bat | 3 + gradle/wrapper/gradle-wrapper.jar | Bin 55616 -> 58695 bytes gradle/wrapper/gradle-wrapper.properties | 2 +- gradlew | 33 +++++------ gradlew.bat | 3 + .../net/thauvin/erik/semver/Constants.java | 2 +- .../java/net/thauvin/erik/semver/Version.java | 2 +- .../net/thauvin/erik/semver/VersionInfo.java | 4 +- .../thauvin/erik/semver/VersionProcessor.java | 2 +- .../thauvin/erik/semver/ConstantsTest.java | 2 +- .../thauvin/erik/semver/VersionInfoTest.java | 2 +- .../erik/semver/VersionProcessorTest.java | 2 +- .../net/thauvin/erik/semver/VersionTest.java | 2 +- 32 files changed, 233 insertions(+), 149 deletions(-) create mode 100644 .idea/jarRepositories.xml diff --git a/.circleci/config.yml b/.circleci/config.yml index 1b19e22..4690865 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -1,3 +1,4 @@ +version: 2 defaults: &defaults working_directory: ~/repo docker: @@ -6,8 +7,6 @@ defaults: &defaults JVM_OPTS: -Xmx3200m TERM: dumb -version: 2.0 - jobs: build_gradle: <<: *defaults diff --git a/.gitignore b/.gitignore index e439b59..f007981 100644 --- a/.gitignore +++ b/.gitignore @@ -1,32 +1,14 @@ +.vscode/* !.vscode/extensions.json !.vscode/launch.json !.vscode/settings.json !.vscode/tasks.json -!gradle-wrapper.jar + +__pycache__ .classpath .DS_Store .gradle .history -.idea_modules/ -.idea/**/contentModel.xml -.idea/**/dataSources.ids -.idea/**/dataSources.local.xml -.idea/**/dataSources/ -.idea/**/dbnavigator.xml -.idea/**/dictionaries -.idea/**/dynamic.xml -.idea/**/gradle.xml -.idea/**/libraries -.idea/**/mongoSettings.xml -.idea/**/shelf -.idea/**/sqlDataSources.xml -.idea/**/tasks.xml -.idea/**/uiDesigner.xml -.idea/**/usage.statistics.xml -.idea/**/workspace.xml -.idea/caches/build_file_checksums.ser -.idea/httpRequests -.idea/replstate.xml .kobalt .mtj.tmp/ .mvn/timing.properties @@ -35,24 +17,42 @@ .project .scannerwork .settings -.vscode/* *.class *.code-workspace *.ctxt -*.ear *.iws -*.jar *.log *.nar *.rar *.sublime-* *.tar.gz -*.war *.zip +/**/.idea_modules/ +/**/.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/$CACHE_FILE$ +/**/.idea/$PRODUCT_WORKSPACE_FILE$ atlassian-ide-plugin.xml bin/ build/ -buildNumber.properties cmake-build-*/ com_crashlytics_export_strings.xml crashlytics-build.properties @@ -81,3 +81,4 @@ release.properties target/ test-output Thumbs.db +venv diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml new file mode 100644 index 0000000..d32dd97 --- /dev/null +++ b/.idea/jarRepositories.xml @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml index 361f8c9..5ae2566 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,6 +1,9 @@ + + + diff --git a/.idea/modules/examples-kotlin_main.iml b/.idea/modules/examples-kotlin_main.iml index 487e0be..4aeac9a 100644 --- a/.idea/modules/examples-kotlin_main.iml +++ b/.idea/modules/examples-kotlin_main.iml @@ -2,23 +2,34 @@ - - + + +