diff --git a/app/build.gradle.kts b/app/build.gradle.kts index ca6c48cac..f4cfc24a1 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -232,6 +232,7 @@ dependencies { implementation("androidx.compose.ui:ui:${Versions.compose}") implementation("androidx.compose.foundation:foundation:${Versions.compose}") implementation("androidx.compose.material:material:${Versions.compose}") + implementation("androidx.compose.runtime:runtime-livedata:${Versions.compose}") releaseCompileOnly("androidx.compose.ui:ui-tooling:${Versions.compose}") googleplayImplementation("com.google.firebase:firebase-crashlytics:${Versions.crashlytics}") diff --git a/app/licenses.yml b/app/licenses.yml index de236a70d..82eca2f69 100644 --- a/app/licenses.yml +++ b/app/licenses.yml @@ -938,3 +938,9 @@ skip: true - artifact: androidx.compose.ui:ui-tooling-data:+ skip: true +- artifact: androidx.compose.runtime:runtime-livedata:+ + name: runtime-livedata + 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/jetpack/androidx/releases/compose-runtime#1.0.0-beta01 diff --git a/app/src/main/assets/licenses.json b/app/src/main/assets/licenses.json index 40dc659dc..acb42c7a4 100644 --- a/app/src/main/assets/licenses.json +++ b/app/src/main/assets/licenses.json @@ -2229,6 +2229,20 @@ "normalizedLicense": "apache2", "url": "https://developer.android.com/jetpack/androidx/releases/compose-material#1.0.0-beta01", "libraryName": "material-icons-core" + }, + { + "artifactId": { + "name": "runtime-livedata", + "group": "androidx.compose.runtime", + "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": "https://developer.android.com/jetpack/androidx/releases/compose-runtime#1.0.0-beta01", + "libraryName": "runtime-livedata" } ] } \ No newline at end of file diff --git a/deps_fdroid.txt b/deps_fdroid.txt index 9f7e1851c..1788a67d7 100644 --- a/deps_fdroid.txt +++ b/deps_fdroid.txt @@ -477,22 +477,27 @@ +| +--- androidx.compose.foundation:foundation-layout:1.0.0-beta01 (*) +| +--- androidx.compose.ui:ui-text:1.0.0-beta01 (*) +| \--- androidx.compose.ui:ui-util:1.0.0-beta01 (*) -+\--- androidx.compose.material:material:1.0.0-beta01 -+ +--- androidx.compose.animation:animation-core:1.0.0-beta01 (*) -+ +--- androidx.compose.foundation:foundation:1.0.0-beta01 (*) -+ +--- androidx.compose.material:material-icons-core:1.0.0-beta01 -+ | +--- androidx.compose.ui:ui:1.0.0-beta01 (*) -+ | \--- org.jetbrains.kotlin:kotlin-stdlib:1.4.30 (*) -+ +--- androidx.compose.material:material-ripple:1.0.0-beta01 -+ | +--- androidx.compose.foundation:foundation:1.0.0-beta01 (*) -+ | +--- androidx.compose.runtime:runtime:1.0.0-beta01 (*) -+ | +--- org.jetbrains.kotlin:kotlin-stdlib-common:1.4.30 -+ | +--- androidx.compose.animation:animation:1.0.0-beta01 (*) -+ | \--- androidx.compose.ui:ui-util:1.0.0-beta01 (*) +++--- androidx.compose.material:material:1.0.0-beta01 ++| +--- androidx.compose.animation:animation-core:1.0.0-beta01 (*) ++| +--- androidx.compose.foundation:foundation:1.0.0-beta01 (*) ++| +--- androidx.compose.material:material-icons-core:1.0.0-beta01 ++| | +--- androidx.compose.ui:ui:1.0.0-beta01 (*) ++| | \--- org.jetbrains.kotlin:kotlin-stdlib:1.4.30 (*) ++| +--- androidx.compose.material:material-ripple:1.0.0-beta01 ++| | +--- androidx.compose.foundation:foundation:1.0.0-beta01 (*) ++| | +--- androidx.compose.runtime:runtime:1.0.0-beta01 (*) ++| | +--- org.jetbrains.kotlin:kotlin-stdlib-common:1.4.30 ++| | +--- androidx.compose.animation:animation:1.0.0-beta01 (*) ++| | \--- androidx.compose.ui:ui-util:1.0.0-beta01 (*) ++| +--- androidx.compose.runtime:runtime:1.0.0-beta01 (*) ++| +--- androidx.compose.ui:ui:1.0.0-beta01 (*) ++| +--- androidx.compose.ui:ui-text:1.0.0-beta01 (*) ++| +--- org.jetbrains.kotlin:kotlin-stdlib-common:1.4.30 ++| +--- androidx.compose.animation:animation:1.0.0-beta01 (*) ++| +--- androidx.compose.foundation:foundation-layout:1.0.0-beta01 (*) ++| \--- androidx.compose.ui:ui-util:1.0.0-beta01 (*) ++\--- androidx.compose.runtime:runtime-livedata:1.0.0-beta01 + +--- androidx.compose.runtime:runtime:1.0.0-beta01 (*) -+ +--- androidx.compose.ui:ui:1.0.0-beta01 (*) -+ +--- androidx.compose.ui:ui-text:1.0.0-beta01 (*) -+ +--- org.jetbrains.kotlin:kotlin-stdlib-common:1.4.30 -+ +--- androidx.compose.animation:animation:1.0.0-beta01 (*) -+ +--- androidx.compose.foundation:foundation-layout:1.0.0-beta01 (*) -+ \--- androidx.compose.ui:ui-util:1.0.0-beta01 (*) ++ +--- androidx.lifecycle:lifecycle-livedata:2.2.0 (*) ++ +--- org.jetbrains.kotlin:kotlin-stdlib:1.4.30 (*) ++ \--- androidx.compose.ui:ui:1.0.0-beta01 (*) diff --git a/deps_googleplay.txt b/deps_googleplay.txt index 33381c4eb..669a6c9e5 100644 --- a/deps_googleplay.txt +++ b/deps_googleplay.txt @@ -591,22 +591,27 @@ +| +--- androidx.compose.foundation:foundation-layout:1.0.0-beta01 (*) +| +--- androidx.compose.ui:ui-text:1.0.0-beta01 (*) +| \--- androidx.compose.ui:ui-util:1.0.0-beta01 (*) -+\--- androidx.compose.material:material:1.0.0-beta01 -+ +--- androidx.compose.animation:animation-core:1.0.0-beta01 (*) -+ +--- androidx.compose.foundation:foundation:1.0.0-beta01 (*) -+ +--- androidx.compose.material:material-icons-core:1.0.0-beta01 -+ | +--- androidx.compose.ui:ui:1.0.0-beta01 (*) -+ | \--- org.jetbrains.kotlin:kotlin-stdlib:1.4.30 (*) -+ +--- androidx.compose.material:material-ripple:1.0.0-beta01 -+ | +--- androidx.compose.foundation:foundation:1.0.0-beta01 (*) -+ | +--- androidx.compose.runtime:runtime:1.0.0-beta01 (*) -+ | +--- org.jetbrains.kotlin:kotlin-stdlib-common:1.4.30 -+ | +--- androidx.compose.animation:animation:1.0.0-beta01 (*) -+ | \--- androidx.compose.ui:ui-util:1.0.0-beta01 (*) +++--- androidx.compose.material:material:1.0.0-beta01 ++| +--- androidx.compose.animation:animation-core:1.0.0-beta01 (*) ++| +--- androidx.compose.foundation:foundation:1.0.0-beta01 (*) ++| +--- androidx.compose.material:material-icons-core:1.0.0-beta01 ++| | +--- androidx.compose.ui:ui:1.0.0-beta01 (*) ++| | \--- org.jetbrains.kotlin:kotlin-stdlib:1.4.30 (*) ++| +--- androidx.compose.material:material-ripple:1.0.0-beta01 ++| | +--- androidx.compose.foundation:foundation:1.0.0-beta01 (*) ++| | +--- androidx.compose.runtime:runtime:1.0.0-beta01 (*) ++| | +--- org.jetbrains.kotlin:kotlin-stdlib-common:1.4.30 ++| | +--- androidx.compose.animation:animation:1.0.0-beta01 (*) ++| | \--- androidx.compose.ui:ui-util:1.0.0-beta01 (*) ++| +--- androidx.compose.runtime:runtime:1.0.0-beta01 (*) ++| +--- androidx.compose.ui:ui:1.0.0-beta01 (*) ++| +--- androidx.compose.ui:ui-text:1.0.0-beta01 (*) ++| +--- org.jetbrains.kotlin:kotlin-stdlib-common:1.4.30 ++| +--- androidx.compose.animation:animation:1.0.0-beta01 (*) ++| +--- androidx.compose.foundation:foundation-layout:1.0.0-beta01 (*) ++| \--- androidx.compose.ui:ui-util:1.0.0-beta01 (*) ++\--- androidx.compose.runtime:runtime-livedata:1.0.0-beta01 + +--- androidx.compose.runtime:runtime:1.0.0-beta01 (*) -+ +--- androidx.compose.ui:ui:1.0.0-beta01 (*) -+ +--- androidx.compose.ui:ui-text:1.0.0-beta01 (*) -+ +--- org.jetbrains.kotlin:kotlin-stdlib-common:1.4.30 -+ +--- androidx.compose.animation:animation:1.0.0-beta01 (*) -+ +--- androidx.compose.foundation:foundation-layout:1.0.0-beta01 (*) -+ \--- androidx.compose.ui:ui-util:1.0.0-beta01 (*) ++ +--- androidx.lifecycle:lifecycle-livedata:2.2.0 (*) ++ +--- org.jetbrains.kotlin:kotlin-stdlib:1.4.30 (*) ++ \--- androidx.compose.ui:ui:1.0.0-beta01 (*)