Update dependencies version; prepare for maven move (#523)

crossbario · Apr 20, 2021 · b4f70eb · b4f70eb
1 parent 3b24473
commit b4f70eb
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 60 deletions.
diff --git a/autobahn/build.gradle b/autobahn/build.gradle
@@ -18,11 +18,10 @@ def relVersion = System.getenv().containsKey('AUTOBAHN_BUILD_VERSION') ? System.
 def siteUrl = 'https://github.com/crossbario/autobahn-java'
 
 dependencies {
-    api 'com.fasterxml.jackson.core:jackson-core:2.11.1'
-    //api 'net.sourceforge.streamsupport:streamsupport-cfuture:1.6.2'
-    implementation 'com.fasterxml.jackson.core:jackson-databind:2.11.1'
-    implementation 'com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:2.11.1'
-    implementation 'org.msgpack:jackson-dataformat-msgpack:0.8.20'
+    api 'com.fasterxml.jackson.core:jackson-core:2.12.3'
+    implementation 'com.fasterxml.jackson.core:jackson-databind:2.12.3'
+    implementation 'com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:2.12.3'
+    implementation 'org.msgpack:jackson-dataformat-msgpack:0.8.22'
     if (IS_ANDROID) {
         implementation 'com.github.joshjdevl.libsodiumjni:libsodium-jni-aar:2.0.2'
         implementation 'org.web3j:core:4.6.0-android'
@@ -33,59 +32,21 @@ dependencies {
         implementation 'org.web3j:core:4.6.0'
         implementation 'org.web3j:abi:4.6.0'
         implementation 'org.web3j:utils:4.6.0'
-        implementation 'org.json:json:20200518'
+        implementation 'org.json:json:20210307'
     }
     if (IS_NETTY) {
-        implementation 'io.netty:netty-codec-http:4.1.50.Final'
-        implementation 'io.netty:netty-handler:4.1.50.Final'
-    }
-}
-
-if (PUBLISH) {
-    apply plugin: 'com.jfrog.bintray'
-
-    bintray {
-        user = System.getenv('BINTRAY_USER')
-        key = System.getenv('BINTRAY_KEY')
-        if (IS_ANDROID) {
-            configurations = ['archives']
-        } else {
-            publications = ['mavenJava']
-        }
-        publish = true
-        pkg {
-            repo = 'autobahn'
-            if (IS_ANDROID) {
-                name = ARTIFACT_ANDROID
-            } else if (IS_NEXT){
-                name = ARTIFACT_NEXT
-            } else {
-                name = ARTIFACT_JAVA
-            }
-            userOrg = 'crossbario'
-            licenses = [licenseName]
-            vcsUrl = gitUrl
-            version {
-                name = relVersion
-                released = new Date()
-                mavenCentralSync {
-                    sync = true
-                    user = System.getenv('SONATYPE_USERNAME')
-                    password = System.getenv('SONATYPE_PASSWORD')
-                    close = '1'
-                }
-            }
-        }
+        implementation 'io.netty:netty-codec-http:4.1.63.Final'
+        implementation 'io.netty:netty-handler:4.1.63.Final'
     }
 }
 
 if (IS_ANDROID) {
     android {
-        compileSdkVersion 29
-        buildToolsVersion '29.0.3'
+        compileSdkVersion 30
+        buildToolsVersion '30.0.3'
         defaultConfig {
             minSdkVersion 24
-            targetSdkVersion 29
+            targetSdkVersion 30
         }
         buildTypes {
             release {

diff --git a/build.gradle b/build.gradle
@@ -1,4 +1,3 @@
-// Set global platform properties.
 def _PLATFORM = project.properties.get('buildPlatform')
 assert (_PLATFORM == 'android' || _PLATFORM == 'netty' || _PLATFORM == 'next' || _PLATFORM == null)
 
@@ -22,15 +21,13 @@ project.ext {
 buildscript {
     repositories {
         google()
+        mavenCentral()
         jcenter()
     }
-    dependencies {
-        classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.5'
-    }
     // Android specific dependencies.
     if (project.properties.get('buildPlatform', 'android') == 'android') {
         dependencies {
-            classpath 'com.android.tools.build:gradle:4.0.1'
+            classpath 'com.android.tools.build:gradle:4.1.3'
             classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1'
         }
     }
@@ -39,6 +36,7 @@ buildscript {
 allprojects {
     repositories {
         google()
+        mavenCentral()
         jcenter()
         maven { url "https://dl.bintray.com/ethereum/maven/" }
     }

diff --git a/demo-gallery/build.gradle b/demo-gallery/build.gradle
@@ -2,12 +2,12 @@ apply plugin: project.IS_ANDROID ? project.PLUGIN_ANDROID_APP: project.PLUGIN_JA
 
 if (plugins.hasPlugin(project.PLUGIN_ANDROID_APP)) {
     android {
-        compileSdkVersion 29
-        buildToolsVersion '29.0.3'
+        compileSdkVersion 30
+        buildToolsVersion '30.0.3'
 
         defaultConfig {
             minSdkVersion 24
-            targetSdkVersion 29
+            targetSdkVersion 30
             multiDexEnabled true
         }
         buildTypes {
@@ -43,8 +43,8 @@ if (plugins.hasPlugin(project.PLUGIN_ANDROID_APP)) {
         implementation project(path: ':autobahn')
         implementation 'androidx.appcompat:appcompat:1.2.0'
         implementation 'com.android.support:multidex:1.0.3'
-        implementation "androidx.constraintlayout:constraintlayout:2.0.1"
-        implementation "com.google.android.material:material:1.2.1"
+        implementation "androidx.constraintlayout:constraintlayout:2.0.4"
+        implementation "com.google.android.material:material:1.3.0"
 
         implementation 'com.basgeekball:awesome-validation:4.2'
         implementation 'org.web3j:crypto:4.6.0-android'

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.4.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-all.zip