Skip to content

Commit b4f70eb

Browse files
authored
Update dependencies version; prepare for maven move (#523)
1 parent 3b24473 commit b4f70eb

File tree

4 files changed

+19
-60
lines changed

4 files changed

+19
-60
lines changed

autobahn/build.gradle

Lines changed: 10 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,10 @@ def relVersion = System.getenv().containsKey('AUTOBAHN_BUILD_VERSION') ? System.
1818
def siteUrl = 'https://github.com/crossbario/autobahn-java'
1919

2020
dependencies {
21-
api 'com.fasterxml.jackson.core:jackson-core:2.11.1'
22-
//api 'net.sourceforge.streamsupport:streamsupport-cfuture:1.6.2'
23-
implementation 'com.fasterxml.jackson.core:jackson-databind:2.11.1'
24-
implementation 'com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:2.11.1'
25-
implementation 'org.msgpack:jackson-dataformat-msgpack:0.8.20'
21+
api 'com.fasterxml.jackson.core:jackson-core:2.12.3'
22+
implementation 'com.fasterxml.jackson.core:jackson-databind:2.12.3'
23+
implementation 'com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:2.12.3'
24+
implementation 'org.msgpack:jackson-dataformat-msgpack:0.8.22'
2625
if (IS_ANDROID) {
2726
implementation 'com.github.joshjdevl.libsodiumjni:libsodium-jni-aar:2.0.2'
2827
implementation 'org.web3j:core:4.6.0-android'
@@ -33,59 +32,21 @@ dependencies {
3332
implementation 'org.web3j:core:4.6.0'
3433
implementation 'org.web3j:abi:4.6.0'
3534
implementation 'org.web3j:utils:4.6.0'
36-
implementation 'org.json:json:20200518'
35+
implementation 'org.json:json:20210307'
3736
}
3837
if (IS_NETTY) {
39-
implementation 'io.netty:netty-codec-http:4.1.50.Final'
40-
implementation 'io.netty:netty-handler:4.1.50.Final'
41-
}
42-
}
43-
44-
if (PUBLISH) {
45-
apply plugin: 'com.jfrog.bintray'
46-
47-
bintray {
48-
user = System.getenv('BINTRAY_USER')
49-
key = System.getenv('BINTRAY_KEY')
50-
if (IS_ANDROID) {
51-
configurations = ['archives']
52-
} else {
53-
publications = ['mavenJava']
54-
}
55-
publish = true
56-
pkg {
57-
repo = 'autobahn'
58-
if (IS_ANDROID) {
59-
name = ARTIFACT_ANDROID
60-
} else if (IS_NEXT){
61-
name = ARTIFACT_NEXT
62-
} else {
63-
name = ARTIFACT_JAVA
64-
}
65-
userOrg = 'crossbario'
66-
licenses = [licenseName]
67-
vcsUrl = gitUrl
68-
version {
69-
name = relVersion
70-
released = new Date()
71-
mavenCentralSync {
72-
sync = true
73-
user = System.getenv('SONATYPE_USERNAME')
74-
password = System.getenv('SONATYPE_PASSWORD')
75-
close = '1'
76-
}
77-
}
78-
}
38+
implementation 'io.netty:netty-codec-http:4.1.63.Final'
39+
implementation 'io.netty:netty-handler:4.1.63.Final'
7940
}
8041
}
8142

8243
if (IS_ANDROID) {
8344
android {
84-
compileSdkVersion 29
85-
buildToolsVersion '29.0.3'
45+
compileSdkVersion 30
46+
buildToolsVersion '30.0.3'
8647
defaultConfig {
8748
minSdkVersion 24
88-
targetSdkVersion 29
49+
targetSdkVersion 30
8950
}
9051
buildTypes {
9152
release {

build.gradle

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
// Set global platform properties.
21
def _PLATFORM = project.properties.get('buildPlatform')
32
assert (_PLATFORM == 'android' || _PLATFORM == 'netty' || _PLATFORM == 'next' || _PLATFORM == null)
43

@@ -22,15 +21,13 @@ project.ext {
2221
buildscript {
2322
repositories {
2423
google()
24+
mavenCentral()
2525
jcenter()
2626
}
27-
dependencies {
28-
classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.5'
29-
}
3027
// Android specific dependencies.
3128
if (project.properties.get('buildPlatform', 'android') == 'android') {
3229
dependencies {
33-
classpath 'com.android.tools.build:gradle:4.0.1'
30+
classpath 'com.android.tools.build:gradle:4.1.3'
3431
classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1'
3532
}
3633
}
@@ -39,6 +36,7 @@ buildscript {
3936
allprojects {
4037
repositories {
4138
google()
39+
mavenCentral()
4240
jcenter()
4341
maven { url "https://dl.bintray.com/ethereum/maven/" }
4442
}

demo-gallery/build.gradle

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@ apply plugin: project.IS_ANDROID ? project.PLUGIN_ANDROID_APP: project.PLUGIN_JA
22

33
if (plugins.hasPlugin(project.PLUGIN_ANDROID_APP)) {
44
android {
5-
compileSdkVersion 29
6-
buildToolsVersion '29.0.3'
5+
compileSdkVersion 30
6+
buildToolsVersion '30.0.3'
77

88
defaultConfig {
99
minSdkVersion 24
10-
targetSdkVersion 29
10+
targetSdkVersion 30
1111
multiDexEnabled true
1212
}
1313
buildTypes {
@@ -43,8 +43,8 @@ if (plugins.hasPlugin(project.PLUGIN_ANDROID_APP)) {
4343
implementation project(path: ':autobahn')
4444
implementation 'androidx.appcompat:appcompat:1.2.0'
4545
implementation 'com.android.support:multidex:1.0.3'
46-
implementation "androidx.constraintlayout:constraintlayout:2.0.1"
47-
implementation "com.google.android.material:material:1.2.1"
46+
implementation "androidx.constraintlayout:constraintlayout:2.0.4"
47+
implementation "com.google.android.material:material:1.3.0"
4848

4949
implementation 'com.basgeekball:awesome-validation:4.2'
5050
implementation 'org.web3j:crypto:4.6.0-android'

gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-6.4.1-all.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-all.zip

0 commit comments

Comments
 (0)