From f7b098875aec7ca50f53d84981bf9f6817633409 Mon Sep 17 00:00:00 2001 From: Josef Petrak Date: Mon, 18 Sep 2017 11:59:33 +0200 Subject: [PATCH 1/2] Gradle wrapper and build scripts upgrade to 4.1 --- gradle/wrapper/gradle-wrapper.properties | 2 +- lib/build.gradle | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 04e285f3..c9c89d34 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-bin.zip diff --git a/lib/build.gradle b/lib/build.gradle index 75b93a92..00102901 100644 --- a/lib/build.gradle +++ b/lib/build.gradle @@ -57,7 +57,9 @@ test { } } -task clean(type: Delete) { +task cleanupJWTproject(type: Delete) { delete rootProject.buildDir delete 'CHANGELOG.md.release' } + +clean.dependsOn cleanupJWTproject From 202ed32bed4f056550f92e697d3744a07ac536f6 Mon Sep 17 00:00:00 2001 From: Josef Petrak Date: Mon, 18 Sep 2017 12:11:50 +0200 Subject: [PATCH 2/2] Dependency updates --- build.gradle | 4 ++-- lib/build.gradle | 7 ++++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/build.gradle b/build.gradle index b18f7596..20f1e14d 100644 --- a/build.gradle +++ b/build.gradle @@ -5,8 +5,8 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:2.2.2' - classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.7' + classpath 'com.android.tools.build:gradle:2.3.3' + classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.7.3' } } diff --git a/lib/build.gradle b/lib/build.gradle index 00102901..39290ad5 100644 --- a/lib/build.gradle +++ b/lib/build.gradle @@ -34,13 +34,14 @@ compileJava { } dependencies { - compile 'com.fasterxml.jackson.core:jackson-databind:2.8.4' + compile 'com.fasterxml.jackson.core:jackson-databind:2.9.1' + compile 'com.fasterxml.jackson.core:jackson-annotations:2.9.1' compile 'commons-codec:commons-codec:1.10' - compile 'org.bouncycastle:bcprov-jdk15on:1.55' + compile 'org.bouncycastle:bcprov-jdk15on:1.58' testCompile 'junit:junit:4.12' testCompile 'net.jodah:concurrentunit:0.4.2' testCompile 'org.hamcrest:hamcrest-library:1.3' - testCompile 'org.mockito:mockito-core:2.2.8' + testCompile 'org.mockito:mockito-core:2.10.0' } jacocoTestReport {