From b26b5d01feef6feb06f2414e7034e6cb5e648406 Mon Sep 17 00:00:00 2001 From: Christian Schneppe Date: Fri, 20 Sep 2019 17:54:28 +0200 Subject: migrate to AndroidX --- build.gradle | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) (limited to 'build.gradle') diff --git a/build.gradle b/build.gradle index be6945a39..c8fdaafb0 100644 --- a/build.gradle +++ b/build.gradle @@ -48,7 +48,7 @@ dependencies { exclude group: 'com.android.support', module: 'appcompat-v7' exclude group: 'com.android.support', module: 'exifinterface' } - implementation 'org.bouncycastle:bcmail-jdk15on:1.58' + implementation 'org.bouncycastle:bcmail-jdk15on:1.63' implementation 'org.jitsi:org.otr4j:0.22' implementation 'org.gnu.inet:libidn:1.15' implementation 'com.google.zxing:core:3.3.3' @@ -58,20 +58,20 @@ dependencies { implementation 'com.makeramen:roundedimageview:2.3.0' implementation 'jetty:javax.servlet:5.1.12' implementation 'com.google.code.gson:gson:2.8.5' - implementation 'com.android.support:multidex:1.0.3' - implementation 'com.android.support:support-v13:28.0.0' - implementation 'com.android.support:appcompat-v7:28.0.0' - implementation 'com.android.support:exifinterface:28.0.0' - implementation 'com.android.support:support-v4:28.0.0' - implementation 'com.android.support:support-emoji:28.0.0' - implementation 'com.android.support:support-emoji-bundled:28.0.0' - implementation 'com.android.support:support-emoji-appcompat:28.0.0' - implementation 'com.android.support:exifinterface:28.0.0' - implementation 'com.android.support:design:28.0.0' - implementation 'com.android.support:cardview-v7:28.0.0' + implementation 'androidx.multidex:multidex:2.0.1' + implementation 'androidx.legacy:legacy-support-v13:1.0.0' + implementation 'androidx.appcompat:appcompat:1.1.0' + implementation 'androidx.exifinterface:exifinterface:1.0.0' + implementation 'androidx.legacy:legacy-support-v4:1.0.0' + implementation 'androidx.emoji:emoji:1.0.0' + implementation 'androidx.emoji:emoji-bundled:1.0.0' + implementation 'androidx.emoji:emoji-appcompat:1.0.0' + implementation 'androidx.exifinterface:exifinterface:1.0.0' + implementation 'com.google.android.material:material:1.0.0' + implementation 'androidx.cardview:cardview:1.0.0' implementation 'com.davemorrissey.labs:subsampling-scale-image-view:3.10.0' implementation project(':libs:fullscreenvideoview') - implementation 'pub.devrel:easypermissions:2.0.1' // version >= 3.0.0 needs android X libraries + implementation 'pub.devrel:easypermissions:3.0.0' // version >= 3.0.0 needs android X libraries implementation 'com.wefika:flowlayout:0.4.1' implementation 'com.googlecode.ez-vcard:ez-vcard:0.10.5' implementation project(':libs:xmpp-addr') @@ -80,11 +80,11 @@ dependencies { implementation 'pl.droidsonroids.gif:android-gif-drawable:1.2.15' // 1.2.15 is last working version for minSDK 16 implementation 'me.drakeet.support:toastcompat:1.1.0' implementation 'org.osmdroid:osmdroid-android:6.1.0' - implementation 'com.leinardi.android:speed-dial:2.0.1' // version >= 3.0.0 needs android X libraries + implementation 'com.leinardi.android:speed-dial:3.0.0' // version >= 3.0.0 needs android X libraries implementation 'com.squareup.picasso:picasso:2.71828' implementation 'com.squareup.okhttp3:okhttp:3.12.2' // versions > 3.12.x don't support API level < 21 anymore - implementation 'com.squareup.retrofit2:retrofit:2.6.0' - implementation 'com.squareup.retrofit2:converter-gson:2.6.0' + implementation 'com.squareup.retrofit2:retrofit:2.6.1' + implementation 'com.squareup.retrofit2:converter-gson:2.6.1' implementation 'com.google.guava:guava:27.1-android' } @@ -95,11 +95,11 @@ ext { android { - compileSdkVersion 28 + compileSdkVersion 29 defaultConfig { minSdkVersion 16 - targetSdkVersion 28 + targetSdkVersion 29 versionCode 269 versionName "2.2.9" -- cgit v1.2.3