From 93686d1af85578b07b7114aebd3a4371690102b8 Mon Sep 17 00:00:00 2001 From: Alex Baker Date: Thu, 18 Mar 2021 09:15:23 -0500 Subject: [PATCH] Add activity-compose --- app/build.gradle.kts | 1 + app/licenses.yml | 6 ++++++ app/src/main/assets/licenses.json | 14 ++++++++++++++ deps_fdroid.txt | 28 +++++++++++++++++----------- deps_googleplay.txt | 28 +++++++++++++++++----------- 5 files changed, 55 insertions(+), 22 deletions(-) diff --git a/app/build.gradle.kts b/app/build.gradle.kts index bdbcee5dc..9bcbef9ab 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -233,6 +233,7 @@ dependencies { implementation("androidx.compose.material:material:${Versions.compose}") implementation("androidx.compose.runtime:runtime-livedata:${Versions.compose}") implementation("com.google.android.material:compose-theme-adapter:${Versions.compose}") + implementation("androidx.activity:activity-compose:1.3.0-alpha04") 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 06effa7c3..13d07ae3b 100644 --- a/app/licenses.yml +++ b/app/licenses.yml @@ -938,3 +938,9 @@ license: The Apache Software License, Version 2.0 licenseUrl: http://www.apache.org/licenses/LICENSE-2.0.txt url: http://tools.android.com +- artifact: androidx.activity:activity-compose:+ + name: activity-compose + 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/activity#1.3.0-alpha04 diff --git a/app/src/main/assets/licenses.json b/app/src/main/assets/licenses.json index aa8655440..34ff0e37e 100644 --- a/app/src/main/assets/licenses.json +++ b/app/src/main/assets/licenses.json @@ -2229,6 +2229,20 @@ "normalizedLicense": "apache2", "url": "http://tools.android.com", "libraryName": "constraintlayout-core" + }, + { + "artifactId": { + "name": "activity-compose", + "group": "androidx.activity", + "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/activity#1.3.0-alpha04", + "libraryName": "activity-compose" } ] } \ No newline at end of file diff --git a/deps_fdroid.txt b/deps_fdroid.txt index e9263fe83..69067735e 100644 --- a/deps_fdroid.txt +++ b/deps_fdroid.txt @@ -59,7 +59,7 @@ +| | | | | \--- androidx.arch.core:core-common:2.1.0 (*) +| | | | \--- androidx.lifecycle:lifecycle-viewmodel:2.0.0 -> 2.3.0 +| | | | \--- androidx.annotation:annotation:1.1.0 -> 1.2.0-beta01 -+| | | +--- androidx.activity:activity:1.2.1 ++| | | +--- androidx.activity:activity:1.2.1 -> 1.3.0-alpha04 +| | | | +--- androidx.annotation:annotation:1.1.0 -> 1.2.0-beta01 +| | | | +--- androidx.core:core:1.1.0 -> 1.5.0-beta01 (*) +| | | | +--- androidx.lifecycle:lifecycle-runtime:2.3.0 (*) @@ -127,7 +127,7 @@ +| | +--- androidx.core:core:1.5.0-beta01 (*) +| | +--- androidx.cursoradapter:cursoradapter:1.0.0 +| | | \--- androidx.annotation:annotation:1.0.0 -> 1.2.0-beta01 -+| | +--- androidx.activity:activity:1.2.0-rc01 -> 1.2.1 (*) ++| | +--- androidx.activity:activity:1.2.0-rc01 -> 1.3.0-alpha04 (*) +| | +--- androidx.fragment:fragment:1.3.0-rc01 -> 1.3.1 (*) +| | +--- androidx.appcompat:appcompat-resources:1.3.0-beta01 +| | | +--- androidx.collection:collection:1.0.0 -> 1.1.0 (*) @@ -223,7 +223,7 @@ +| +--- com.google.dagger:hilt-core:2.33-beta +| | +--- com.google.dagger:dagger:2.33 (*) +| | \--- javax.inject:javax.inject:1 -+| +--- androidx.activity:activity:1.2.0 -> 1.2.1 (*) ++| +--- androidx.activity:activity:1.2.0 -> 1.3.0-alpha04 (*) +| +--- androidx.annotation:annotation:1.1.0 -> 1.2.0-beta01 +| +--- androidx.fragment:fragment:1.3.0 -> 1.3.1 (*) +| +--- androidx.lifecycle:lifecycle-viewmodel:2.3.0 (*) @@ -253,15 +253,15 @@ +| \--- com.google.dagger:hilt-android:2.33-beta (*) ++--- androidx.fragment:fragment-ktx:1.3.1 +| +--- androidx.fragment:fragment:1.3.1 (*) -+| +--- androidx.activity:activity-ktx:1.2.1 -+| | +--- androidx.activity:activity:1.2.1 (*) ++| +--- androidx.activity:activity-ktx:1.2.1 -> 1.3.0-alpha04 ++| | +--- androidx.activity:activity:1.3.0-alpha04 (*) +| | +--- androidx.core:core-ktx:1.1.0 -> 1.3.2 (*) +| | +--- androidx.lifecycle:lifecycle-runtime-ktx:2.3.0 (*) +| | +--- androidx.lifecycle:lifecycle-viewmodel-ktx:2.3.0 (*) +| | +--- androidx.savedstate:savedstate-ktx:1.1.0 +| | | +--- androidx.savedstate:savedstate:1.1.0 (*) +| | | \--- org.jetbrains.kotlin:kotlin-stdlib:1.4.20 -> 1.4.31 (*) -+| | \--- org.jetbrains.kotlin:kotlin-stdlib:1.4.20 -> 1.4.31 (*) ++| | \--- org.jetbrains.kotlin:kotlin-stdlib:1.4.31 (*) +| +--- androidx.core:core-ktx:1.1.0 -> 1.3.2 (*) +| +--- androidx.collection:collection-ktx:1.1.0 +| | +--- org.jetbrains.kotlin:kotlin-stdlib:1.3.20 -> 1.4.31 (*) @@ -493,10 +493,16 @@ +| +--- androidx.lifecycle:lifecycle-livedata:2.2.0 (*) +| +--- org.jetbrains.kotlin:kotlin-stdlib:1.4.31 (*) +| \--- androidx.compose.ui:ui:1.0.0-beta02 (*) -+\--- com.google.android.material:compose-theme-adapter:1.0.0-beta02 -+ +--- androidx.appcompat:appcompat:1.3.0-beta01 (*) -+ +--- androidx.core:core-ktx:1.3.1 -> 1.3.2 (*) +++--- com.google.android.material:compose-theme-adapter:1.0.0-beta02 ++| +--- androidx.appcompat:appcompat:1.3.0-beta01 (*) ++| +--- androidx.core:core-ktx:1.3.1 -> 1.3.2 (*) ++| +--- androidx.compose.runtime:runtime:1.0.0-beta02 (*) ++| +--- androidx.compose.material:material:1.0.0-beta02 (*) ++| +--- com.google.android.material:material:1.1.0 -> 1.3.0 (*) ++| \--- org.jetbrains.kotlin:kotlin-stdlib:1.4.31 (*) ++\--- androidx.activity:activity-compose:1.3.0-alpha04 + +--- androidx.compose.runtime:runtime:1.0.0-beta02 (*) -+ +--- androidx.compose.material:material:1.0.0-beta02 (*) -+ +--- com.google.android.material:material:1.1.0 -> 1.3.0 (*) ++ +--- androidx.compose.runtime:runtime-saveable:1.0.0-beta02 (*) ++ +--- androidx.activity:activity-ktx:1.3.0-alpha04 (*) ++ +--- androidx.compose.ui:ui:1.0.0-beta02 (*) + \--- org.jetbrains.kotlin:kotlin-stdlib:1.4.31 (*) diff --git a/deps_googleplay.txt b/deps_googleplay.txt index 853ae7789..96b83d079 100644 --- a/deps_googleplay.txt +++ b/deps_googleplay.txt @@ -59,7 +59,7 @@ +| | | | | \--- androidx.arch.core:core-common:2.1.0 (*) +| | | | \--- androidx.lifecycle:lifecycle-viewmodel:2.0.0 -> 2.3.0 +| | | | \--- androidx.annotation:annotation:1.1.0 -> 1.2.0-beta01 -+| | | +--- androidx.activity:activity:1.2.1 ++| | | +--- androidx.activity:activity:1.2.1 -> 1.3.0-alpha04 +| | | | +--- androidx.annotation:annotation:1.1.0 -> 1.2.0-beta01 +| | | | +--- androidx.core:core:1.1.0 -> 1.5.0-beta01 (*) +| | | | +--- androidx.lifecycle:lifecycle-runtime:2.3.0 (*) @@ -250,7 +250,7 @@ +| | +--- androidx.core:core:1.5.0-beta01 (*) +| | +--- androidx.cursoradapter:cursoradapter:1.0.0 +| | | \--- androidx.annotation:annotation:1.0.0 -> 1.2.0-beta01 -+| | +--- androidx.activity:activity:1.2.0-rc01 -> 1.2.1 (*) ++| | +--- androidx.activity:activity:1.2.0-rc01 -> 1.3.0-alpha04 (*) +| | +--- androidx.fragment:fragment:1.3.0-rc01 -> 1.3.1 (*) +| | +--- androidx.appcompat:appcompat-resources:1.3.0-beta01 +| | | +--- androidx.collection:collection:1.0.0 -> 1.1.0 (*) @@ -337,7 +337,7 @@ +| +--- com.google.dagger:hilt-core:2.33-beta +| | +--- com.google.dagger:dagger:2.33 (*) +| | \--- javax.inject:javax.inject:1 -+| +--- androidx.activity:activity:1.2.0 -> 1.2.1 (*) ++| +--- androidx.activity:activity:1.2.0 -> 1.3.0-alpha04 (*) +| +--- androidx.annotation:annotation:1.1.0 -> 1.2.0-beta01 +| +--- androidx.fragment:fragment:1.3.0 -> 1.3.1 (*) +| +--- androidx.lifecycle:lifecycle-viewmodel:2.3.0 (*) @@ -367,15 +367,15 @@ +| \--- com.google.dagger:hilt-android:2.33-beta (*) ++--- androidx.fragment:fragment-ktx:1.3.1 +| +--- androidx.fragment:fragment:1.3.1 (*) -+| +--- androidx.activity:activity-ktx:1.2.1 -+| | +--- androidx.activity:activity:1.2.1 (*) ++| +--- androidx.activity:activity-ktx:1.2.1 -> 1.3.0-alpha04 ++| | +--- androidx.activity:activity:1.3.0-alpha04 (*) +| | +--- androidx.core:core-ktx:1.1.0 -> 1.3.2 (*) +| | +--- androidx.lifecycle:lifecycle-runtime-ktx:2.3.0 (*) +| | +--- androidx.lifecycle:lifecycle-viewmodel-ktx:2.3.0 (*) +| | +--- androidx.savedstate:savedstate-ktx:1.1.0 +| | | +--- androidx.savedstate:savedstate:1.1.0 (*) +| | | \--- org.jetbrains.kotlin:kotlin-stdlib:1.4.20 -> 1.4.31 (*) -+| | \--- org.jetbrains.kotlin:kotlin-stdlib:1.4.20 -> 1.4.31 (*) ++| | \--- org.jetbrains.kotlin:kotlin-stdlib:1.4.31 (*) +| +--- androidx.core:core-ktx:1.1.0 -> 1.3.2 (*) +| +--- androidx.collection:collection-ktx:1.1.0 +| | +--- org.jetbrains.kotlin:kotlin-stdlib:1.3.20 -> 1.4.31 (*) @@ -607,10 +607,16 @@ +| +--- androidx.lifecycle:lifecycle-livedata:2.2.0 (*) +| +--- org.jetbrains.kotlin:kotlin-stdlib:1.4.31 (*) +| \--- androidx.compose.ui:ui:1.0.0-beta02 (*) -+\--- com.google.android.material:compose-theme-adapter:1.0.0-beta02 -+ +--- androidx.appcompat:appcompat:1.3.0-beta01 (*) -+ +--- androidx.core:core-ktx:1.3.1 -> 1.3.2 (*) +++--- com.google.android.material:compose-theme-adapter:1.0.0-beta02 ++| +--- androidx.appcompat:appcompat:1.3.0-beta01 (*) ++| +--- androidx.core:core-ktx:1.3.1 -> 1.3.2 (*) ++| +--- androidx.compose.runtime:runtime:1.0.0-beta02 (*) ++| +--- androidx.compose.material:material:1.0.0-beta02 (*) ++| +--- com.google.android.material:material:1.1.0 -> 1.3.0 (*) ++| \--- org.jetbrains.kotlin:kotlin-stdlib:1.4.31 (*) ++\--- androidx.activity:activity-compose:1.3.0-alpha04 + +--- androidx.compose.runtime:runtime:1.0.0-beta02 (*) -+ +--- androidx.compose.material:material:1.0.0-beta02 (*) -+ +--- com.google.android.material:material:1.1.0 -> 1.3.0 (*) ++ +--- androidx.compose.runtime:runtime-saveable:1.0.0-beta02 (*) ++ +--- androidx.activity:activity-ktx:1.3.0-alpha04 (*) ++ +--- androidx.compose.ui:ui:1.0.0-beta02 (*) + \--- org.jetbrains.kotlin:kotlin-stdlib:1.4.31 (*)