diff --git a/app/build.gradle.kts b/app/build.gradle.kts index cb210e105..c664e67b9 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -136,8 +136,8 @@ val googleplayImplementation by configurations val amazonImplementation by configurations dependencies { - implementation("com.gitlab.bitfireAT:dav4jvm:1.0") - implementation("com.gitlab.bitfireAT:ical4android:be6d515db8") { + implementation("com.gitlab.bitfireAT:dav4jvm:1.0.1") + implementation("com.gitlab.bitfireAT:ical4android:1.0") { exclude(group = "org.threeten", module = "threetenbp") } implementation("com.gitlab.bitfireAT:cert4android:1488e39a66") @@ -147,7 +147,7 @@ dependencies { implementation("androidx.room:room-rxjava2:${Versions.room}") annotationProcessor("androidx.room:room-compiler:${Versions.room}") - implementation("androidx.lifecycle:lifecycle-extensions:2.1.0") + implementation("androidx.lifecycle:lifecycle-extensions:2.2.0") implementation("io.reactivex.rxjava2:rxandroid:2.1.1") implementation("androidx.paging:paging-runtime:2.1.1") @@ -165,8 +165,8 @@ dependencies { implementation("androidx.multidex:multidex:2.0.1") implementation("me.saket:better-link-movement-method:2.2.0") implementation("com.squareup.okhttp3:okhttp:${Versions.okhttp}") - implementation("com.google.code.gson:gson:2.8.5") - implementation("com.github.rey5137:material:1.2.5") + implementation("com.google.code.gson:gson:2.8.6") + implementation("com.github.rey5137:material:1.3.0") implementation("com.nononsenseapps:filepicker:4.2.1") implementation("com.google.android.material:material:1.1.0") implementation("androidx.annotation:annotation:1.1.0") @@ -174,7 +174,7 @@ dependencies { implementation("androidx.swiperefreshlayout:swiperefreshlayout:1.0.0") implementation("androidx.preference:preference:1.1.0") implementation("com.jakewharton.timber:timber:4.7.1") - implementation("com.jakewharton.threetenabp:threetenabp:1.2.1") + implementation("com.jakewharton.threetenabp:threetenabp:1.2.2") implementation("com.google.guava:guava:27.1-android") implementation("com.jakewharton:process-phoenix:2.0.0") implementation("com.google.android.apps.dashclock:dashclock-api:2.0.0") @@ -185,11 +185,11 @@ dependencies { implementation("org.scala-saddle:google-rfc-2445:20110304") { isTransitive = false } - implementation("com.wdullaer:materialdatetimepicker:4.0.1") + implementation("com.wdullaer:materialdatetimepicker:4.2.3") implementation("me.leolin:ShortcutBadger:1.1.22@aar") - implementation("com.google.apis:google-api-services-tasks:v1-rev59-1.25.0") - implementation("com.google.apis:google-api-services-drive:v3-rev188-1.25.0") - implementation("com.google.api-client:google-api-client-android:1.30.7") + implementation("com.google.apis:google-api-services-tasks:v1-rev20190628-1.30.8") + implementation("com.google.apis:google-api-services-drive:v3-rev20191108-1.30.8") + implementation("com.google.api-client:google-api-client-android:1.30.8") implementation("androidx.work:work-runtime:${Versions.work}") implementation("com.mapbox.mapboxsdk:mapbox-android-sdk:7.3.0") implementation("com.mapbox.mapboxsdk:mapbox-sdk-services:4.6.0") @@ -199,7 +199,7 @@ dependencies { googleplayImplementation("com.google.firebase:firebase-analytics:${Versions.firebase}") googleplayImplementation("com.google.android.gms:play-services-location:17.0.0") googleplayImplementation("com.google.android.gms:play-services-maps:17.0.0") - googleplayImplementation("com.google.android.libraries.places:places:2.1.0") + googleplayImplementation("com.google.android.libraries.places:places:2.2.0") googleplayImplementation("com.android.billingclient:billing:1.2.2") amazonImplementation(fileTree(mapOf("dir" to "libs", "include" to listOf("*.jar")))) diff --git a/app/licenses.yml b/app/licenses.yml index 6c1f7d94a..722d0b7fa 100644 --- a/app/licenses.yml +++ b/app/licenses.yml @@ -662,11 +662,6 @@ copyrightHolder: The Guava Authors license: The Apache Software License, Version 2.0 licenseUrl: http://www.apache.org/licenses/LICENSE-2.0.txt -- artifact: org.codehaus.mojo:animal-sniffer-annotations:+ - name: Animal Sniffer Annotations - copyrightHolder: codehaus.org - license: MIT License - licenseUrl: http://www.opensource.org/licenses/mit-license.php - artifact: com.google.errorprone:error_prone_annotations:+ name: error-prone annotations copyrightHolder: The Error Prone Authors @@ -835,3 +830,9 @@ license: The Apache Software License, Version 2.0 licenseUrl: http://www.apache.org/licenses/LICENSE-2.0.txt url: https://developer.android.com/jetpack/androidx +- artifact: androidx.lifecycle:lifecycle-viewmodel-savedstate:+ + name: Android Lifecycle ViewModel with SavedState + copyrightHolder: Android Open Source Project + license: The Apache Software License, Version 2.0 + licenseUrl: http://www.apache.org/licenses/LICENSE-2.0.txt + url: https://developer.android.com/topic/libraries/architecture/index.html diff --git a/app/src/main/assets/licenses.json b/app/src/main/assets/licenses.json index cf1f39d31..c3112b9e3 100644 --- a/app/src/main/assets/licenses.json +++ b/app/src/main/assets/licenses.json @@ -13,7 +13,7 @@ "artifactId": { "name": "dav4jvm", "group": "com.gitlab.bitfireAT", - "version": "1.0" + "version": "1.0.1" } }, { @@ -29,7 +29,7 @@ "artifactId": { "name": "ical4android", "group": "com.gitlab.bitfireAT", - "version": "be6d515db8" + "version": "1.0" } }, { @@ -93,7 +93,7 @@ "artifactId": { "name": "sqlite", "group": "androidx.sqlite", - "version": "2.0.1" + "version": "2.1.0" } }, { @@ -109,7 +109,7 @@ "artifactId": { "name": "google-api-services-drive", "group": "com.google.apis", - "version": "v3-rev188-1.25.0" + "version": "v3-rev20191108-1.30.8" } }, { @@ -125,7 +125,7 @@ "artifactId": { "name": "fragment", "group": "androidx.fragment", - "version": "1.1.0" + "version": "1.2.0" } }, { @@ -221,7 +221,7 @@ "artifactId": { "name": "room-common", "group": "androidx.room", - "version": "2.2.3" + "version": "2.2.4" } }, { @@ -237,7 +237,7 @@ "artifactId": { "name": "room-runtime", "group": "androidx.room", - "version": "2.2.3" + "version": "2.2.4" } }, { @@ -269,7 +269,7 @@ "artifactId": { "name": "gson", "group": "com.google.code.gson", - "version": "2.8.5" + "version": "2.8.6" } }, { @@ -381,7 +381,7 @@ "artifactId": { "name": "lifecycle-livedata", "group": "androidx.lifecycle", - "version": "2.1.0" + "version": "2.2.0" } }, { @@ -397,7 +397,7 @@ "artifactId": { "name": "material", "group": "com.github.rey5137", - "version": "1.2.5" + "version": "1.3.0" } }, { @@ -525,7 +525,7 @@ "artifactId": { "name": "lifecycle-viewmodel", "group": "androidx.lifecycle", - "version": "2.1.0" + "version": "2.2.0" } }, { @@ -573,7 +573,7 @@ "artifactId": { "name": "guava", "group": "com.google.guava", - "version": "28.1-android" + "version": "28.2-android" } }, { @@ -605,7 +605,7 @@ "artifactId": { "name": "materialdatetimepicker", "group": "com.wdullaer", - "version": "4.0.1" + "version": "4.2.3" } }, { @@ -733,7 +733,7 @@ "artifactId": { "name": "lifecycle-livedata-core", "group": "androidx.lifecycle", - "version": "2.1.0" + "version": "2.2.0" } }, { @@ -781,7 +781,7 @@ "artifactId": { "name": "threetenbp", "group": "org.threeten", - "version": "1.4.0" + "version": "1.4.1" } }, { @@ -829,7 +829,7 @@ "artifactId": { "name": "google-api-client-android", "group": "com.google.api-client", - "version": "1.30.7" + "version": "1.30.8" } }, { @@ -845,7 +845,7 @@ "artifactId": { "name": "lifecycle-extensions", "group": "androidx.lifecycle", - "version": "2.1.0" + "version": "2.2.0" } }, { @@ -989,7 +989,7 @@ "artifactId": { "name": "jackson-core", "group": "com.fasterxml.jackson.core", - "version": "2.9.9" + "version": "2.10.2" } }, { @@ -1053,7 +1053,7 @@ "artifactId": { "name": "sqlite-framework", "group": "androidx.sqlite", - "version": "2.0.1" + "version": "2.1.0" } }, { @@ -1149,7 +1149,7 @@ "artifactId": { "name": "work-runtime", "group": "androidx.work", - "version": "2.3.0" + "version": "2.3.2" } }, { @@ -1245,7 +1245,7 @@ "artifactId": { "name": "threetenabp", "group": "com.jakewharton.threetenabp", - "version": "1.2.1" + "version": "1.2.2" } }, { @@ -1277,7 +1277,7 @@ "artifactId": { "name": "lifecycle-process", "group": "androidx.lifecycle", - "version": "2.1.0" + "version": "2.2.0" } }, { @@ -1293,7 +1293,7 @@ "artifactId": { "name": "lifecycle-service", "group": "androidx.lifecycle", - "version": "2.1.0" + "version": "2.2.0" } }, { @@ -1373,7 +1373,7 @@ "artifactId": { "name": "room-rxjava2", "group": "androidx.room", - "version": "2.2.3" + "version": "2.2.4" } }, { @@ -1453,7 +1453,7 @@ "artifactId": { "name": "google-api-services-tasks", "group": "com.google.apis", - "version": "v1-rev59-1.25.0" + "version": "v1-rev20190628-1.30.8" } }, { @@ -1469,7 +1469,7 @@ "artifactId": { "name": "google-api-client", "group": "com.google.api-client", - "version": "1.30.7" + "version": "1.30.8" } }, { @@ -1533,7 +1533,7 @@ "artifactId": { "name": "google-http-client", "group": "com.google.http-client", - "version": "1.34.0" + "version": "1.34.1" } }, { @@ -1565,7 +1565,7 @@ "artifactId": { "name": "google-http-client-android", "group": "com.google.http-client", - "version": "1.32.1" + "version": "1.34.1" } }, { @@ -1645,7 +1645,7 @@ "artifactId": { "name": "google-http-client-jackson2", "group": "com.google.http-client", - "version": "1.32.1" + "version": "1.34.1" } }, { @@ -1661,7 +1661,7 @@ "artifactId": { "name": "butterknife", "group": "com.jakewharton", - "version": "10.2.0" + "version": "10.2.1" } }, { @@ -1677,7 +1677,7 @@ "artifactId": { "name": "butterknife-annotations", "group": "com.jakewharton", - "version": "10.2.0" + "version": "10.2.1" } }, { @@ -1741,7 +1741,7 @@ "artifactId": { "name": "butterknife-runtime", "group": "com.jakewharton", - "version": "10.2.0" + "version": "10.2.1" } }, { @@ -1792,22 +1792,6 @@ "version": "9999.0-empty-to-avoid-conflict-with-guava" } }, - { - "notice": null, - "copyrightHolder": "codehaus.org", - "copyrightStatement": "Copyright © codehaus.org. All rights reserved.", - "license": "MIT License", - "licenseUrl": "http://www.opensource.org/licenses/mit-license.php", - "normalizedLicense": "mit", - "year": null, - "url": "", - "libraryName": "Animal Sniffer Annotations", - "artifactId": { - "name": "animal-sniffer-annotations", - "group": "org.codehaus.mojo", - "version": "1.18" - } - }, { "notice": null, "copyrightHolder": "The Error Prone Authors", @@ -1821,7 +1805,7 @@ "artifactId": { "name": "error_prone_annotations", "group": "com.google.errorprone", - "version": "2.3.2" + "version": "2.3.4" } }, { @@ -1965,7 +1949,7 @@ "artifactId": { "name": "activity", "group": "androidx.activity", - "version": "1.0.0" + "version": "1.1.0" } }, { @@ -2173,7 +2157,7 @@ "artifactId": { "name": "httpcore", "group": "org.apache.httpcomponents", - "version": "4.4.12" + "version": "4.4.13" } }, { @@ -2255,6 +2239,22 @@ "group": "androidx.preference", "version": "1.1.0" } + }, + { + "notice": null, + "copyrightHolder": "Android Open Source Project", + "copyrightStatement": "Copyright © Android Open Source Project. All rights reserved.", + "license": "The Apache Software License, Version 2.0", + "licenseUrl": "http://www.apache.org/licenses/LICENSE-2.0.txt", + "normalizedLicense": "apache2", + "year": null, + "url": "https://developer.android.com/topic/libraries/architecture/index.html", + "libraryName": "Android Lifecycle ViewModel with SavedState", + "artifactId": { + "name": "lifecycle-viewmodel-savedstate", + "group": "androidx.lifecycle", + "version": "1.0.0" + } } ] } \ No newline at end of file diff --git a/build.gradle.kts b/build.gradle.kts index 0a6928991..42d4e3744 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -17,7 +17,7 @@ buildscript { } plugins { - id("com.github.ben-manes.versions") version "0.21.0" + id("com.github.ben-manes.versions") version "0.27.0" } tasks.getByName("wrapper") { diff --git a/buildSrc/src/main/kotlin/Versions.kt b/buildSrc/src/main/kotlin/Versions.kt index 78d89b1a7..618091461 100644 --- a/buildSrc/src/main/kotlin/Versions.kt +++ b/buildSrc/src/main/kotlin/Versions.kt @@ -3,12 +3,12 @@ object Versions { const val targetSdk = 29 const val minSdk = 16 const val dagger = "2.26" - const val butterknife = "10.2.0" - const val work = "2.3.0" + const val butterknife = "10.2.1" + const val work = "2.3.2" const val leakcanary = "2.2" - const val room = "2.2.3" + const val room = "2.2.4" const val crashlytics = "2.10.1" - const val firebase = "17.2.1" + const val firebase = "17.2.2" const val okhttp = "3.12.6" // 3.13 minSdk is 21 - const val flipper = "0.31.1" + const val flipper = "0.31.2" } \ No newline at end of file