Skip to content

Commit

Permalink
Some long overdue dependencies upgrade
Browse files Browse the repository at this point in the history
Signed-off-by: Daniele Ricci <daniele@casaricci.it>
  • Loading branch information
daniele-athome committed Mar 14, 2020
1 parent 2e1d75b commit 2656458
Show file tree
Hide file tree
Showing 5 changed files with 22 additions and 23 deletions.
34 changes: 17 additions & 17 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -148,11 +148,11 @@ dependencies {
// support libraries
implementation 'androidx.multidex:multidex:2.0.1'
implementation 'androidx.appcompat:appcompat:1.1.0'
implementation 'com.google.android.material:material:1.0.0'
implementation 'com.google.android.material:material:1.1.0'
implementation 'androidx.gridlayout:gridlayout:1.0.0'
implementation 'androidx.exifinterface:exifinterface:1.1.0'
implementation 'androidx.recyclerview:recyclerview:1.1.0'
implementation 'androidx.recyclerview:recyclerview-selection:1.1.0-beta01'
implementation 'androidx.recyclerview:recyclerview-selection:1.1.0-rc01'
implementation 'androidx.dynamicanimation:dynamicanimation:1.0.0'
// these are actually to override an emoji dependency
implementation 'androidx.cardview:cardview:1.0.0'
Expand All @@ -164,7 +164,7 @@ dependencies {
implementation "org.igniterealtime.smack:smack-experimental:$smackVersion"
implementation "org.igniterealtime.smack:smack-android:$smackVersion"
implementation 'info.guardianproject.netcipher:netcipher:1.2.1'
implementation 'com.squareup.okhttp3:okhttp:3.10.0'
implementation 'com.squareup.okhttp3:okhttp:4.4.1'
implementation 'com.segment.backo:backo:1.0.0'
implementation 'com.google.code.gson:gson:2.8.6'

Expand All @@ -181,7 +181,7 @@ dependencies {
}

// storage/persistence libraries
implementation 'androidx.sqlite:sqlite:2.0.1'
implementation 'androidx.sqlite:sqlite:2.1.0'
implementation 'io.requery:sqlite-android:3.29.0'

// UI libraries
Expand All @@ -200,20 +200,20 @@ dependencies {
// waiting for our pull request to be accepted
implementation 'com.github.kontalk:CircularReveal:bc59b8dfcf'
implementation 'me.leolin:ShortcutBadger:1.1.22@aar'
implementation 'androidx.lifecycle:lifecycle-runtime:2.1.0'
implementation 'androidx.lifecycle:lifecycle-extensions:2.1.0'
implementation 'androidx.paging:paging-runtime:2.1.0'
implementation 'de.hdodenhof:circleimageview:2.1.0'
implementation 'androidx.lifecycle:lifecycle-runtime:2.2.0'
implementation 'androidx.lifecycle:lifecycle-extensions:2.2.0'
implementation 'androidx.paging:paging-runtime:2.1.1'
implementation 'de.hdodenhof:circleimageview:3.1.0'

// other libraries
implementation 'com.googlecode.libphonenumber:libphonenumber:8.10.13'
implementation 'com.google.zxing:core:3.3.3'
implementation 'com.googlecode.libphonenumber:libphonenumber:8.11.5'
implementation 'com.google.zxing:core:3.4.0'
implementation 'me.dm7.barcodescanner:zxing:1.9.8'
implementation 'com.github.instacart.truetime-android:library:3.3'
implementation 'org.greenrobot:eventbus:3.1.1'
annotationProcessor 'org.greenrobot:eventbus-annotation-processor:3.1.1'
implementation 'com.jakewharton:butterknife:10.2.0'
annotationProcessor 'com.jakewharton:butterknife-compiler:10.2.0'
implementation 'org.greenrobot:eventbus:3.2.0'
annotationProcessor 'org.greenrobot:eventbus-annotation-processor:3.2.0'
implementation 'com.jakewharton:butterknife:10.2.1'
annotationProcessor 'com.jakewharton:butterknife-compiler:10.2.1'

// maps libraries
implementation "com.github.kontalk.AnyMaps:anymaps-base:$anyMapsVersion"
Expand All @@ -224,14 +224,14 @@ dependencies {
googleplayImplementation "com.google.android.gms:play-services-base:17.1.0"
googleplayImplementation "com.google.android.gms:play-services-maps:17.0.0"
googleplayImplementation "com.google.android.gms:play-services-location:17.0.0"
googleplayImplementation 'com.google.firebase:firebase-core:17.2.1'
googleplayImplementation 'com.google.firebase:firebase-messaging:20.1.0'
googleplayImplementation 'com.google.firebase:firebase-core:17.2.3'
googleplayImplementation 'com.google.firebase:firebase-messaging:20.1.2'
googleplayImplementation('com.crashlytics.sdk.android:crashlytics:2.10.1@aar') {
transitive = true
}

// test dependencies
testImplementation 'junit:junit:4.12'
testImplementation 'junit:junit:4.13'
androidTestImplementation 'com.android.support:multidex-instrumentation:1.0.3'
androidTestImplementation 'com.google.android:android-test:4.1.1.4'
androidTestImplementation 'androidx.test:runner:1.2.0'
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/layout/contacts_list_item.xml
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@
android:id="@+id/checkbox"
android:layout_width="match_parent"
android:layout_height="match_parent"
app:civ_fill_color="?attr/colorPrimaryDark"
app:civ_circle_background_color="?attr/colorPrimaryDark"
android:visibility="gone"/>

</FrameLayout>
Expand Down
4 changes: 2 additions & 2 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ buildscript {
maven { url 'https://maven.fabric.io/public' }
}
dependencies {
classpath 'com.android.tools.build:gradle:3.5.3'
classpath 'com.android.tools.build:gradle:3.6.1'
classpath 'com.google.gms:google-services:4.3.3'
classpath 'io.fabric.tools:gradle:1.+'
classpath('com.dicedmelon.gradle:jacoco-android:0.1.4') {
Expand All @@ -31,7 +31,7 @@ allprojects {
versionName = '4.3.1-next'
minSdkVersion = 16
targetSdkVersion = 27
compileSdkVersion = 28
compileSdkVersion = 29
smackVersion = project(':client-common-java').smackVersion
spongyCastleVersion = '1.58.0.0'
anyMapsVersion = '962c4b5cf8'
Expand Down
1 change: 0 additions & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
org.gradle.jvmargs=-Xmx2048m -Xms512m -XX:MaxPermSize=768m
android.enableJetifier=true
android.useAndroidX=true
android.enableR8=false
4 changes: 2 additions & 2 deletions gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#Fri Apr 19 14:57:47 CEST 2019
#Sat Mar 14 13:48:34 CET 2020
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-5.6-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip

0 comments on commit 2656458

Please sign in to comment.