diff --git a/.ruby-version b/.ruby-version index 75a22a26a..e4604e3af 100644 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -3.0.3 +3.2.1 diff --git a/Gemfile.lock b/Gemfile.lock index a26c87e17..dd6a09262 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,27 +1,27 @@ GEM remote: https://rubygems.org/ specs: - CFPropertyList (3.0.5) + CFPropertyList (3.0.6) rexml - addressable (2.8.0) - public_suffix (>= 2.0.2, < 5.0) + addressable (2.8.1) + public_suffix (>= 2.0.2, < 6.0) artifactory (3.0.15) atomos (0.1.3) aws-eventstream (1.2.0) - aws-partitions (1.598.0) - aws-sdk-core (3.131.1) + aws-partitions (1.726.0) + aws-sdk-core (3.170.0) aws-eventstream (~> 1, >= 1.0.2) - aws-partitions (~> 1, >= 1.525.0) - aws-sigv4 (~> 1.1) + aws-partitions (~> 1, >= 1.651.0) + aws-sigv4 (~> 1.5) jmespath (~> 1, >= 1.6.1) - aws-sdk-kms (1.57.0) - aws-sdk-core (~> 3, >= 3.127.0) + aws-sdk-kms (1.63.0) + aws-sdk-core (~> 3, >= 3.165.0) aws-sigv4 (~> 1.1) - aws-sdk-s3 (1.114.0) - aws-sdk-core (~> 3, >= 3.127.0) + aws-sdk-s3 (1.119.1) + aws-sdk-core (~> 3, >= 3.165.0) aws-sdk-kms (~> 1) aws-sigv4 (~> 1.4) - aws-sigv4 (1.5.0) + aws-sigv4 (1.5.2) aws-eventstream (~> 1, >= 1.0.2) babosa (1.0.4) claide (1.1.0) @@ -34,10 +34,10 @@ GEM rake (>= 12.0.0, < 14.0.0) domain_name (0.5.20190701) unf (>= 0.0.5, < 1.0.0) - dotenv (2.7.6) + dotenv (2.8.1) emoji_regex (3.2.3) - excon (0.92.3) - faraday (1.10.0) + excon (0.99.0) + faraday (1.10.3) faraday-em_http (~> 1.0) faraday-em_synchrony (~> 1.0) faraday-excon (~> 1.1) @@ -66,7 +66,7 @@ GEM faraday_middleware (1.2.0) faraday (~> 1.0) fastimage (2.2.6) - fastlane (2.206.2) + fastlane (2.212.1) CFPropertyList (>= 2.3, < 4.0.0) addressable (>= 2.8, < 3.0.0) artifactory (~> 3.0) @@ -106,9 +106,9 @@ GEM xcpretty (~> 0.3.0) xcpretty-travis-formatter (>= 0.0.3) gh_inspector (1.1.3) - google-apis-androidpublisher_v3 (0.21.0) - google-apis-core (>= 0.4, < 2.a) - google-apis-core (0.5.0) + google-apis-androidpublisher_v3 (0.36.0) + google-apis-core (>= 0.11.0, < 2.a) + google-apis-core (0.11.0) addressable (~> 2.5, >= 2.5.1) googleauth (>= 0.16.2, < 2.a) httpclient (>= 2.8.1, < 3.a) @@ -117,27 +117,27 @@ GEM retriable (>= 2.0, < 4.a) rexml webrick - google-apis-iamcredentials_v1 (0.10.0) - google-apis-core (>= 0.4, < 2.a) - google-apis-playcustomapp_v1 (0.7.0) - google-apis-core (>= 0.4, < 2.a) - google-apis-storage_v1 (0.14.0) - google-apis-core (>= 0.4, < 2.a) + google-apis-iamcredentials_v1 (0.17.0) + google-apis-core (>= 0.11.0, < 2.a) + google-apis-playcustomapp_v1 (0.13.0) + google-apis-core (>= 0.11.0, < 2.a) + google-apis-storage_v1 (0.19.0) + google-apis-core (>= 0.9.0, < 2.a) google-cloud-core (1.6.0) google-cloud-env (~> 1.0) google-cloud-errors (~> 1.0) google-cloud-env (1.6.0) faraday (>= 0.17.3, < 3.0) - google-cloud-errors (1.2.0) - google-cloud-storage (1.36.2) + google-cloud-errors (1.3.1) + google-cloud-storage (1.44.0) addressable (~> 2.8) digest-crc (~> 0.4) google-apis-iamcredentials_v1 (~> 0.1) - google-apis-storage_v1 (~> 0.1) + google-apis-storage_v1 (~> 0.19.0) google-cloud-core (~> 1.6) googleauth (>= 0.16.2, < 2.a) mini_mime (~> 1.0) - googleauth (1.1.3) + googleauth (1.3.0) faraday (>= 0.17.3, < 3.a) jwt (>= 1.4, < 3.0) memoist (~> 0.16) @@ -148,11 +148,11 @@ GEM http-cookie (1.0.5) domain_name (~> 0.5) httpclient (2.8.3) - jmespath (1.6.1) - json (2.6.2) - jwt (2.4.1) + jmespath (1.6.2) + json (2.6.3) + jwt (2.7.0) memoist (0.16.2) - mini_magick (4.11.0) + mini_magick (4.12.0) mini_mime (1.1.2) multi_json (1.15.0) multipart-post (2.0.0) @@ -160,8 +160,8 @@ GEM naturally (2.2.1) optparse (0.1.1) os (1.1.4) - plist (3.6.0) - public_suffix (4.0.7) + plist (3.7.0) + public_suffix (5.0.1) rake (13.0.6) representable (3.2.0) declarative (< 0.1.0) @@ -173,12 +173,12 @@ GEM ruby2_keywords (0.0.5) rubyzip (2.3.2) security (0.1.3) - signet (0.16.1) + signet (0.17.0) addressable (~> 2.8) - faraday (>= 0.17.5, < 3.0) + faraday (>= 0.17.5, < 3.a) jwt (>= 1.5, < 3.0) multi_json (~> 1.10) - simctl (1.6.8) + simctl (1.6.10) CFPropertyList naturally terminal-notifier (2.0.0) @@ -194,9 +194,9 @@ GEM unf_ext unf_ext (0.0.8.2) unicode-display_width (1.8.0) - webrick (1.7.0) + webrick (1.8.1) word_wrap (1.0.0) - xcodeproj (1.21.0) + xcodeproj (1.22.0) CFPropertyList (>= 2.3.3, < 4.0) atomos (~> 0.1.3) claide (>= 1.0.2, < 2.0) diff --git a/app/src/main/java/org/tasks/injection/ProductionModule.kt b/app/src/main/java/org/tasks/injection/ProductionModule.kt index 5f93318e6..c9d45bf71 100644 --- a/app/src/main/java/org/tasks/injection/ProductionModule.kt +++ b/app/src/main/java/org/tasks/injection/ProductionModule.kt @@ -12,7 +12,6 @@ import org.tasks.BuildConfig import org.tasks.R import org.tasks.caldav.FileStorage import org.tasks.data.CaldavDao -import org.tasks.data.GoogleTaskListDao import org.tasks.data.OpenTaskDao import org.tasks.db.Migrations import org.tasks.jobs.WorkManager @@ -51,9 +50,7 @@ internal class ProductionModule { fun getWorkManager( @ApplicationContext context: Context, preferences: Preferences, - googleTaskListDao: GoogleTaskListDao, caldavDao: CaldavDao, openTaskDao: OpenTaskDao - ): WorkManager = - WorkManagerImpl(context, preferences, googleTaskListDao, caldavDao, openTaskDao) + ): WorkManager = WorkManagerImpl(context, preferences, caldavDao, openTaskDao) } \ No newline at end of file diff --git a/app/src/main/java/org/tasks/jobs/WorkManagerImpl.kt b/app/src/main/java/org/tasks/jobs/WorkManagerImpl.kt index bbbf439d9..e3907e6ca 100644 --- a/app/src/main/java/org/tasks/jobs/WorkManagerImpl.kt +++ b/app/src/main/java/org/tasks/jobs/WorkManagerImpl.kt @@ -49,7 +49,6 @@ import kotlin.math.max class WorkManagerImpl constructor( private val context: Context, private val preferences: Preferences, - private val googleTaskListDao: GoogleTaskListDao, private val caldavDao: CaldavDao, private val openTaskDao: OpenTaskDao ): WorkManager { @@ -256,6 +255,6 @@ class WorkManagerImpl constructor( } } -private fun , W : WorkRequest> WorkRequest.Builder.setInputData( +private fun , W : WorkRequest> WorkRequest.Builder.setInputData( vararg pairs: Pair ): B = setInputData(workDataOf(*pairs)) diff --git a/deps_fdroid.txt b/deps_fdroid.txt index dfd99a7a3..df57ecc48 100644 --- a/deps_fdroid.txt +++ b/deps_fdroid.txt @@ -24,8 +24,8 @@ +| | | | \--- org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.6.4 +| | | | +--- org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.6.4 +| | | | | +--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4 (c) -+| | | | | +--- org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.6.4 (c) -+| | | | | \--- org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.4 (c) ++| | | | | +--- org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.4 (c) ++| | | | | \--- org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.6.4 (c) +| | | | +--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.6.21 -> 1.8.0 +| | | | | +--- org.jetbrains.kotlin:kotlin-stdlib:1.8.0 -> 1.8.10 (*) +| | | | | \--- org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.8.0 @@ -77,9 +77,7 @@ +| | +--- org.jetbrains.kotlin:kotlin-stdlib:1.8.10 (*) +| | +--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4 (*) +| | +--- androidx.lifecycle:lifecycle-common:2.6.0 (c) -+| | +--- androidx.lifecycle:lifecycle-common-java8:2.6.0 (c) +| | +--- androidx.lifecycle:lifecycle-livedata:2.6.0 (c) -+| | +--- androidx.lifecycle:lifecycle-livedata-core:2.6.0 (c) +| | +--- androidx.lifecycle:lifecycle-livedata-core-ktx:2.6.0 (c) +| | +--- androidx.lifecycle:lifecycle-livedata-ktx:2.6.0 (c) +| | +--- androidx.lifecycle:lifecycle-process:2.6.0 (c) @@ -88,7 +86,9 @@ +| | +--- androidx.lifecycle:lifecycle-viewmodel:2.6.0 (c) +| | +--- androidx.lifecycle:lifecycle-viewmodel-compose:2.6.0 (c) +| | +--- androidx.lifecycle:lifecycle-viewmodel-ktx:2.6.0 (c) -+| | \--- androidx.lifecycle:lifecycle-viewmodel-savedstate:2.6.0 (c) ++| | +--- androidx.lifecycle:lifecycle-viewmodel-savedstate:2.6.0 (c) ++| | +--- androidx.lifecycle:lifecycle-common-java8:2.6.0 (c) ++| | \--- androidx.lifecycle:lifecycle-livedata-core:2.6.0 (c) +| +--- androidx.lifecycle:lifecycle-livedata:2.4.0 -> 2.6.0 +| | +--- androidx.arch.core:core-common:2.1.0 -> 2.2.0 (*) +| | +--- androidx.arch.core:core-runtime:2.1.0 -> 2.2.0 (*) @@ -176,7 +176,7 @@ +| | \--- androidx.lifecycle:lifecycle-viewmodel-savedstate:2.6.0 (c) +| +--- androidx.databinding:databinding-runtime:7.4.2 (*) +| \--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.7.10 -> 1.8.0 (*) -++--- com.github.bitfireAT:dav4jvm:2.2 +++--- com.github.bitfireAT:dav4jvm:2.2.1 +| +--- org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.7.20 -> 1.8.0 (*) +| +--- org.apache.commons:commons-lang3:3.8.1 -> 3.12.0 +| +--- com.squareup.okhttp3:okhttp:4.10.0 @@ -385,9 +385,7 @@ +| | +--- org.jetbrains.kotlin:kotlin-stdlib:1.8.10 (*) +| | +--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4 (*) +| | +--- androidx.lifecycle:lifecycle-common:2.6.0 (c) -+| | +--- androidx.lifecycle:lifecycle-common-java8:2.6.0 (c) +| | +--- androidx.lifecycle:lifecycle-livedata:2.6.0 (c) -+| | +--- androidx.lifecycle:lifecycle-livedata-core:2.6.0 (c) +| | +--- androidx.lifecycle:lifecycle-livedata-core-ktx:2.6.0 (c) +| | +--- androidx.lifecycle:lifecycle-livedata-ktx:2.6.0 (c) +| | +--- androidx.lifecycle:lifecycle-process:2.6.0 (c) @@ -396,7 +394,9 @@ +| | +--- androidx.lifecycle:lifecycle-service:2.6.0 (c) +| | +--- androidx.lifecycle:lifecycle-viewmodel:2.6.0 (c) +| | +--- androidx.lifecycle:lifecycle-viewmodel-compose:2.6.0 (c) -+| | \--- androidx.lifecycle:lifecycle-viewmodel-savedstate:2.6.0 (c) ++| | +--- androidx.lifecycle:lifecycle-viewmodel-savedstate:2.6.0 (c) ++| | +--- androidx.lifecycle:lifecycle-common-java8:2.6.0 (c) ++| | \--- androidx.lifecycle:lifecycle-livedata-core:2.6.0 (c) +| +--- com.google.android.material:material:1.6.0 -> 1.8.0 +| | +--- androidx.annotation:annotation:1.2.0 -> 1.5.0 (*) +| | +--- androidx.appcompat:appcompat:1.5.0 -> 1.6.1 (*) @@ -473,26 +473,29 @@ +| +--- androidx.annotation:annotation:1.1.0 -> 1.5.0 (*) +| +--- androidx.hilt:hilt-common:1.0.0 +| | \--- com.google.dagger:hilt-core:2.35 -> 2.45 (*) -+| +--- androidx.work:work-runtime:2.3.4 -> 2.7.1 ++| +--- androidx.work:work-runtime:2.3.4 -> 2.8.0 +| | +--- androidx.annotation:annotation-experimental:1.0.0 -> 1.3.0 (*) -+| | +--- com.google.guava:listenablefuture:1.0 -> 9999.0-empty-to-avoid-conflict-with-guava -+| | +--- androidx.lifecycle:lifecycle-livedata:2.1.0 -> 2.6.0 (*) -+| | +--- androidx.startup:startup-runtime:1.0.0 -> 1.1.1 (*) ++| | +--- androidx.core:core:1.1.0 -> 1.9.0 (*) +| | +--- androidx.core:core:1.6.0 -> 1.9.0 (*) -+| | +--- androidx.room:room-runtime:2.2.5 -> 2.4.2 -+| | | +--- androidx.room:room-common:2.4.2 -+| | | | \--- androidx.annotation:annotation:1.1.0 -> 1.5.0 (*) -+| | | +--- androidx.sqlite:sqlite-framework:2.2.0 -+| | | | +--- androidx.annotation:annotation:1.0.0 -> 1.5.0 (*) -+| | | | \--- androidx.sqlite:sqlite:2.2.0 -+| | | | \--- androidx.annotation:annotation:1.0.0 -> 1.5.0 (*) -+| | | +--- androidx.sqlite:sqlite:2.2.0 (*) ++| | +--- androidx.lifecycle:lifecycle-livedata:2.1.0 -> 2.6.0 (*) ++| | +--- androidx.lifecycle:lifecycle-service:2.1.0 -> 2.6.0 (*) ++| | +--- androidx.room:room-runtime:2.5.0 ++| | | +--- androidx.annotation:annotation-experimental:1.1.0 -> 1.3.0 (*) +| | | +--- androidx.arch.core:core-runtime:2.0.1 -> 2.2.0 (*) -+| | | \--- androidx.annotation:annotation-experimental:1.1.0 -> 1.3.0 (*) -+| | +--- androidx.sqlite:sqlite:2.1.0 -> 2.2.0 (*) -+| | +--- androidx.sqlite:sqlite-framework:2.1.0 -> 2.2.0 (*) -+| | +--- androidx.core:core:1.1.0 -> 1.9.0 (*) -+| | \--- androidx.lifecycle:lifecycle-service:2.1.0 -> 2.6.0 (*) ++| | | +--- androidx.room:room-common:2.5.0 ++| | | | +--- androidx.annotation:annotation:1.3.0 -> 1.5.0 (*) ++| | | | \--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.7.20 -> 1.8.0 (*) ++| | | +--- androidx.sqlite:sqlite:2.3.0 ++| | | | +--- androidx.annotation:annotation:1.0.0 -> 1.5.0 (*) ++| | | | \--- org.jetbrains.kotlin:kotlin-stdlib:1.7.20 -> 1.8.10 (*) ++| | | \--- androidx.sqlite:sqlite-framework:2.3.0 ++| | | +--- androidx.annotation:annotation:1.2.0 -> 1.5.0 (*) ++| | | +--- androidx.sqlite:sqlite:2.3.0 (*) ++| | | \--- org.jetbrains.kotlin:kotlin-stdlib:1.7.20 -> 1.8.10 (*) ++| | +--- androidx.sqlite:sqlite-framework:2.3.0 (*) ++| | +--- androidx.startup:startup-runtime:1.0.0 -> 1.1.1 (*) ++| | +--- com.google.guava:listenablefuture:1.0 -> 9999.0-empty-to-avoid-conflict-with-guava ++| | \--- org.jetbrains.kotlin:kotlin-stdlib:1.7.21 -> 1.8.10 (*) +| \--- com.google.dagger:hilt-android:2.35 -> 2.45 (*) ++--- androidx.fragment:fragment-ktx:1.5.5 +| +--- androidx.activity:activity-ktx:1.5.1 -> 1.6.1 @@ -514,13 +517,13 @@ +| +--- androidx.lifecycle:lifecycle-viewmodel-ktx:2.5.1 -> 2.6.0 (*) +| +--- androidx.savedstate:savedstate-ktx:1.2.0 (*) +| \--- org.jetbrains.kotlin:kotlin-stdlib:1.6.21 -> 1.8.10 (*) -++--- androidx.lifecycle:lifecycle-runtime-ktx:2.4.1 -> 2.6.0 (*) -++--- androidx.lifecycle:lifecycle-viewmodel-ktx:2.4.1 -> 2.6.0 (*) -++--- androidx.room:room-ktx:2.4.2 -+| +--- androidx.room:room-common:2.4.2 (*) -+| +--- androidx.room:room-runtime:2.4.2 (*) -+| +--- org.jetbrains.kotlin:kotlin-stdlib:1.6.10 -> 1.8.10 (*) -+| \--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.5.2 -> 1.6.4 (*) +++--- androidx.lifecycle:lifecycle-runtime-ktx:2.6.0 (*) +++--- androidx.lifecycle:lifecycle-viewmodel-ktx:2.6.0 (*) +++--- androidx.room:room-ktx:2.5.0 ++| +--- androidx.room:room-common:2.5.0 (*) ++| +--- androidx.room:room-runtime:2.5.0 (*) ++| +--- org.jetbrains.kotlin:kotlin-stdlib:1.7.20 -> 1.8.10 (*) ++| \--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4 (*) ++--- androidx.appcompat:appcompat:1.6.1 (*) ++--- androidx.paging:paging-runtime:3.1.1 +| +--- androidx.paging:paging-common:3.1.1 @@ -556,9 +559,9 @@ +| \--- io.noties.markwon:core:4.6.2 (*) ++--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.0 (*) ++--- com.squareup.okhttp3:okhttp:4.10.0 (*) -++--- com.github.franmontiel:PersistentCookieJar:v1.0.1 +++--- com.github.franmontiel:PersistentCookieJar:1.0.1 +| \--- com.squareup.okhttp3:okhttp:3.1.2 -> 4.10.0 (*) -++--- com.google.code.gson:gson:2.9.0 +++--- com.google.code.gson:gson:2.10.1 ++--- com.google.android.material:material:1.8.0 (*) ++--- androidx.constraintlayout:constraintlayout:2.1.4 (*) ++--- androidx.swiperefreshlayout:swiperefreshlayout:1.1.0 @@ -590,36 +593,38 @@ ++--- com.github.twofortyfouram:android-plugin-api-for-locale:1.0.2 ++--- com.rubiconproject.oss:jchronic:0.2.6 ++--- me.leolin:ShortcutBadger:1.1.22 -++--- com.google.apis:google-api-services-tasks:v1-rev20210709-1.32.1 -+| \--- com.google.api-client:google-api-client:1.32.1 -+| +--- com.google.oauth-client:google-oauth-client:1.31.5 -+| | +--- com.google.http-client:google-http-client:1.39.2 -+| | | +--- com.google.guava:guava:30.1.1-android +++--- com.google.apis:google-api-services-tasks:v1-rev20210709-2.0.0 ++| \--- com.google.api-client:google-api-client:2.0.0 -> 2.2.0 ++| +--- commons-codec:commons-codec:1.15 ++| +--- com.google.oauth-client:google-oauth-client:1.34.1 ++| | +--- com.google.http-client:google-http-client:1.42.0 -> 1.42.3 ++| | | +--- com.google.guava:guava:30.1.1-android -> 31.1-jre +| | | | +--- com.google.guava:failureaccess:1.0.1 +| | | | \--- com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava -+| | | +--- io.opencensus:opencensus-api:0.28.0 ++| | | +--- io.opencensus:opencensus-api:0.31.1 +| | | | \--- io.grpc:grpc-context:1.27.2 -+| | | \--- io.opencensus:opencensus-contrib-http-util:0.28.0 -+| | | +--- io.opencensus:opencensus-api:0.28.0 (*) -+| | | \--- com.google.guava:guava:29.0-android -> 30.1.1-android (*) -+| | \--- com.google.guava:guava:30.1-android -> 30.1.1-android (*) -+| +--- com.google.http-client:google-http-client-gson:1.39.2 -+| | +--- com.google.http-client:google-http-client:1.39.2 (*) -+| | \--- com.google.code.gson:gson:2.8.6 -> 2.9.0 -+| +--- com.google.guava:guava:30.1.1-android (*) -+| \--- com.google.http-client:google-http-client:1.39.2 (*) -++--- com.google.apis:google-api-services-drive:v3-rev20210725-1.32.1 -+| \--- com.google.api-client:google-api-client:1.32.1 (*) -++--- com.google.auth:google-auth-library-oauth2-http:0.26.0 ++| | | \--- io.opencensus:opencensus-contrib-http-util:0.31.1 ++| | | +--- io.opencensus:opencensus-api:0.31.1 (*) ++| | | \--- com.google.guava:guava:29.0-android -> 31.1-jre (*) ++| | +--- com.google.http-client:google-http-client-gson:1.42.0 -> 1.42.3 ++| | | +--- com.google.http-client:google-http-client:1.42.3 (*) ++| | | \--- com.google.code.gson:gson:2.10 -> 2.10.1 ++| | \--- com.google.guava:guava:31.1-android -> 31.1-jre (*) ++| +--- com.google.http-client:google-http-client-gson:1.42.3 (*) ++| +--- com.google.guava:guava:31.1-jre (*) ++| \--- com.google.http-client:google-http-client:1.42.3 (*) +++--- com.google.apis:google-api-services-drive:v3-rev20230212-2.0.0 ++| \--- com.google.api-client:google-api-client:2.2.0 (*) +++--- com.google.auth:google-auth-library-oauth2-http:0.27.0 +| +--- com.google.auto.value:auto-value-annotations:1.8.1 -+| +--- com.google.auth:google-auth-library-credentials:0.26.0 -+| +--- com.google.http-client:google-http-client:1.39.2 (*) -+| +--- com.google.http-client:google-http-client-gson:1.39.2 (*) -+| \--- com.google.guava:guava:30.1.1-android (*) -++--- androidx.work:work-runtime-ktx:2.7.1 -+| +--- androidx.work:work-runtime:2.7.1 (*) -+| +--- org.jetbrains.kotlin:kotlin-stdlib:1.5.30 -> 1.8.10 (*) -+| \--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.5.0 -> 1.6.4 (*) ++| +--- com.google.auth:google-auth-library-credentials:0.27.0 ++| +--- com.google.http-client:google-http-client:1.39.2 -> 1.42.3 (*) ++| +--- com.google.http-client:google-http-client-gson:1.39.2 -> 1.42.3 (*) ++| \--- com.google.guava:guava:30.1.1-android -> 31.1-jre (*) +++--- androidx.work:work-runtime-ktx:2.8.0 ++| +--- androidx.work:work-runtime:2.8.0 (*) ++| +--- org.jetbrains.kotlin:kotlin-stdlib:1.7.21 -> 1.8.10 (*) ++| \--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4 (*) ++--- com.etebase:client:2.3.2 +| +--- androidx.annotation:annotation:1.1.0 -> 1.5.0 (*) +| \--- com.squareup.okhttp3:logging-interceptor:3.12.1 @@ -636,7 +641,7 @@ +| +--- androidx.core:core:1.1.0 -> 1.9.0 (*) +| +--- androidx.annotation:annotation:1.1.0 -> 1.5.0 (*) +| \--- com.google.guava:listenablefuture:1.0 -> 9999.0-empty-to-avoid-conflict-with-guava -++--- org.osmdroid:osmdroid-android:6.1.11 +++--- org.osmdroid:osmdroid-android:6.1.14 ++--- com.squareup.retrofit2:retrofit:2.9.0 +| \--- com.squareup.okhttp3:okhttp:3.14.9 -> 4.10.0 (*) ++--- com.squareup.retrofit2:converter-moshi:2.9.0 @@ -795,13 +800,16 @@ +| +--- androidx.compose.ui:ui:1.0.0 -> 1.3.3 (*) +| +--- androidx.lifecycle:lifecycle-livedata:2.2.0 -> 2.6.0 (*) +| \--- org.jetbrains.kotlin:kotlin-stdlib:1.7.10 -> 1.8.10 (*) -++--- com.google.android.material:compose-theme-adapter:1.1.11 -+| +--- androidx.appcompat:appcompat:1.4.1 -> 1.6.1 (*) -+| +--- androidx.core:core-ktx:1.8.0-rc02 -> 1.9.0 (*) -+| +--- androidx.compose.runtime:runtime:1.2.0-beta03 -> 1.3.3 (*) -+| +--- androidx.compose.material:material:1.2.0-beta03 -> 1.3.1 (*) -+| +--- com.google.android.material:material:1.7.0-alpha02 -> 1.8.0 (*) -+| \--- org.jetbrains.kotlin:kotlin-stdlib:1.6.21 -> 1.8.10 (*) +++--- com.google.android.material:compose-theme-adapter:1.2.1 ++| +--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.7.20 -> 1.8.0 (*) ++| +--- com.google.android.material:compose-theme-adapter-core:1.0.1 ++| | +--- org.jetbrains.kotlin:kotlin-stdlib:1.7.20 -> 1.8.10 (*) ++| | +--- androidx.core:core-ktx:1.9.0 (*) ++| | +--- androidx.appcompat:appcompat:1.5.1 -> 1.6.1 (*) ++| | +--- com.google.android.material:material:1.7.0 -> 1.8.0 (*) ++| | +--- androidx.compose.runtime:runtime:1.3.1 -> 1.3.3 (*) ++| | \--- androidx.compose.foundation:foundation:1.3.1 (*) ++| \--- androidx.compose.material:material:1.3.1 (*) ++--- androidx.activity:activity-compose:1.6.1 +| +--- androidx.activity:activity-ktx:1.6.1 (*) +| +--- androidx.compose.runtime:runtime:1.0.1 -> 1.3.3 (*) @@ -871,13 +879,14 @@ +| +--- io.coil-kt:coil-base:2.2.2 (*) +| +--- androidx.core:core-ktx:1.8.0 -> 1.9.0 (*) +| \--- androidx.vectordrawable:vectordrawable-animated:1.1.0 (*) -++--- com.google.accompanist:accompanist-flowlayout:0.24.12-rc -+| +--- androidx.compose.foundation:foundation:1.2.0-rc02 -> 1.3.1 (*) -+| \--- androidx.compose.ui:ui-util:1.2.0-rc02 -> 1.3.3 (*) -+\--- com.google.accompanist:accompanist-permissions:0.24.12-rc -+ +--- androidx.activity:activity-compose:1.5.0-rc01 -> 1.6.1 (*) -+ +--- androidx.compose.foundation:foundation:1.2.0-rc02 -> 1.3.1 (*) -+ +--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.0 -> 1.6.4 (*) +++--- com.google.accompanist:accompanist-flowlayout:0.28.0 ++| +--- androidx.compose.foundation:foundation:1.3.1 (*) ++| +--- androidx.compose.ui:ui-util:1.3.1 -> 1.3.3 (*) ++| \--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4 (*) ++\--- com.google.accompanist:accompanist-permissions:0.28.0 ++ +--- androidx.activity:activity-compose:1.5.1 -> 1.6.1 (*) ++ +--- androidx.compose.foundation:foundation:1.3.1 (*) ++ +--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4 (*) + \--- io.github.aakira:napier:1.4.1 + \--- io.github.aakira:napier-android:1.4.1 + +--- org.jetbrains.kotlin:kotlin-stdlib:1.4.32 -> 1.8.10 (*) diff --git a/deps_googleplay.txt b/deps_googleplay.txt index f5d8073e7..01ba76643 100644 --- a/deps_googleplay.txt +++ b/deps_googleplay.txt @@ -24,9 +24,9 @@ +| | | | \--- org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.6.4 +| | | | +--- org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.6.4 +| | | | | +--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4 (c) -+| | | | | +--- org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.6.4 (c) +| | | | | +--- org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.4 (c) -+| | | | | \--- org.jetbrains.kotlinx:kotlinx-coroutines-play-services:1.6.4 (c) ++| | | | | +--- org.jetbrains.kotlinx:kotlinx-coroutines-play-services:1.6.4 (c) ++| | | | | \--- org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.6.4 (c) +| | | | +--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.6.21 -> 1.8.0 +| | | | | +--- org.jetbrains.kotlin:kotlin-stdlib:1.8.0 -> 1.8.10 (*) +| | | | | \--- org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.8.0 @@ -78,9 +78,7 @@ +| | +--- org.jetbrains.kotlin:kotlin-stdlib:1.8.10 (*) +| | +--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4 (*) +| | +--- androidx.lifecycle:lifecycle-common:2.6.0 (c) -+| | +--- androidx.lifecycle:lifecycle-common-java8:2.6.0 (c) +| | +--- androidx.lifecycle:lifecycle-livedata:2.6.0 (c) -+| | +--- androidx.lifecycle:lifecycle-livedata-core:2.6.0 (c) +| | +--- androidx.lifecycle:lifecycle-livedata-core-ktx:2.6.0 (c) +| | +--- androidx.lifecycle:lifecycle-livedata-ktx:2.6.0 (c) +| | +--- androidx.lifecycle:lifecycle-process:2.6.0 (c) @@ -89,7 +87,9 @@ +| | +--- androidx.lifecycle:lifecycle-viewmodel:2.6.0 (c) +| | +--- androidx.lifecycle:lifecycle-viewmodel-compose:2.6.0 (c) +| | +--- androidx.lifecycle:lifecycle-viewmodel-ktx:2.6.0 (c) -+| | \--- androidx.lifecycle:lifecycle-viewmodel-savedstate:2.6.0 (c) ++| | +--- androidx.lifecycle:lifecycle-viewmodel-savedstate:2.6.0 (c) ++| | +--- androidx.lifecycle:lifecycle-common-java8:2.6.0 (c) ++| | \--- androidx.lifecycle:lifecycle-livedata-core:2.6.0 (c) +| +--- androidx.lifecycle:lifecycle-livedata:2.4.0 -> 2.6.0 +| | +--- androidx.arch.core:core-common:2.1.0 -> 2.2.0 (*) +| | +--- androidx.arch.core:core-runtime:2.1.0 -> 2.2.0 (*) @@ -397,8 +397,8 @@ +| +--- androidx.fragment:fragment:1.0.0 -> 1.5.5 (*) +| +--- com.google.android.gms:play-services-base:18.0.1 (*) +| \--- com.google.android.gms:play-services-basement:18.0.0 -> 18.1.0 (*) -++--- com.android.billingclient:billing-ktx:4.0.0 -+| +--- com.android.billingclient:billing:4.0.0 +++--- com.android.billingclient:billing-ktx:4.1.0 ++| +--- com.android.billingclient:billing:4.1.0 +| +--- org.jetbrains.kotlin:kotlin-stdlib:1.4.0 -> 1.8.10 (*) +| \--- org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.9 -> 1.6.4 (*) ++--- com.google.android.play:core:1.10.3 @@ -457,7 +457,7 @@ +| +--- com.google.android.gms:play-services-base:17.0.0 -> 18.0.1 (*) +| +--- com.google.android.gms:play-services-basement:17.0.0 -> 18.1.0 (*) +| \--- com.google.android.gms:play-services-tasks:17.0.0 -> 18.0.2 (*) -++--- com.github.bitfireAT:dav4jvm:2.2 +++--- com.github.bitfireAT:dav4jvm:2.2.1 +| +--- org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.7.20 -> 1.8.0 (*) +| +--- org.apache.commons:commons-lang3:3.8.1 -> 3.12.0 +| +--- com.squareup.okhttp3:okhttp:4.10.0 @@ -551,9 +551,7 @@ +| | +--- org.jetbrains.kotlin:kotlin-stdlib:1.8.10 (*) +| | +--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4 (*) +| | +--- androidx.lifecycle:lifecycle-common:2.6.0 (c) -+| | +--- androidx.lifecycle:lifecycle-common-java8:2.6.0 (c) +| | +--- androidx.lifecycle:lifecycle-livedata:2.6.0 (c) -+| | +--- androidx.lifecycle:lifecycle-livedata-core:2.6.0 (c) +| | +--- androidx.lifecycle:lifecycle-livedata-core-ktx:2.6.0 (c) +| | +--- androidx.lifecycle:lifecycle-livedata-ktx:2.6.0 (c) +| | +--- androidx.lifecycle:lifecycle-process:2.6.0 (c) @@ -562,7 +560,9 @@ +| | +--- androidx.lifecycle:lifecycle-service:2.6.0 (c) +| | +--- androidx.lifecycle:lifecycle-viewmodel:2.6.0 (c) +| | +--- androidx.lifecycle:lifecycle-viewmodel-compose:2.6.0 (c) -+| | \--- androidx.lifecycle:lifecycle-viewmodel-savedstate:2.6.0 (c) ++| | +--- androidx.lifecycle:lifecycle-viewmodel-savedstate:2.6.0 (c) ++| | +--- androidx.lifecycle:lifecycle-common-java8:2.6.0 (c) ++| | \--- androidx.lifecycle:lifecycle-livedata-core:2.6.0 (c) +| +--- com.google.android.material:material:1.6.0 -> 1.8.0 +| | +--- androidx.annotation:annotation:1.2.0 -> 1.5.0 (*) +| | +--- androidx.appcompat:appcompat:1.5.0 -> 1.6.1 (*) @@ -630,26 +630,29 @@ +| +--- androidx.annotation:annotation:1.1.0 -> 1.5.0 (*) +| +--- androidx.hilt:hilt-common:1.0.0 +| | \--- com.google.dagger:hilt-core:2.35 -> 2.45 (*) -+| +--- androidx.work:work-runtime:2.3.4 -> 2.7.1 ++| +--- androidx.work:work-runtime:2.3.4 -> 2.8.0 +| | +--- androidx.annotation:annotation-experimental:1.0.0 -> 1.3.0 (*) -+| | +--- com.google.guava:listenablefuture:1.0 -> 9999.0-empty-to-avoid-conflict-with-guava -+| | +--- androidx.lifecycle:lifecycle-livedata:2.1.0 -> 2.6.0 (*) -+| | +--- androidx.startup:startup-runtime:1.0.0 -> 1.1.1 (*) ++| | +--- androidx.core:core:1.1.0 -> 1.9.0 (*) +| | +--- androidx.core:core:1.6.0 -> 1.9.0 (*) -+| | +--- androidx.room:room-runtime:2.2.5 -> 2.4.2 -+| | | +--- androidx.room:room-common:2.4.2 -+| | | | \--- androidx.annotation:annotation:1.1.0 -> 1.5.0 (*) -+| | | +--- androidx.sqlite:sqlite-framework:2.2.0 -+| | | | +--- androidx.annotation:annotation:1.0.0 -> 1.5.0 (*) -+| | | | \--- androidx.sqlite:sqlite:2.2.0 -+| | | | \--- androidx.annotation:annotation:1.0.0 -> 1.5.0 (*) -+| | | +--- androidx.sqlite:sqlite:2.2.0 (*) ++| | +--- androidx.lifecycle:lifecycle-livedata:2.1.0 -> 2.6.0 (*) ++| | +--- androidx.lifecycle:lifecycle-service:2.1.0 -> 2.6.0 (*) ++| | +--- androidx.room:room-runtime:2.5.0 ++| | | +--- androidx.annotation:annotation-experimental:1.1.0 -> 1.3.0 (*) +| | | +--- androidx.arch.core:core-runtime:2.0.1 -> 2.2.0 (*) -+| | | \--- androidx.annotation:annotation-experimental:1.1.0 -> 1.3.0 (*) -+| | +--- androidx.sqlite:sqlite:2.1.0 -> 2.2.0 (*) -+| | +--- androidx.sqlite:sqlite-framework:2.1.0 -> 2.2.0 (*) -+| | +--- androidx.core:core:1.1.0 -> 1.9.0 (*) -+| | \--- androidx.lifecycle:lifecycle-service:2.1.0 -> 2.6.0 (*) ++| | | +--- androidx.room:room-common:2.5.0 ++| | | | +--- androidx.annotation:annotation:1.3.0 -> 1.5.0 (*) ++| | | | \--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.7.20 -> 1.8.0 (*) ++| | | +--- androidx.sqlite:sqlite:2.3.0 ++| | | | +--- androidx.annotation:annotation:1.0.0 -> 1.5.0 (*) ++| | | | \--- org.jetbrains.kotlin:kotlin-stdlib:1.7.20 -> 1.8.10 (*) ++| | | \--- androidx.sqlite:sqlite-framework:2.3.0 ++| | | +--- androidx.annotation:annotation:1.2.0 -> 1.5.0 (*) ++| | | +--- androidx.sqlite:sqlite:2.3.0 (*) ++| | | \--- org.jetbrains.kotlin:kotlin-stdlib:1.7.20 -> 1.8.10 (*) ++| | +--- androidx.sqlite:sqlite-framework:2.3.0 (*) ++| | +--- androidx.startup:startup-runtime:1.0.0 -> 1.1.1 (*) ++| | +--- com.google.guava:listenablefuture:1.0 -> 9999.0-empty-to-avoid-conflict-with-guava ++| | \--- org.jetbrains.kotlin:kotlin-stdlib:1.7.21 -> 1.8.10 (*) +| \--- com.google.dagger:hilt-android:2.35 -> 2.45 (*) ++--- androidx.fragment:fragment-ktx:1.5.5 +| +--- androidx.activity:activity-ktx:1.5.1 -> 1.6.1 @@ -671,13 +674,13 @@ +| +--- androidx.lifecycle:lifecycle-viewmodel-ktx:2.5.1 -> 2.6.0 (*) +| +--- androidx.savedstate:savedstate-ktx:1.2.0 (*) +| \--- org.jetbrains.kotlin:kotlin-stdlib:1.6.21 -> 1.8.10 (*) -++--- androidx.lifecycle:lifecycle-runtime-ktx:2.4.1 -> 2.6.0 (*) -++--- androidx.lifecycle:lifecycle-viewmodel-ktx:2.4.1 -> 2.6.0 (*) -++--- androidx.room:room-ktx:2.4.2 -+| +--- androidx.room:room-common:2.4.2 (*) -+| +--- androidx.room:room-runtime:2.4.2 (*) -+| +--- org.jetbrains.kotlin:kotlin-stdlib:1.6.10 -> 1.8.10 (*) -+| \--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.5.2 -> 1.6.4 (*) +++--- androidx.lifecycle:lifecycle-runtime-ktx:2.6.0 (*) +++--- androidx.lifecycle:lifecycle-viewmodel-ktx:2.6.0 (*) +++--- androidx.room:room-ktx:2.5.0 ++| +--- androidx.room:room-common:2.5.0 (*) ++| +--- androidx.room:room-runtime:2.5.0 (*) ++| +--- org.jetbrains.kotlin:kotlin-stdlib:1.7.20 -> 1.8.10 (*) ++| \--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4 (*) ++--- androidx.appcompat:appcompat:1.6.1 (*) ++--- androidx.paging:paging-runtime:3.1.1 +| +--- androidx.paging:paging-common:3.1.1 @@ -713,9 +716,9 @@ +| \--- io.noties.markwon:core:4.6.2 (*) ++--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.0 (*) ++--- com.squareup.okhttp3:okhttp:4.10.0 (*) -++--- com.github.franmontiel:PersistentCookieJar:v1.0.1 +++--- com.github.franmontiel:PersistentCookieJar:1.0.1 +| \--- com.squareup.okhttp3:okhttp:3.1.2 -> 4.10.0 (*) -++--- com.google.code.gson:gson:2.9.0 +++--- com.google.code.gson:gson:2.10.1 ++--- com.google.android.material:material:1.8.0 (*) ++--- androidx.constraintlayout:constraintlayout:2.1.4 (*) ++--- androidx.swiperefreshlayout:swiperefreshlayout:1.1.0 @@ -747,36 +750,38 @@ ++--- com.github.twofortyfouram:android-plugin-api-for-locale:1.0.2 ++--- com.rubiconproject.oss:jchronic:0.2.6 ++--- me.leolin:ShortcutBadger:1.1.22 -++--- com.google.apis:google-api-services-tasks:v1-rev20210709-1.32.1 -+| \--- com.google.api-client:google-api-client:1.32.1 -+| +--- com.google.oauth-client:google-oauth-client:1.31.5 -+| | +--- com.google.http-client:google-http-client:1.39.2 -+| | | +--- com.google.guava:guava:30.1.1-android +++--- com.google.apis:google-api-services-tasks:v1-rev20210709-2.0.0 ++| \--- com.google.api-client:google-api-client:2.0.0 -> 2.2.0 ++| +--- commons-codec:commons-codec:1.15 ++| +--- com.google.oauth-client:google-oauth-client:1.34.1 ++| | +--- com.google.http-client:google-http-client:1.42.0 -> 1.42.3 ++| | | +--- com.google.guava:guava:30.1.1-android -> 31.1-jre +| | | | +--- com.google.guava:failureaccess:1.0.1 +| | | | \--- com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava -+| | | +--- io.opencensus:opencensus-api:0.28.0 ++| | | +--- io.opencensus:opencensus-api:0.31.1 +| | | | \--- io.grpc:grpc-context:1.27.2 -+| | | \--- io.opencensus:opencensus-contrib-http-util:0.28.0 -+| | | +--- io.opencensus:opencensus-api:0.28.0 (*) -+| | | \--- com.google.guava:guava:29.0-android -> 30.1.1-android (*) -+| | \--- com.google.guava:guava:30.1-android -> 30.1.1-android (*) -+| +--- com.google.http-client:google-http-client-gson:1.39.2 -+| | +--- com.google.http-client:google-http-client:1.39.2 (*) -+| | \--- com.google.code.gson:gson:2.8.6 -> 2.9.0 -+| +--- com.google.guava:guava:30.1.1-android (*) -+| \--- com.google.http-client:google-http-client:1.39.2 (*) -++--- com.google.apis:google-api-services-drive:v3-rev20210725-1.32.1 -+| \--- com.google.api-client:google-api-client:1.32.1 (*) -++--- com.google.auth:google-auth-library-oauth2-http:0.26.0 ++| | | \--- io.opencensus:opencensus-contrib-http-util:0.31.1 ++| | | +--- io.opencensus:opencensus-api:0.31.1 (*) ++| | | \--- com.google.guava:guava:29.0-android -> 31.1-jre (*) ++| | +--- com.google.http-client:google-http-client-gson:1.42.0 -> 1.42.3 ++| | | +--- com.google.http-client:google-http-client:1.42.3 (*) ++| | | \--- com.google.code.gson:gson:2.10 -> 2.10.1 ++| | \--- com.google.guava:guava:31.1-android -> 31.1-jre (*) ++| +--- com.google.http-client:google-http-client-gson:1.42.3 (*) ++| +--- com.google.guava:guava:31.1-jre (*) ++| \--- com.google.http-client:google-http-client:1.42.3 (*) +++--- com.google.apis:google-api-services-drive:v3-rev20230212-2.0.0 ++| \--- com.google.api-client:google-api-client:2.2.0 (*) +++--- com.google.auth:google-auth-library-oauth2-http:0.27.0 +| +--- com.google.auto.value:auto-value-annotations:1.8.1 -+| +--- com.google.auth:google-auth-library-credentials:0.26.0 -+| +--- com.google.http-client:google-http-client:1.39.2 (*) -+| +--- com.google.http-client:google-http-client-gson:1.39.2 (*) -+| \--- com.google.guava:guava:30.1.1-android (*) -++--- androidx.work:work-runtime-ktx:2.7.1 -+| +--- androidx.work:work-runtime:2.7.1 (*) -+| +--- org.jetbrains.kotlin:kotlin-stdlib:1.5.30 -> 1.8.10 (*) -+| \--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.5.0 -> 1.6.4 (*) ++| +--- com.google.auth:google-auth-library-credentials:0.27.0 ++| +--- com.google.http-client:google-http-client:1.39.2 -> 1.42.3 (*) ++| +--- com.google.http-client:google-http-client-gson:1.39.2 -> 1.42.3 (*) ++| \--- com.google.guava:guava:30.1.1-android -> 31.1-jre (*) +++--- androidx.work:work-runtime-ktx:2.8.0 ++| +--- androidx.work:work-runtime:2.8.0 (*) ++| +--- org.jetbrains.kotlin:kotlin-stdlib:1.7.21 -> 1.8.10 (*) ++| \--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4 (*) ++--- com.etebase:client:2.3.2 +| +--- androidx.annotation:annotation:1.1.0 -> 1.5.0 (*) +| \--- com.squareup.okhttp3:logging-interceptor:3.12.1 @@ -793,7 +798,7 @@ +| +--- androidx.core:core:1.1.0 -> 1.9.0 (*) +| +--- androidx.annotation:annotation:1.1.0 -> 1.5.0 (*) +| \--- com.google.guava:listenablefuture:1.0 -> 9999.0-empty-to-avoid-conflict-with-guava -++--- org.osmdroid:osmdroid-android:6.1.11 +++--- org.osmdroid:osmdroid-android:6.1.14 ++--- com.squareup.retrofit2:retrofit:2.9.0 +| \--- com.squareup.okhttp3:okhttp:3.14.9 -> 4.10.0 (*) ++--- com.squareup.retrofit2:converter-moshi:2.9.0 @@ -952,13 +957,16 @@ +| +--- androidx.compose.ui:ui:1.0.0 -> 1.3.3 (*) +| +--- androidx.lifecycle:lifecycle-livedata:2.2.0 -> 2.6.0 (*) +| \--- org.jetbrains.kotlin:kotlin-stdlib:1.7.10 -> 1.8.10 (*) -++--- com.google.android.material:compose-theme-adapter:1.1.11 -+| +--- androidx.appcompat:appcompat:1.4.1 -> 1.6.1 (*) -+| +--- androidx.core:core-ktx:1.8.0-rc02 -> 1.9.0 (*) -+| +--- androidx.compose.runtime:runtime:1.2.0-beta03 -> 1.3.3 (*) -+| +--- androidx.compose.material:material:1.2.0-beta03 -> 1.3.1 (*) -+| +--- com.google.android.material:material:1.7.0-alpha02 -> 1.8.0 (*) -+| \--- org.jetbrains.kotlin:kotlin-stdlib:1.6.21 -> 1.8.10 (*) +++--- com.google.android.material:compose-theme-adapter:1.2.1 ++| +--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.7.20 -> 1.8.0 (*) ++| +--- com.google.android.material:compose-theme-adapter-core:1.0.1 ++| | +--- org.jetbrains.kotlin:kotlin-stdlib:1.7.20 -> 1.8.10 (*) ++| | +--- androidx.core:core-ktx:1.9.0 (*) ++| | +--- androidx.appcompat:appcompat:1.5.1 -> 1.6.1 (*) ++| | +--- com.google.android.material:material:1.7.0 -> 1.8.0 (*) ++| | +--- androidx.compose.runtime:runtime:1.3.1 -> 1.3.3 (*) ++| | \--- androidx.compose.foundation:foundation:1.3.1 (*) ++| \--- androidx.compose.material:material:1.3.1 (*) ++--- androidx.activity:activity-compose:1.6.1 +| +--- androidx.activity:activity-ktx:1.6.1 (*) +| +--- androidx.compose.runtime:runtime:1.0.1 -> 1.3.3 (*) @@ -1028,13 +1036,14 @@ +| +--- io.coil-kt:coil-base:2.2.2 (*) +| +--- androidx.core:core-ktx:1.8.0 -> 1.9.0 (*) +| \--- androidx.vectordrawable:vectordrawable-animated:1.1.0 (*) -++--- com.google.accompanist:accompanist-flowlayout:0.24.12-rc -+| +--- androidx.compose.foundation:foundation:1.2.0-rc02 -> 1.3.1 (*) -+| \--- androidx.compose.ui:ui-util:1.2.0-rc02 -> 1.3.3 (*) -+\--- com.google.accompanist:accompanist-permissions:0.24.12-rc -+ +--- androidx.activity:activity-compose:1.5.0-rc01 -> 1.6.1 (*) -+ +--- androidx.compose.foundation:foundation:1.2.0-rc02 -> 1.3.1 (*) -+ +--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.0 -> 1.6.4 (*) +++--- com.google.accompanist:accompanist-flowlayout:0.28.0 ++| +--- androidx.compose.foundation:foundation:1.3.1 (*) ++| +--- androidx.compose.ui:ui-util:1.3.1 -> 1.3.3 (*) ++| \--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4 (*) ++\--- com.google.accompanist:accompanist-permissions:0.28.0 ++ +--- androidx.activity:activity-compose:1.5.1 -> 1.6.1 (*) ++ +--- androidx.compose.foundation:foundation:1.3.1 (*) ++ +--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4 (*) + \--- io.github.aakira:napier:1.4.1 + \--- io.github.aakira:napier-android:1.4.1 + +--- org.jetbrains.kotlin:kotlin-stdlib:1.4.32 -> 1.8.10 (*) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 71e0d91d7..8d50bb439 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,11 +1,9 @@ [versions] -accompanist = "0.24.12-rc" -analytics = "20.1.0" +accompanist = "0.28.0" coil = "2.2.2" compose = "2023.01.00" compose-compiler = "1.4.0" compose-theme-adapter = "1.2.1" -crashlytics = "18.2.11" dagger-hilt = "2.45" firebase = "31.2.3" flipper = "0.184.0" @@ -15,14 +13,14 @@ leakcanary = "2.10" lifecycle = "2.6.0" make-it-easy = "4.0.1" markwon = "4.6.2" -mockito = "3.9.0" +mockito = "3.12.4" okhttp = "4.10.0" -remote-config = "21.0.1" retrofit = "2.9.0" -room = "2.4.2" +room = "2.5.0" soloader = "0.10.5" work = "2.8.0" androidx-test = "1.5.0" +androidx-test-runner = "1.5.2" [libraries] accompanist-flowlayout = { module = "com.google.accompanist:accompanist-flowlayout", version.ref = "accompanist" } @@ -36,7 +34,7 @@ androidx-room = { module = "androidx.room:room-ktx", version.ref = "room" } androidx-room-compiler = { module = "androidx.room:room-compiler", version.ref = "room"} androidx-test-core = { module = "androidx.test:core", version.ref = "androidx-test" } androidx-test-rules = { module = "androidx.test:rules", version.ref = "androidx-test" } -androidx-test-runner = { module = "androidx.test:runner", version.ref = "androidx-test" } +androidx-test-runner = { module = "androidx.test:runner", version.ref = "androidx-test-runner" } androidx-work = { module = "androidx.work:work-runtime-ktx", version.ref = "work" } coil-compose = { module = "io.coil-kt:coil-compose", version.ref = "coil" } coil-gif = { module = "io.coil-kt:coil-gif", version.ref = "coil" }