Skip to content

Commit 1925d3b

Browse files
authored
Update dependencies (#464)
* update all android deps * enable multidex for gallery * update ci deps * use the correct version
1 parent d67cbc7 commit 1925d3b

File tree

9 files changed

+21
-15
lines changed

9 files changed

+21
-15
lines changed

.travis.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ android:
44
- tools
55
- platform-tools
66
- tools
7-
- build-tools-28.0.3
8-
- android-28
7+
- build-tools-29.0.2
8+
- android-29
99
licenses:
1010
- 'android-sdk-preview-license-.+'
1111
- 'android-sdk-license-.+'

autobahn/build.gradle

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ def siteUrl = 'https://github.com/crossbario/autobahn-java'
1616

1717
dependencies {
1818
api 'com.fasterxml.jackson.core:jackson-core:2.9.8'
19-
// api 'net.sourceforge.streamsupport:streamsupport-cfuture:1.6.2'
19+
//api 'net.sourceforge.streamsupport:streamsupport-cfuture:1.6.2'
2020
implementation 'com.fasterxml.jackson.core:jackson-databind:2.9.8'
2121
implementation 'com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:2.9.8'
2222
implementation 'org.msgpack:jackson-dataformat-msgpack:0.8.16'
@@ -70,11 +70,11 @@ bintray {
7070

7171
if (project.IS_ANDROID) {
7272
android {
73-
compileSdkVersion 28
74-
buildToolsVersion '28.0.3'
73+
compileSdkVersion 29
74+
buildToolsVersion '29.0.2'
7575
defaultConfig {
7676
minSdkVersion 24
77-
targetSdkVersion 28
77+
targetSdkVersion 29
7878
}
7979
buildTypes {
8080
release {

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ buildscript {
2222
// Android specific dependencies.
2323
if (project.properties.get('buildPlatform', 'android') == 'android') {
2424
dependencies {
25-
classpath 'com.android.tools.build:gradle:3.3.2'
25+
classpath 'com.android.tools.build:gradle:3.5.3'
2626
classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1'
2727
}
2828
}

demo-gallery/build.gradle

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,13 @@ apply plugin: project.PLATFORM == project.PLATFORM_NETTY ? project.PLUGIN_JAVA_A
22

33
if (plugins.hasPlugin(project.PLUGIN_ANDROID_APP)) {
44
android {
5-
compileSdkVersion 28
6-
buildToolsVersion '28.0.3'
5+
compileSdkVersion 29
6+
buildToolsVersion '29.0.2'
77

88
defaultConfig {
99
minSdkVersion 24
10-
targetSdkVersion 28
10+
targetSdkVersion 29
11+
multiDexEnabled true
1112
}
1213
buildTypes {
1314
release {
@@ -39,7 +40,8 @@ if (plugins.hasPlugin(project.PLUGIN_ANDROID_APP)) {
3940

4041
dependencies {
4142
implementation project(path: ':autobahn')
42-
implementation 'com.android.support:appcompat-v7:28.0.0'
43+
implementation 'androidx.appcompat:appcompat:1.1.0'
44+
implementation 'com.android.support:multidex:1.0.3'
4345
}
4446
} else {
4547
mainClassName = 'io.crossbar.autobahn.demogallery.netty.Main'

demo-gallery/src/main/AndroidManifest.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
<uses-permission android:name="android.permission.INTERNET"/>
77

88
<application
9+
android:name="android.support.multidex.MultiDexApplication"
910
android:allowBackup="true"
1011
android:icon="@mipmap/ic_launcher"
1112
android:label="@string/app_name"

demo-gallery/src/main/java/io/crossbar/autobahn/demogallery/android/EchoClientActivity.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,15 @@
1313

1414
import android.content.SharedPreferences;
1515
import android.os.Bundle;
16-
import android.support.v7.app.AppCompatActivity;
1716
import android.util.Log;
1817
import android.view.Gravity;
1918
import android.widget.Button;
2019
import android.widget.EditText;
2120
import android.widget.TextView;
2221
import android.widget.Toast;
2322

23+
import androidx.appcompat.app.AppCompatActivity;
24+
2425
import io.crossbar.autobahn.demogallery.R;
2526
import io.crossbar.autobahn.websocket.WebSocketConnection;
2627
import io.crossbar.autobahn.websocket.WebSocketConnectionHandler;

demo-gallery/src/main/java/io/crossbar/autobahn/demogallery/android/MainActivity.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,10 @@
1313

1414
import android.content.Intent;
1515
import android.os.Bundle;
16-
import android.support.v7.app.AppCompatActivity;
1716
import android.view.View;
1817

18+
import androidx.appcompat.app.AppCompatActivity;
19+
1920
import io.crossbar.autobahn.demogallery.R;
2021

2122

demo-gallery/src/main/java/io/crossbar/autobahn/demogallery/android/TestSuiteClientActivity.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,13 @@
1313

1414
import android.content.SharedPreferences;
1515
import android.os.Bundle;
16-
import android.support.v7.app.AppCompatActivity;
1716
import android.view.View;
1817
import android.widget.Button;
1918
import android.widget.EditText;
2019
import android.widget.TextView;
2120

21+
import androidx.appcompat.app.AppCompatActivity;
22+
2223
import io.crossbar.autobahn.demogallery.R;
2324
import io.crossbar.autobahn.websocket.WebSocketConnection;
2425
import io.crossbar.autobahn.websocket.WebSocketConnectionHandler;

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

0 commit comments

Comments
 (0)