Update license headers; update build settings

kordamp · Jan 4, 2020 · ee6ca0d · ee6ca0d
1 parent 2c3690f
commit ee6ca0d
Show file tree

Hide file tree

Showing 7 changed files with 40 additions and 35 deletions.
diff --git a/build.gradle b/build.gradle
@@ -16,9 +16,8 @@
  * limitations under the License.
  */
 plugins {
-    id 'org.kordamp.gradle.kordamp-parentpom' version '1.10.1'
-    id 'org.kordamp.gradle.source-xref'       version '0.31.1'
-    id 'org.kordamp.gradle.clirr'             version '0.31.1'
+    id 'org.kordamp.gradle.kordamp-parentpom'
+    id 'org.kordamp.gradle.clirr'
 } 
 
 config {
@@ -116,8 +115,8 @@ allprojects {
 
 idea {
     project {
-        jdkName '1.7'
-        languageLevel '1.7'
+        jdkName sourceCompatibility
+        languageLevel sourceCompatibility
 
         ipr {
             withXml { provider ->

diff --git a/gradle.properties b/gradle.properties
@@ -16,17 +16,20 @@
 # limitations under the License.
 #
 
-group               = org.kordamp.json
-version             = 3.0.2-SNAPSHOT
-sourceCompatibility = 1.7
-targetCompatibility = 1.7
+group                   = org.kordamp.json
+version                 = 3.0.2-SNAPSHOT
+sourceCompatibility     = 1.7
+targetCompatibility     = 1.7
 
 previousVersion         = 3.0.1
 commonsLangVersion      = 3.9
 commonsBeanutilsVersion = 1.9.3
-junitVersion            = 4.12
-slf4jVersion            = 1.7.29
+junitVersion            = 4.13
+slf4jVersion            = 1.7.30
+kordampPluginVersion    = 0.31.2
+kordampPomVersion       = 1.10.2
+gitPluginVersion        = 0.3.2
 
-org.gradle.daemon   = true
-org.gradle.caching  = true
-org.gradle.parallel = true
+org.gradle.daemon       = true
+org.gradle.caching      = true
+org.gradle.parallel     = false
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.0.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/gradlew b/gradlew
@@ -154,19 +154,19 @@ if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
         else
             eval `echo args$i`="\"$arg\""
         fi
-        i=$((i+1))
+        i=`expr $i + 1`
     done
     case $i in
-        (0) set -- ;;
-        (1) set -- "$args0" ;;
-        (2) set -- "$args0" "$args1" ;;
-        (3) set -- "$args0" "$args1" "$args2" ;;
-        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
-        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
-        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
-        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
-        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
-        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+        0) set -- ;;
+        1) set -- "$args0" ;;
+        2) set -- "$args0" "$args1" ;;
+        3) set -- "$args0" "$args1" "$args2" ;;
+        4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+        5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+        6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+        7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+        8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+        9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
     esac
 fi
 
@@ -175,14 +175,9 @@ save () {
     for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
     echo " "
 }
-APP_ARGS=$(save "$@")
+APP_ARGS=`save "$@"`
 
 # Collect all arguments for the java command, following the shell quoting and substitution rules
 eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
 
-# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
-if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
-  cd "$(dirname "$0")"
-fi
-
 exec "$JAVACMD" "$@"
diff --git a/settings.gradle b/settings.gradle
@@ -19,15 +19,23 @@ pluginManagement {
     repositories {
         jcenter()
         gradlePluginPortal()
+        mavenLocal()
+    }
+    plugins {
+        id 'org.kordamp.gradle.kordamp-parentpom' version kordampPomVersion
+        id 'org.kordamp.gradle.clirr'             version kordampPluginVersion
+        id 'org.kordamp.gradle.guide'             version kordampPluginVersion
+        id 'org.ajoberstar.git-publish'           version gitPluginVersion
     }
 }
 
 buildscript {
     repositories {
         gradlePluginPortal()
+        mavenLocal()
     }
     dependencies {
-        classpath 'org.kordamp.gradle:settings-gradle-plugin:0.31.1'
+        classpath "org.kordamp.gradle:settings-gradle-plugin:$kordampPluginVersion"
     }
 }
 apply plugin: 'org.kordamp.gradle.settings'

diff --git a/subprojects/guide/guide.gradle b/subprojects/guide/guide.gradle
@@ -16,8 +16,8 @@
  * limitations under the License.
  */
 plugins {
-    id 'org.kordamp.gradle.guide'   version '0.31.0'
-    id 'org.ajoberstar.git-publish' version '0.3.2'
+    id 'org.kordamp.gradle.guide'
+    id 'org.ajoberstar.git-publish'
 }
 
 configurations {