Added dependency management and bumped gradle version

build.gradle

@@ -9,6 +9,7 @@ buildscript {
 }
 plugins {
     id 'com.github.ben-manes.versions' version '0.15.0'
+    id "io.spring.dependency-management" version "1.0.3.RELEASE"
 }
 
 subprojects {
@@ -17,6 +18,7 @@ subprojects {
     apply plugin: 'signing'
     apply plugin: 'jacoco'
     apply plugin: 'gitflow-version'
+    apply plugin: 'io.spring.dependency-management'
     apply plugin: 'com.github.ben-manes.versions'
 
     sourceCompatibility = 1.7
@@ -28,8 +30,8 @@ subprojects {
         maven { url 'https://oss.sonatype.org/content/repositories/snapshots/' }
     }
     dependencies {
-        compile "org.jetbrains.kotlin:kotlin-stdlib-jre7:$kotlin_version"
+        compile "org.jetbrains.kotlin:kotlin-stdlib-jre7"
-        compile "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version"
+        compile "org.jetbrains.kotlin:kotlin-reflect"
     }
 
     test {
@@ -107,4 +109,31 @@ subprojects {
     }
 
     check.dependsOn jacocoTestReport
+
+    dependencyManagement {
+        dependencies {
+            dependencySet(group: 'org.jetbrains.kotlin', version: "$kotlin_version") {
+                entry 'kotlin-stdlib-jre7'
+                entry 'kotlin-reflect'
+            }
+            dependencySet(group: 'org.slf4j', version: '1.7.25') {
+                entry 'slf4j-api'
+                entry 'slf4j-simple'
+            }
+
+            dependency 'ch.dissem.msgpack:msgpack:1.0.0'
+            dependency 'org.bouncycastle:bcprov-jdk15on:1.57'
+            dependency 'com.madgag.spongycastle:prov:1.56.0.0'
+            dependency 'org.apache.commons:commons-lang3:3.6'
+            dependency 'org.flywaydb:flyway-core:4.2.0'
+
+            dependency 'args4j:args4j:2.33'
+            dependency 'org.ini4j:ini4j:0.5.4'
+            dependency 'com.h2database:h2:1.4.196'
+
+            dependency 'junit:junit:4.12'
+            dependency 'org.hamcrest:hamcrest-library:1.3'
+            dependency 'com.nhaarman:mockito-kotlin:1.5.0'
+        }
+    }
 }

core/build.gradle

@@ -24,10 +24,10 @@ artifacts {
 }
 
 dependencies {
-    compile 'org.slf4j:slf4j-api:1.7.25'
+    compile 'org.slf4j:slf4j-api'
-    compile 'ch.dissem.msgpack:msgpack:1.0.0'
+    compile 'ch.dissem.msgpack:msgpack'
-    testCompile 'junit:junit:4.12'
+    testCompile 'junit:junit'
-    testCompile 'org.hamcrest:hamcrest-library:1.3'
+    testCompile 'org.hamcrest:hamcrest-library'
-    testCompile 'com.nhaarman:mockito-kotlin:1.5.0'
+    testCompile 'com.nhaarman:mockito-kotlin'
     testCompile project(':cryptography-bc')
 }

cryptography-bc/build.gradle

@@ -12,8 +12,8 @@ uploadArchives {
 
 dependencies {
     compile project(':core')
-    compile 'org.bouncycastle:bcprov-jdk15on:1.57'
+    compile 'org.bouncycastle:bcprov-jdk15on'
-    testCompile 'junit:junit:4.12'
+    testCompile 'junit:junit'
-    testCompile 'com.nhaarman:mockito-kotlin:1.5.0'
+    testCompile 'com.nhaarman:mockito-kotlin'
     testCompile project(path: ':core', configuration: 'testArtifacts')
 }

cryptography-sc/build.gradle

@@ -12,8 +12,8 @@ uploadArchives {
 
 dependencies {
     compile project(':core')
-    compile 'com.madgag.spongycastle:prov:1.56.0.0'
+    compile 'com.madgag.spongycastle:prov'
-    testCompile 'junit:junit:4.12'
+    testCompile 'junit:junit'
-    testCompile 'com.nhaarman:mockito-kotlin:1.5.0'
+    testCompile 'com.nhaarman:mockito-kotlin'
     testCompile project(path: ':core', configuration: 'testArtifacts')
 }

demo/build.gradle

@@ -29,10 +29,10 @@ dependencies {
     compile project(':repositories')
     compile project(':cryptography-bc')
     compile project(':wif')
-    compile 'org.slf4j:slf4j-simple:1.7.25'
+    compile 'org.slf4j:slf4j-simple'
-    compile 'args4j:args4j:2.33'
+    compile 'args4j:args4j'
-    compile 'com.h2database:h2:1.4.196'
+    compile 'com.h2database:h2'
-    compile 'org.apache.commons:commons-lang3:3.6'
+    compile 'org.apache.commons:commons-lang3'
-    testCompile 'junit:junit:4.12'
+    testCompile 'junit:junit'
-    testCompile 'com.nhaarman:mockito-kotlin:1.5.0'
+    testCompile 'com.nhaarman:mockito-kotlin'
 }

extensions/build.gradle

@@ -28,9 +28,9 @@ uploadArchives {
 
 dependencies {
     compile project(':core')
-    testCompile 'junit:junit:4.12'
+    testCompile 'junit:junit'
-    testCompile 'org.slf4j:slf4j-simple:1.7.25'
+    testCompile 'org.slf4j:slf4j-simple'
-    testCompile 'com.nhaarman:mockito-kotlin:1.5.0'
+    testCompile 'com.nhaarman:mockito-kotlin'
     testCompile project(path: ':core', configuration: 'testArtifacts')
     testCompile project(':cryptography-bc')
 }

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Mon Apr 03 17:55:37 CEST 2017
+#Sun Jul 02 11:22:52 CEST 2017
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-3.4.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.0-bin.zip

gradlew

@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/usr/bin/env sh
 
 ##############################################################################
 ##
@@ -154,11 +154,19 @@ if $cygwin ; then
     esac
 fi
 
-# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules
+# Escape application args
-function splitJvmOpts() {
+save ( ) {
-    JVM_OPTS=("$@")
+    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
+    echo " "
 }
-eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
+APP_ARGS=$(save "$@")
-JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
 
-exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"
+# 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" "$@"

gradlew.bat

@@ -49,7 +49,6 @@ goto fail
 @rem Get command-line arguments, handling Windows variants
 
 if not "%OS%" == "Windows_NT" goto win9xME_args
-if "%@eval[2+2]" == "4" goto 4NT_args
 
 :win9xME_args
 @rem Slurp the command line arguments.
@@ -60,11 +59,6 @@ set _SKIP=2
 if "x%~1" == "x" goto execute
 
 set CMD_LINE_ARGS=%*
-goto execute
-
-:4NT_args
-@rem Get arguments from the 4NT Shell from JP Software
-set CMD_LINE_ARGS=%$
 
 :execute
 @rem Setup the command line

networking/build.gradle

@@ -12,9 +12,9 @@ uploadArchives {
 
 dependencies {
     compile project(':core')
-    testCompile 'junit:junit:4.12'
+    testCompile 'junit:junit'
-    testCompile 'org.slf4j:slf4j-simple:1.7.25'
+    testCompile 'org.slf4j:slf4j-simple'
-    testCompile 'com.nhaarman:mockito-kotlin:1.5.0'
+    testCompile 'com.nhaarman:mockito-kotlin'
     testCompile project(path: ':core', configuration: 'testArtifacts')
     testCompile project(':cryptography-bc')
 }

repositories/build.gradle

@@ -12,10 +12,10 @@ uploadArchives {
 
 dependencies {
     compile project(':core')
-    compile 'org.flywaydb:flyway-core:4.2.0'
+    compile 'org.flywaydb:flyway-core'
-    testCompile 'junit:junit:4.12'
+    testCompile 'junit:junit'
-    testCompile 'com.h2database:h2:1.4.196'
+    testCompile 'com.h2database:h2'
-    testCompile 'com.nhaarman:mockito-kotlin:1.5.0'
+    testCompile 'com.nhaarman:mockito-kotlin'
     testCompile project(path: ':core', configuration: 'testArtifacts')
     testCompile project(':cryptography-bc')
 }

wif/build.gradle

@@ -12,8 +12,8 @@ uploadArchives {
 
 dependencies {
     compile project(':core')
-    compile 'org.ini4j:ini4j:0.5.4'
+    compile 'org.ini4j:ini4j'
-    testCompile 'junit:junit:4.12'
+    testCompile 'junit:junit'
-    testCompile 'com.nhaarman:mockito-kotlin:1.5.0'
+    testCompile 'com.nhaarman:mockito-kotlin'
     testCompile project(':cryptography-bc')
 }