Merge branch 'develop' of https://github.com/arkecosystem/java-crypto …

…into release/bitcoinj-v0.14.7
ArkEcosystem · Feb 10, 2020 · f918925 · f918925
2 parents af409ae + fb4881f
commit f918925
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/build.gradle b/build.gradle
@@ -95,14 +95,14 @@ uploadArchives {
                         organizationUrl = 'https://ark.io'
                     }
                     developer {
-                        name = 'Žan Kovač'
-                        email = 'zan@ark.io'
+                        name = 'Kristjan Kosic'
+                        email = 'kristjan@ark.io'
                         organization = 'Ark Ecosystem'
                         organizationUrl = 'https://ark.io'
                     }
                     developer {
-                        name = 'Kristjan Košič'
-                        email = 'kristjan@ark.io'
+                        name = 'Zan Kovac'
+                        email = 'zan@ark.io'
                         organization = 'Ark Ecosystem'
                         organizationUrl = 'https://ark.io'
                     }
@@ -131,8 +131,8 @@ dependencies {
     compile group: 'com.google.code.gson', name: 'gson', version: '2.8.6'
     compile 'com.google.guava:guava:28.2-jre'
 
-    testImplementation 'org.junit.jupiter:junit-jupiter-api:5.5.2'
-    testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.5.2'
+    testImplementation 'org.junit.jupiter:junit-jupiter-api:5.6.0'
+    testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.6.0'
 }
 
 test {

diff --git 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-6.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip