diff --git a/app/build.gradle b/app/build.gradle index 63f5585fc..c8b4474b1 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -114,6 +114,7 @@ checkstyle { configurations { all*.exclude group: 'com.google.guava', module: 'guava-jdk5' all*.exclude group: 'org.apache.httpcomponents', module: 'httpclient' + all*.exclude group: 'com.google.http-client', module: 'google-http-client-apache' } final DAGGER_VERSION = '2.22.1' @@ -135,7 +136,7 @@ dependencies { implementation "androidx.room:room-rxjava2:${ROOM_VERSION}" annotationProcessor "androidx.room:room-compiler:${ROOM_VERSION}" implementation "androidx.lifecycle:lifecycle-extensions:2.0.0" - implementation "io.reactivex.rxjava2:rxandroid:2.1.0" + implementation "io.reactivex.rxjava2:rxandroid:2.1.1" implementation "androidx.paging:paging-runtime:2.1.0" annotationProcessor "com.jakewharton:butterknife-compiler:${BUTTERKNIFE_VERSION}" @@ -161,7 +162,7 @@ dependencies { implementation 'androidx.cardview:cardview:1.0.0' implementation 'androidx.constraintlayout:constraintlayout:2.0.0-alpha3' implementation 'com.jakewharton.timber:timber:4.7.1' - implementation 'com.jakewharton.threetenabp:threetenabp:1.1.0' + implementation 'com.jakewharton.threetenabp:threetenabp:1.2.0' //noinspection GradleDependency implementation 'com.google.guava:guava:27.1-android' implementation 'com.jakewharton:process-phoenix:2.0.0' @@ -175,12 +176,12 @@ dependencies { } implementation('com.wdullaer:materialdatetimepicker:4.0.1') implementation "me.leolin:ShortcutBadger:1.1.22@aar" - implementation 'com.google.apis:google-api-services-tasks:v1-rev55-1.25.0' - implementation 'com.google.apis:google-api-services-drive:v3-rev136-1.25.0' - implementation 'com.google.api-client:google-api-client-android:1.27.0' + implementation 'com.google.apis:google-api-services-tasks:v1-rev58-1.25.0' + implementation 'com.google.apis:google-api-services-drive:v3-rev159-1.25.0' + implementation 'com.google.api-client:google-api-client-android:1.28.0' implementation "androidx.work:work-runtime:${WORK_VERSION}" implementation 'com.mapbox.mapboxsdk:mapbox-android-sdk:7.3.0' - implementation'com.mapbox.mapboxsdk:mapbox-sdk-services:4.5.0' + implementation'com.mapbox.mapboxsdk:mapbox-sdk-services:4.6.0' implementation 'com.google.auth:google-auth-library-oauth2-http:0.15.0' googleplayImplementation "com.crashlytics.sdk.android:crashlytics:${CRASHLYTICS_VERSION}" @@ -188,7 +189,7 @@ dependencies { googleplayImplementation "com.google.android.gms:play-services-location:16.0.0" googleplayImplementation 'com.google.android.gms:play-services-maps:16.1.0' googleplayImplementation 'com.google.android.libraries.places:places:1.1.0' - googleplayImplementation 'com.android.billingclient:billing:1.2.1' + googleplayImplementation 'com.android.billingclient:billing:1.2.2' amazonImplementation fileTree(dir: 'libs', include: ['*.jar']) amazonImplementation "com.crashlytics.sdk.android:crashlytics:${CRASHLYTICS_VERSION}" diff --git a/app/src/main/assets/licenses.json b/app/src/main/assets/licenses.json index 6839c3a95..1ea33dbef 100644 --- a/app/src/main/assets/licenses.json +++ b/app/src/main/assets/licenses.json @@ -93,7 +93,7 @@ "artifactId": { "name": "google-api-services-drive", "group": "com.google.apis", - "version": "v3-rev136-1.25.0" + "version": "v3-rev159-1.25.0" } }, { @@ -141,7 +141,7 @@ "artifactId": { "name": "mapbox-sdk-services", "group": "com.mapbox.mapboxsdk", - "version": "4.5.0" + "version": "4.6.0" } }, { @@ -653,7 +653,7 @@ "artifactId": { "name": "mapbox-sdk-geojson", "group": "com.mapbox.mapboxsdk", - "version": "4.5.0" + "version": "4.6.0" } }, { @@ -749,7 +749,7 @@ "artifactId": { "name": "rxandroid", "group": "io.reactivex.rxjava2", - "version": "2.1.0" + "version": "2.1.1" } }, { @@ -765,7 +765,7 @@ "artifactId": { "name": "threetenbp", "group": "org.threeten", - "version": "1.3.6" + "version": "1.3.8" } }, { @@ -813,7 +813,7 @@ "artifactId": { "name": "google-api-client-android", "group": "com.google.api-client", - "version": "1.27.0" + "version": "1.28.0" } }, { @@ -1197,7 +1197,7 @@ "artifactId": { "name": "mapbox-sdk-core", "group": "com.mapbox.mapboxsdk", - "version": "4.5.0" + "version": "4.6.0" } }, { @@ -1245,7 +1245,7 @@ "artifactId": { "name": "threetenabp", "group": "com.jakewharton.threetenabp", - "version": "1.1.0" + "version": "1.2.0" } }, { @@ -1373,7 +1373,7 @@ "artifactId": { "name": "google-oauth-client", "group": "com.google.oauth-client", - "version": "1.27.0" + "version": "1.28.0" } }, { @@ -1453,7 +1453,7 @@ "artifactId": { "name": "rxjava", "group": "io.reactivex.rxjava2", - "version": "2.2.0" + "version": "2.2.6" } }, { @@ -1469,7 +1469,7 @@ "artifactId": { "name": "google-api-services-tasks", "group": "com.google.apis", - "version": "v1-rev55-1.25.0" + "version": "v1-rev58-1.25.0" } }, { @@ -1485,7 +1485,7 @@ "artifactId": { "name": "google-api-client", "group": "com.google.api-client", - "version": "1.27.0" + "version": "1.28.0" } }, { @@ -1581,7 +1581,7 @@ "artifactId": { "name": "google-http-client-android", "group": "com.google.http-client", - "version": "1.27.0" + "version": "1.28.0" } }, { @@ -1597,7 +1597,7 @@ "artifactId": { "name": "okhttp", "group": "com.squareup.okhttp3", - "version": "3.12.2" + "version": "3.10.0" } }, { @@ -1613,7 +1613,7 @@ "artifactId": { "name": "okio", "group": "com.squareup.okio", - "version": "1.14.0" + "version": "1.15.0" } }, { diff --git a/build.gradle b/build.gradle index e26d24fb5..581d0c48a 100644 --- a/build.gradle +++ b/build.gradle @@ -18,8 +18,8 @@ buildscript { classpath 'com.android.tools.build:gradle:3.4.0' classpath 'com.google.gms:google-services:4.2.0' // https://docs.fabric.io/android/changelog.html#fabric-gradle-plugin - classpath 'io.fabric.tools:gradle:1.27.1' - classpath 'com.github.ben-manes:gradle-versions-plugin:0.20.0' + classpath 'io.fabric.tools:gradle:1.28.1' + classpath 'com.github.ben-manes:gradle-versions-plugin:0.21.0' classpath 'com.cookpad.android.licensetools:license-tools-plugin:1.7.0' } } diff --git a/ical4android b/ical4android index 9648d42cf..0aa97542e 160000 --- a/ical4android +++ b/ical4android @@ -1 +1 @@ -Subproject commit 9648d42cf6257ca1fb46aa8f43eb9f29380acd1d +Subproject commit 0aa97542e4b8902cfbfccc0de3a658675d499367