diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 6fa929c3f..9ec93ebfd 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -177,7 +177,7 @@ dependencies { implementation("org.jetbrains.kotlinx:kotlinx-collections-immutable-jvm:0.3.3") implementation("com.squareup.okhttp3:okhttp:${Versions.okhttp}") implementation("com.google.code.gson:gson:2.8.6") - implementation("com.google.android.material:material:1.2.1") + implementation("com.google.android.material:material:1.3.0") implementation("androidx.annotation:annotation:1.1.0") implementation("androidx.constraintlayout:constraintlayout:2.0.4") implementation("androidx.swiperefreshlayout:swiperefreshlayout:1.1.0") diff --git a/app/licenses.yml b/app/licenses.yml index 3c64e49c8..24a7b2253 100644 --- a/app/licenses.yml +++ b/app/licenses.yml @@ -841,3 +841,33 @@ 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.dynamicanimation:dynamicanimation:+ + name: dynamicanimation + copyrightHolder: Android Open Source Project + license: The Apache Software License, Version 2.0 + licenseUrl: http://www.apache.org/licenses/LICENSE-2.0.txt + url: http://developer.android.com/tools/extras/support-library.html +- artifact: androidx.legacy:legacy-support-core-utils:+ + name: legacy-support-core-utils + copyrightHolder: Android Open Source Project + license: The Apache Software License, Version 2.0 + licenseUrl: http://www.apache.org/licenses/LICENSE-2.0.txt + url: http://developer.android.com/tools/extras/support-library.html +- artifact: androidx.documentfile:documentfile:+ + name: documentfile + copyrightHolder: Android Open Source Project + license: The Apache Software License, Version 2.0 + licenseUrl: http://www.apache.org/licenses/LICENSE-2.0.txt + url: http://developer.android.com/tools/extras/support-library.html +- artifact: androidx.localbroadcastmanager:localbroadcastmanager:+ + name: localbroadcastmanager + copyrightHolder: Android Open Source Project + license: The Apache Software License, Version 2.0 + licenseUrl: http://www.apache.org/licenses/LICENSE-2.0.txt + url: http://developer.android.com/tools/extras/support-library.html +- artifact: androidx.print:print:+ + name: print + copyrightHolder: Android Open Source Project + license: The Apache Software License, Version 2.0 + licenseUrl: http://www.apache.org/licenses/LICENSE-2.0.txt + url: http://developer.android.com/tools/extras/support-library.html diff --git a/app/src/main/assets/licenses.json b/app/src/main/assets/licenses.json index 24a29088d..fa7342560 100644 --- a/app/src/main/assets/licenses.json +++ b/app/src/main/assets/licenses.json @@ -2004,6 +2004,76 @@ "normalizedLicense": "apache2", "url": "https://developer.android.com/jetpack/androidx", "libraryName": "lifecycle-livedata-ktx" + }, + { + "artifactId": { + "name": "dynamicanimation", + "group": "androidx.dynamicanimation", + "version": "+" + }, + "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", + "url": "http://developer.android.com/tools/extras/support-library.html", + "libraryName": "dynamicanimation" + }, + { + "artifactId": { + "name": "legacy-support-core-utils", + "group": "androidx.legacy", + "version": "+" + }, + "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", + "url": "http://developer.android.com/tools/extras/support-library.html", + "libraryName": "legacy-support-core-utils" + }, + { + "artifactId": { + "name": "documentfile", + "group": "androidx.documentfile", + "version": "+" + }, + "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", + "url": "http://developer.android.com/tools/extras/support-library.html", + "libraryName": "documentfile" + }, + { + "artifactId": { + "name": "localbroadcastmanager", + "group": "androidx.localbroadcastmanager", + "version": "+" + }, + "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", + "url": "http://developer.android.com/tools/extras/support-library.html", + "libraryName": "localbroadcastmanager" + }, + { + "artifactId": { + "name": "print", + "group": "androidx.print", + "version": "+" + }, + "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", + "url": "http://developer.android.com/tools/extras/support-library.html", + "libraryName": "print" } ] } \ No newline at end of file diff --git a/deps_fdroid.txt b/deps_fdroid.txt index 34f313aa9..6ec82c231 100644 --- a/deps_fdroid.txt +++ b/deps_fdroid.txt @@ -173,7 +173,7 @@ +| | | +--- org.jetbrains.kotlinx:kotlinx-coroutines-core:1.4.1 (*) +| | | \--- org.jetbrains.kotlin:kotlin-stdlib:1.4.0 -> 1.4.21 (*) +| | \--- androidx.lifecycle:lifecycle-viewmodel:2.2.0 (*) -+| +--- com.google.android.material:material:1.2.1 ++| +--- com.google.android.material:material:1.2.1 -> 1.3.0 +| | +--- androidx.annotation:annotation:1.0.1 -> 1.1.0 +| | +--- androidx.appcompat:appcompat:1.1.0 -> 1.2.0 (*) +| | +--- androidx.cardview:cardview:1.0.0 (*) @@ -182,7 +182,15 @@ +| | | +--- androidx.core:core:1.1.0 -> 1.3.2 (*) +| | | +--- androidx.customview:customview:1.0.0 (*) +| | | \--- androidx.collection:collection:1.0.0 -> 1.1.0 (*) ++| | +--- androidx.constraintlayout:constraintlayout:2.0.1 -> 2.0.4 ++| | | +--- androidx.appcompat:appcompat:1.2.0 (*) ++| | | +--- androidx.core:core:1.3.1 -> 1.3.2 (*) ++| | | \--- androidx.constraintlayout:constraintlayout-solver:2.0.4 +| | +--- androidx.core:core:1.2.0 -> 1.3.2 (*) ++| | +--- androidx.dynamicanimation:dynamicanimation:1.0.0 ++| | | +--- androidx.core:core:1.0.0 -> 1.3.2 (*) ++| | | +--- androidx.collection:collection:1.0.0 -> 1.1.0 (*) ++| | | \--- androidx.legacy:legacy-support-core-utils:1.0.0 (*) +| | +--- androidx.annotation:annotation-experimental:1.0.0 +| | +--- androidx.fragment:fragment:1.0.0 -> 1.2.5 (*) +| | +--- androidx.lifecycle:lifecycle-runtime:2.0.0 -> 2.2.0 (*) @@ -304,12 +312,9 @@ +| \--- org.jetbrains.kotlin:kotlin-stdlib-common:1.4.0 -> 1.4.21 ++--- com.squareup.okhttp3:okhttp:4.8.1 (*) ++--- com.google.code.gson:gson:2.8.6 -++--- com.google.android.material:material:1.2.1 (*) +++--- com.google.android.material:material:1.3.0 (*) ++--- androidx.annotation:annotation:1.1.0 -++--- androidx.constraintlayout:constraintlayout:2.0.4 -+| +--- androidx.appcompat:appcompat:1.2.0 (*) -+| +--- androidx.core:core:1.3.1 -> 1.3.2 (*) -+| \--- androidx.constraintlayout:constraintlayout-solver:2.0.4 +++--- androidx.constraintlayout:constraintlayout:2.0.4 (*) ++--- androidx.swiperefreshlayout:swiperefreshlayout:1.1.0 +| +--- androidx.annotation:annotation:1.1.0 +| +--- androidx.core:core:1.1.0 -> 1.3.2 (*) diff --git a/deps_googleplay.txt b/deps_googleplay.txt index fcc8f0e8e..d01e376ac 100644 --- a/deps_googleplay.txt +++ b/deps_googleplay.txt @@ -289,7 +289,7 @@ +| | | +--- org.jetbrains.kotlinx:kotlinx-coroutines-core:1.4.1 (*) +| | | \--- org.jetbrains.kotlin:kotlin-stdlib:1.4.0 -> 1.4.21 (*) +| | \--- androidx.lifecycle:lifecycle-viewmodel:2.2.0 (*) -+| +--- com.google.android.material:material:1.2.1 ++| +--- com.google.android.material:material:1.2.1 -> 1.3.0 +| | +--- androidx.annotation:annotation:1.0.1 -> 1.1.0 +| | +--- androidx.appcompat:appcompat:1.1.0 -> 1.2.0 (*) +| | +--- androidx.cardview:cardview:1.0.0 (*) @@ -298,7 +298,15 @@ +| | | +--- androidx.core:core:1.1.0 -> 1.3.2 (*) +| | | +--- androidx.customview:customview:1.0.0 (*) +| | | \--- androidx.collection:collection:1.0.0 -> 1.1.0 (*) ++| | +--- androidx.constraintlayout:constraintlayout:2.0.1 -> 2.0.4 ++| | | +--- androidx.appcompat:appcompat:1.2.0 (*) ++| | | +--- androidx.core:core:1.3.1 -> 1.3.2 (*) ++| | | \--- androidx.constraintlayout:constraintlayout-solver:2.0.4 +| | +--- androidx.core:core:1.2.0 -> 1.3.2 (*) ++| | +--- androidx.dynamicanimation:dynamicanimation:1.0.0 ++| | | +--- androidx.core:core:1.0.0 -> 1.3.2 (*) ++| | | +--- androidx.collection:collection:1.0.0 -> 1.1.0 (*) ++| | | \--- androidx.legacy:legacy-support-core-utils:1.0.0 (*) +| | +--- androidx.annotation:annotation-experimental:1.0.0 +| | +--- androidx.fragment:fragment:1.0.0 -> 1.2.5 (*) +| | +--- androidx.lifecycle:lifecycle-runtime:2.0.0 -> 2.2.0 (*) @@ -415,12 +423,9 @@ +| \--- org.jetbrains.kotlin:kotlin-stdlib-common:1.4.0 -> 1.4.21 ++--- com.squareup.okhttp3:okhttp:4.8.1 (*) ++--- com.google.code.gson:gson:2.8.6 -++--- com.google.android.material:material:1.2.1 (*) +++--- com.google.android.material:material:1.3.0 (*) ++--- androidx.annotation:annotation:1.1.0 -++--- androidx.constraintlayout:constraintlayout:2.0.4 -+| +--- androidx.appcompat:appcompat:1.2.0 (*) -+| +--- androidx.core:core:1.3.1 -> 1.3.2 (*) -+| \--- androidx.constraintlayout:constraintlayout-solver:2.0.4 +++--- androidx.constraintlayout:constraintlayout:2.0.4 (*) ++--- androidx.swiperefreshlayout:swiperefreshlayout:1.1.0 +| +--- androidx.annotation:annotation:1.1.0 +| +--- androidx.core:core:1.1.0 -> 1.3.2 (*)