From 1320ad2e7d774977dab691efa6e493b7d8fc99d7 Mon Sep 17 00:00:00 2001 From: Alex Baker Date: Tue, 26 Oct 2021 12:40:36 -0500 Subject: [PATCH] material components 1.5.0-alpha05 --- app/build.gradle.kts | 2 +- deps_fdroid.txt | 28 +++++++++++++++------------- deps_googleplay.txt | 28 +++++++++++++++------------- 3 files changed, 31 insertions(+), 27 deletions(-) diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 18f052c86..7736b12d2 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -204,7 +204,7 @@ dependencies { implementation("org.jetbrains.kotlinx:kotlinx-collections-immutable-jvm:0.3.4") implementation("com.squareup.okhttp3:okhttp:${Versions.okhttp}") implementation("com.google.code.gson:gson:2.8.8") - implementation("com.google.android.material:material:1.4.0") + implementation("com.google.android.material:material:1.5.0-alpha05") implementation("androidx.constraintlayout:constraintlayout:2.1.0") implementation("androidx.swiperefreshlayout:swiperefreshlayout:1.1.0") implementation("androidx.preference:preference:1.1.1") diff --git a/deps_fdroid.txt b/deps_fdroid.txt index 5d7353d4e..e839806b5 100644 --- a/deps_fdroid.txt +++ b/deps_fdroid.txt @@ -48,9 +48,10 @@ +| | | +--- androidx.viewpager:viewpager:1.0.0 +| | | | +--- androidx.annotation:annotation:1.0.0 -> 1.2.0 +| | | | +--- androidx.core:core:1.0.0 -> 1.6.0 (*) -+| | | | \--- androidx.customview:customview:1.0.0 -+| | | | +--- androidx.annotation:annotation:1.0.0 -> 1.2.0 -+| | | | \--- androidx.core:core:1.0.0 -> 1.6.0 (*) ++| | | | \--- androidx.customview:customview:1.0.0 -> 1.1.0 ++| | | | +--- androidx.annotation:annotation:1.1.0 -> 1.2.0 ++| | | | +--- androidx.core:core:1.3.0 -> 1.6.0 (*) ++| | | | \--- androidx.collection:collection:1.1.0 (*) +| | | +--- androidx.loader:loader:1.0.0 +| | | | +--- androidx.annotation:annotation:1.0.0 -> 1.2.0 +| | | | +--- androidx.core:core:1.0.0 -> 1.6.0 (*) @@ -143,10 +144,10 @@ +| | | +--- androidx.interpolator:interpolator:1.0.0 +| | | | \--- androidx.annotation:annotation:1.0.0 -> 1.2.0 +| | | \--- androidx.collection:collection:1.1.0 (*) -+| | +--- androidx.drawerlayout:drawerlayout:1.0.0 -+| | | +--- androidx.annotation:annotation:1.0.0 -> 1.2.0 -+| | | +--- androidx.core:core:1.0.0 -> 1.6.0 (*) -+| | | \--- androidx.customview:customview:1.0.0 (*) ++| | +--- androidx.drawerlayout:drawerlayout:1.0.0 -> 1.1.1 ++| | | +--- androidx.annotation:annotation:1.1.0 -> 1.2.0 ++| | | +--- androidx.core:core:1.2.0 -> 1.6.0 (*) ++| | | \--- androidx.customview:customview:1.1.0 (*) +| | +--- androidx.savedstate:savedstate:1.1.0 (*) +| | +--- androidx.collection:collection:1.0.0 -> 1.1.0 (*) +| | +--- androidx.lifecycle:lifecycle-runtime:2.3.1 (*) @@ -165,20 +166,21 @@ +| | +--- androidx.lifecycle:lifecycle-viewmodel:2.3.1 (*) +| | +--- org.jetbrains.kotlin:kotlin-stdlib:1.4.20 -> 1.5.31 (*) +| | \--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.4.1 -> 1.5.2 (*) -+| +--- com.google.android.material:material:1.2.1 -> 1.4.0 -+| | +--- androidx.annotation:annotation:1.0.1 -> 1.2.0 ++| +--- com.google.android.material:material:1.2.1 -> 1.5.0-alpha05 ++| | +--- androidx.annotation:annotation:1.2.0 +| | +--- androidx.appcompat:appcompat:1.1.0 -> 1.3.1 (*) +| | +--- androidx.cardview:cardview:1.0.0 (*) +| | +--- androidx.coordinatorlayout:coordinatorlayout:1.1.0 +| | | +--- androidx.annotation:annotation:1.1.0 -> 1.2.0 +| | | +--- androidx.core:core:1.1.0 -> 1.6.0 (*) -+| | | +--- androidx.customview:customview:1.0.0 (*) ++| | | +--- androidx.customview:customview:1.0.0 -> 1.1.0 (*) +| | | \--- androidx.collection:collection:1.0.0 -> 1.1.0 (*) +| | +--- androidx.constraintlayout:constraintlayout:2.0.1 -> 2.1.0 +| | | +--- androidx.appcompat:appcompat:1.2.0 -> 1.3.1 (*) +| | | +--- androidx.core:core:1.3.2 -> 1.6.0 (*) +| | | \--- androidx.constraintlayout:constraintlayout-core:1.0.0 +| | +--- androidx.core:core:1.5.0 -> 1.6.0 (*) ++| | +--- androidx.drawerlayout:drawerlayout:1.1.1 (*) +| | +--- androidx.dynamicanimation:dynamicanimation:1.0.0 +| | | +--- androidx.core:core:1.0.0 -> 1.6.0 (*) +| | | +--- androidx.collection:collection:1.0.0 -> 1.1.0 (*) @@ -198,7 +200,7 @@ +| | +--- androidx.recyclerview:recyclerview:1.0.0 -> 1.1.0 +| | | +--- androidx.annotation:annotation:1.1.0 -> 1.2.0 +| | | +--- androidx.core:core:1.1.0 -> 1.6.0 (*) -+| | | +--- androidx.customview:customview:1.0.0 (*) ++| | | +--- androidx.customview:customview:1.0.0 -> 1.1.0 (*) +| | | \--- androidx.collection:collection:1.0.0 -> 1.1.0 (*) +| | +--- androidx.transition:transition:1.2.0 +| | | +--- androidx.annotation:annotation:1.1.0 -> 1.2.0 @@ -324,7 +326,7 @@ +| | \--- org.jetbrains.kotlin:kotlin-stdlib-common:1.3.70 -> 1.5.31 +| \--- org.jetbrains.kotlin:kotlin-stdlib:1.3.72 -> 1.5.31 (*) ++--- com.google.code.gson:gson:2.8.8 -++--- com.google.android.material:material:1.4.0 (*) +++--- com.google.android.material:material:1.5.0-alpha05 (*) ++--- androidx.constraintlayout:constraintlayout:2.1.0 (*) ++--- androidx.swiperefreshlayout:swiperefreshlayout:1.1.0 +| +--- androidx.annotation:annotation:1.1.0 -> 1.2.0 @@ -516,7 +518,7 @@ +| +--- androidx.core:core-ktx:1.3.1 -> 1.3.2 (*) +| +--- androidx.compose.runtime:runtime:1.0.3 -> 1.0.4 (*) +| +--- androidx.compose.material:material:1.0.3 -> 1.0.4 (*) -+| +--- com.google.android.material:material:1.1.0 -> 1.4.0 (*) ++| +--- com.google.android.material:material:1.1.0 -> 1.5.0-alpha05 (*) +| \--- org.jetbrains.kotlin:kotlin-stdlib:1.5.30 -> 1.5.31 (*) +\--- androidx.activity:activity-compose:1.3.1 + +--- androidx.compose.runtime:runtime:1.0.1 -> 1.0.4 (*) diff --git a/deps_googleplay.txt b/deps_googleplay.txt index 908a1ec57..388526b97 100644 --- a/deps_googleplay.txt +++ b/deps_googleplay.txt @@ -48,9 +48,10 @@ +| | | +--- androidx.viewpager:viewpager:1.0.0 +| | | | +--- androidx.annotation:annotation:1.0.0 -> 1.2.0 +| | | | +--- androidx.core:core:1.0.0 -> 1.6.0 (*) -+| | | | \--- androidx.customview:customview:1.0.0 -+| | | | +--- androidx.annotation:annotation:1.0.0 -> 1.2.0 -+| | | | \--- androidx.core:core:1.0.0 -> 1.6.0 (*) ++| | | | \--- androidx.customview:customview:1.0.0 -> 1.1.0 ++| | | | +--- androidx.annotation:annotation:1.1.0 -> 1.2.0 ++| | | | +--- androidx.core:core:1.3.0 -> 1.6.0 (*) ++| | | | \--- androidx.collection:collection:1.1.0 (*) +| | | +--- androidx.loader:loader:1.0.0 +| | | | +--- androidx.annotation:annotation:1.0.0 -> 1.2.0 +| | | | +--- androidx.core:core:1.0.0 -> 1.6.0 (*) @@ -271,10 +272,10 @@ +| | | +--- androidx.interpolator:interpolator:1.0.0 +| | | | \--- androidx.annotation:annotation:1.0.0 -> 1.2.0 +| | | \--- androidx.collection:collection:1.1.0 (*) -+| | +--- androidx.drawerlayout:drawerlayout:1.0.0 -+| | | +--- androidx.annotation:annotation:1.0.0 -> 1.2.0 -+| | | +--- androidx.core:core:1.0.0 -> 1.6.0 (*) -+| | | \--- androidx.customview:customview:1.0.0 (*) ++| | +--- androidx.drawerlayout:drawerlayout:1.0.0 -> 1.1.1 ++| | | +--- androidx.annotation:annotation:1.1.0 -> 1.2.0 ++| | | +--- androidx.core:core:1.2.0 -> 1.6.0 (*) ++| | | \--- androidx.customview:customview:1.1.0 (*) +| | +--- androidx.savedstate:savedstate:1.1.0 (*) +| | +--- androidx.collection:collection:1.0.0 -> 1.1.0 (*) +| | +--- androidx.lifecycle:lifecycle-runtime:2.3.1 (*) @@ -293,20 +294,21 @@ +| | +--- androidx.lifecycle:lifecycle-viewmodel:2.3.1 (*) +| | +--- org.jetbrains.kotlin:kotlin-stdlib:1.4.20 -> 1.5.31 (*) +| | \--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.4.1 -> 1.5.2 (*) -+| +--- com.google.android.material:material:1.2.1 -> 1.4.0 -+| | +--- androidx.annotation:annotation:1.0.1 -> 1.2.0 ++| +--- com.google.android.material:material:1.2.1 -> 1.5.0-alpha05 ++| | +--- androidx.annotation:annotation:1.2.0 +| | +--- androidx.appcompat:appcompat:1.1.0 -> 1.3.1 (*) +| | +--- androidx.cardview:cardview:1.0.0 (*) +| | +--- androidx.coordinatorlayout:coordinatorlayout:1.1.0 +| | | +--- androidx.annotation:annotation:1.1.0 -> 1.2.0 +| | | +--- androidx.core:core:1.1.0 -> 1.6.0 (*) -+| | | +--- androidx.customview:customview:1.0.0 (*) ++| | | +--- androidx.customview:customview:1.0.0 -> 1.1.0 (*) +| | | \--- androidx.collection:collection:1.0.0 -> 1.1.0 (*) +| | +--- androidx.constraintlayout:constraintlayout:2.0.1 -> 2.1.0 +| | | +--- androidx.appcompat:appcompat:1.2.0 -> 1.3.1 (*) +| | | +--- androidx.core:core:1.3.2 -> 1.6.0 (*) +| | | \--- androidx.constraintlayout:constraintlayout-core:1.0.0 +| | +--- androidx.core:core:1.5.0 -> 1.6.0 (*) ++| | +--- androidx.drawerlayout:drawerlayout:1.1.1 (*) +| | +--- androidx.dynamicanimation:dynamicanimation:1.0.0 +| | | +--- androidx.core:core:1.0.0 -> 1.6.0 (*) +| | | +--- androidx.collection:collection:1.0.0 -> 1.1.0 (*) @@ -317,7 +319,7 @@ +| | +--- androidx.recyclerview:recyclerview:1.0.0 -> 1.1.0 +| | | +--- androidx.annotation:annotation:1.1.0 -> 1.2.0 +| | | +--- androidx.core:core:1.1.0 -> 1.6.0 (*) -+| | | +--- androidx.customview:customview:1.0.0 (*) ++| | | +--- androidx.customview:customview:1.0.0 -> 1.1.0 (*) +| | | \--- androidx.collection:collection:1.0.0 -> 1.1.0 (*) +| | +--- androidx.transition:transition:1.2.0 +| | | +--- androidx.annotation:annotation:1.1.0 -> 1.2.0 @@ -443,7 +445,7 @@ +| | \--- org.jetbrains.kotlin:kotlin-stdlib-common:1.3.70 -> 1.5.31 +| \--- org.jetbrains.kotlin:kotlin-stdlib:1.3.72 -> 1.5.31 (*) ++--- com.google.code.gson:gson:2.8.8 -++--- com.google.android.material:material:1.4.0 (*) +++--- com.google.android.material:material:1.5.0-alpha05 (*) ++--- androidx.constraintlayout:constraintlayout:2.1.0 (*) ++--- androidx.swiperefreshlayout:swiperefreshlayout:1.1.0 +| +--- androidx.annotation:annotation:1.1.0 -> 1.2.0 @@ -635,7 +637,7 @@ +| +--- androidx.core:core-ktx:1.3.1 -> 1.3.2 (*) +| +--- androidx.compose.runtime:runtime:1.0.3 -> 1.0.4 (*) +| +--- androidx.compose.material:material:1.0.3 -> 1.0.4 (*) -+| +--- com.google.android.material:material:1.1.0 -> 1.4.0 (*) ++| +--- com.google.android.material:material:1.1.0 -> 1.5.0-alpha05 (*) +| \--- org.jetbrains.kotlin:kotlin-stdlib:1.5.30 -> 1.5.31 (*) +\--- androidx.activity:activity-compose:1.3.1 + +--- androidx.compose.runtime:runtime:1.0.1 -> 1.0.4 (*)