lun_admin/NeoLaunch_From_Kvaesitso
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Update and clean up dependencies

Browse Source
This commit is contained in:
MM20 2022-09-10 12:04:22 +02:00
parent a7f38a8fe4
commit 8dd0852a57
No known key found for this signature in database
GPG Key ID: 0B61A8F2DEAFA389
6 changed files with 41 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/build.gradle.kts
View File

@ -87,7 +87,6 @@ dependencies {
implementation(libs.androidx.cardview) implementation(libs.androidx.cardview)
implementation(libs.androidx.browser) implementation(libs.androidx.browser)
implementation(libs.androidx.palette) implementation(libs.androidx.palette)
implementation(libs.androidx.fragment)
implementation(libs.androidx.core) implementation(libs.androidx.core)
implementation(libs.androidx.exifinterface) implementation(libs.androidx.exifinterface)
implementation(libs.materialcomponents.core) implementation(libs.materialcomponents.core)
@ -132,7 +131,6 @@ dependencies {
implementation(project(":permissions")) implementation(project(":permissions"))
implementation(project(":preferences")) implementation(project(":preferences"))
implementation(project(":search")) implementation(project(":search"))
implementation(project(":transition"))
implementation(project(":unitconverter")) implementation(project(":unitconverter"))
implementation(project(":ui")) implementation(project(":ui"))
implementation(project(":weather")) implementation(project(":weather"))

2
base/src/main/java/de/mm20/launcher2/licenses/OpenSourceLicenses.kt
View File

@ -102,7 +102,7 @@ val OpenSourceLicenses = arrayOf(
url = "https://github.com/justasm/DragLinearLayout" url = "https://github.com/justasm/DragLinearLayout"
), ),
OpenSourceLibrary( OpenSourceLibrary(
name = "mXparser", name = "mXparser (Version 4.4.2)",
description = "A super easy, rich, fast and highly flexible math expression parser library", description = "A super easy, rich, fast and highly flexible math expression parser library",
licenseName = R.string.bsd_2clause_name, licenseName = R.string.bsd_2clause_name,
licenseText = R.raw.license_bsd_2clause, licenseText = R.raw.license_bsd_2clause,

9
ktx/src/main/java/de/mm20/launcher2/ktx/Fragment.kt
View File

@ -1,9 +0,0 @@
package de.mm20.launcher2.ktx
import androidx.fragment.app.Fragment
val Fragment.dp: Float
get() = context?.dp ?: 0f
val Fragment.sp: Float
get() = context?.sp ?: 0f

90
settings.gradle.kts
View File

@ -22,7 +22,6 @@ include(":crashreporter")
include(":music") include(":music")
include(":preferences") include(":preferences")
include(":base") include(":base")
include(":transition")
include(":widgets") include(":widgets")
include(":weather") include(":weather")
include(":i18n") include(":i18n")
@ -32,6 +31,12 @@ include(":app")
include(":permissions") include(":permissions")
include(":ui") include(":ui")
include(":compat") include(":compat")
include(":notifications")
include(":accounts")
include(":appshortcuts")
include(":material-color-utilities")
include(":backup")
include(":customattrs")
dependencyResolutionManagement { dependencyResolutionManagement {
versionCatalogs { versionCatalogs {
@ -68,42 +73,42 @@ dependencyResolutionManagement {
) )
) )
version("androidx.compose.compiler", "1.3.0") version("androidx.compose.compiler", "1.3.1")
alias("androidx.compose.runtime") alias("androidx.compose.runtime")
.to("androidx.compose.runtime", "runtime") .to("androidx.compose.runtime", "runtime")
.version("1.3.0-beta01") .version("1.3.0-beta02")
alias("androidx.compose.livedata") alias("androidx.compose.livedata")
.to("androidx.compose.runtime", "runtime-livedata") .to("androidx.compose.runtime", "runtime-livedata")
.version("1.3.0-beta01") .version("1.3.0-beta02")
alias("androidx.compose.foundation") alias("androidx.compose.foundation")
.to("androidx.compose.foundation", "foundation") .to("androidx.compose.foundation", "foundation")
.version("1.3.0-beta01") .version("1.3.0-beta02")
alias("androidx.compose.foundationlayout") alias("androidx.compose.foundationlayout")
.to("androidx.compose.foundation", "foundation-layout") .to("androidx.compose.foundation", "foundation-layout")
.version("1.3.0-beta01") .version("1.3.0-beta02")
alias("androidx.compose.ui") alias("androidx.compose.ui")
.to("androidx.compose.ui", "ui") .to("androidx.compose.ui", "ui")
.version("1.3.0-beta01") .version("1.3.0-beta02")
alias("androidx.compose.uitooling") alias("androidx.compose.uitooling")
.to("androidx.compose.ui", "ui-tooling") .to("androidx.compose.ui", "ui-tooling")
.version("1.3.0-beta01") .version("1.3.0-beta02")
alias("androidx.compose.material") alias("androidx.compose.material")
.to("androidx.compose.material", "material") .to("androidx.compose.material", "material")
.version("1.3.0-beta01") .version("1.3.0-beta02")
alias("androidx.compose.materialicons") alias("androidx.compose.materialicons")
.to("androidx.compose.material", "material-icons-extended") .to("androidx.compose.material", "material-icons-extended")
.version("1.3.0-beta01") .version("1.3.0-beta02")
alias("androidx.compose.animation") alias("androidx.compose.animation")
.to("androidx.compose.animation", "animation") .to("androidx.compose.animation", "animation")
.version("1.3.0-beta01") .version("1.3.0-beta02")
alias("androidx.compose.animationgraphics") alias("androidx.compose.animationgraphics")
.to("androidx.compose.animation", "animation-graphics") .to("androidx.compose.animation", "animation-graphics")
.version("1.3.0-beta01") .version("1.3.0-beta02")
alias("androidx.compose.material3") alias("androidx.compose.material3")
.to("androidx.compose.material3", "material3") .to("androidx.compose.material3", "material3")
.version("1.0.0-beta01") .version("1.0.0-beta02")
version("androidx.lifecycle", "2.4.1") version("androidx.lifecycle", "2.6.0-alpha02")
alias("androidx.lifecycle.viewmodel") alias("androidx.lifecycle.viewmodel")
.to("androidx.lifecycle", "lifecycle-viewmodel-ktx") .to("androidx.lifecycle", "lifecycle-viewmodel-ktx")
.versionRef("androidx.lifecycle") .versionRef("androidx.lifecycle")
@ -129,7 +134,7 @@ dependencyResolutionManagement {
) )
) )
version("accompanist", "0.26.1-alpha") version("accompanist", "0.26.2-beta")
alias("accompanist.insets") alias("accompanist.insets")
.to("com.google.accompanist", "accompanist-insets") .to("com.google.accompanist", "accompanist-insets")
.versionRef("accompanist") .versionRef("accompanist")
@ -151,14 +156,14 @@ dependencyResolutionManagement {
alias("androidx.core") alias("androidx.core")
.to("androidx.core", "core-ktx") .to("androidx.core", "core-ktx")
.version("1.8.0-rc01") .version("1.9.0")
version("androidx.appcompat", "1.4.1") version("androidx.appcompat", "1.6.0-rc01")
alias("androidx.appcompat") alias("androidx.appcompat")
.to("androidx.appcompat", "appcompat") .to("androidx.appcompat", "appcompat")
.versionRef("androidx.appcompat") .versionRef("androidx.appcompat")
version("androidx.activity", "1.4.0") version("androidx.activity", "1.6.0-rc02")
alias("androidx.activity") alias("androidx.activity")
.to("androidx.activity", "activity-ktx") .to("androidx.activity", "activity-ktx")
.versionRef("androidx.activity") .versionRef("androidx.activity")
@ -168,7 +173,7 @@ dependencyResolutionManagement {
alias("androidx.work") alias("androidx.work")
.to("androidx.work", "work-runtime-ktx") .to("androidx.work", "work-runtime-ktx")
.version("2.7.1") .version("2.8.0-alpha04")
alias("androidx.browser") alias("androidx.browser")
.to("androidx.browser", "browser") .to("androidx.browser", "browser")
@ -202,10 +207,6 @@ dependencyResolutionManagement {
.to("androidx.exifinterface", "exifinterface") .to("androidx.exifinterface", "exifinterface")
.version("1.3.3") .version("1.3.3")
alias("androidx.fragment")
.to("androidx.fragment", "fragment-ktx")
.version("1.4.1")
alias("androidx.securitycrypto") alias("androidx.securitycrypto")
.to("androidx.security", "security-crypto") .to("androidx.security", "security-crypto")
.version("1.1.0-alpha03") .version("1.1.0-alpha03")
@ -214,7 +215,7 @@ dependencyResolutionManagement {
.to("androidx.datastore", "datastore") .to("androidx.datastore", "datastore")
.version("1.0.0") .version("1.0.0")
version("androidx.room", "2.5.0-alpha02") version("androidx.room", "2.5.0-alpha03")
alias("androidx.roomruntime") alias("androidx.roomruntime")
.to("androidx.room", "room-runtime") .to("androidx.room", "room-runtime")
.versionRef("androidx.room") .versionRef("androidx.room")
@ -225,7 +226,7 @@ dependencyResolutionManagement {
.to("androidx.room", "room-ktx") .to("androidx.room", "room-ktx")
.versionRef("androidx.room") .versionRef("androidx.room")
version("androidx.appsearch", "1.0.0-alpha04") version("androidx.appsearch", "1.1.0-alpha02")
alias("androidx.appsearch") alias("androidx.appsearch")
.to("androidx.appsearch", "appsearch") .to("androidx.appsearch", "appsearch")
.versionRef("androidx.appsearch") .versionRef("androidx.appsearch")
@ -244,17 +245,11 @@ dependencyResolutionManagement {
alias("androidx.navigation.compose") alias("androidx.navigation.compose")
.to("androidx.navigation", "navigation-compose") .to("androidx.navigation", "navigation-compose")
.version("2.5.0-rc02") .version("2.6.0-alpha01")
alias("materialcomponents.core") alias("materialcomponents.core")
.to("com.google.android.material", "material") .to("com.google.android.material", "material")
.version("1.6.0-beta01") .version("1.8.0-alpha01")
alias("materialcomponents.composethemeadapter3")
.to("com.google.android.material", "compose-theme-adapter-3")
.version("1.0.6")
alias("materialcomponents.composethemeadapter")
.to("com.google.android.material", "compose-theme-adapter")
.version("1.1.6")
alias("okhttp") alias("okhttp")
.to("com.squareup.okhttp3", "okhttp") .to("com.squareup.okhttp3", "okhttp")
@ -274,7 +269,7 @@ dependencyResolutionManagement {
) )
) )
version("coil", "2.1.0") version("coil", "2.2.1")
alias("coil.core") alias("coil.core")
.to("io.coil-kt", "coil") .to("io.coil-kt", "coil")
.versionRef("coil") .versionRef("coil")
@ -287,7 +282,7 @@ dependencyResolutionManagement {
alias("composecolorpicker") alias("composecolorpicker")
.to("com.godaddy.android.colorpicker", "compose-color-picker") .to("com.godaddy.android.colorpicker", "compose-color-picker")
.version("0.3.1") .version("0.5.0")
alias("leakcanary") alias("leakcanary")
.to("com.squareup.leakcanary", "leakcanary-android") .to("com.squareup.leakcanary", "leakcanary-android")
@ -299,7 +294,7 @@ dependencyResolutionManagement {
alias("jsoup") alias("jsoup")
.to("org.jsoup", "jsoup") .to("org.jsoup", "jsoup")
.version("1.14.2") .version("1.15.3")
alias("commons.text") alias("commons.text")
.to("org.apache.commons", "commons-text") .to("org.apache.commons", "commons-text")
@ -331,16 +326,17 @@ dependencyResolutionManagement {
.to("com.jmedeisis", "draglinearlayout") .to("com.jmedeisis", "draglinearlayout")
.version("1.1.0") .version("1.1.0")
// 4.4.2 is the last GPL compatible version, don't update to 5.x
alias("mathparser") alias("mathparser")
.to("org.mariuszgromada.math", "MathParser.org-mXparser") .to("org.mariuszgromada.math", "MathParser.org-mXparser")
.version("4.4.2") .version("4.4.2")
alias("google.auth") alias("google.auth")
.to("com.google.auth", "google-auth-library-oauth2-http") .to("com.google.auth", "google-auth-library-oauth2-http")
.version("1.4.0") .version("1.11.0")
alias("google.apiclient") alias("google.apiclient")
.to("com.google.api-client", "google-api-client-android") .to("com.google.api-client", "google-api-client-android")
.version("1.33.2") .version("2.0.0")
alias("google.drive") alias("google.drive")
.to("com.google.apis", "google-api-services-drive") .to("com.google.apis", "google-api-services-drive")
.version("v3-rev197-1.25.0") .version("v3-rev197-1.25.0")
@ -350,18 +346,18 @@ dependencyResolutionManagement {
alias("gson") alias("gson")
.to("com.google.code.gson", "gson") .to("com.google.code.gson", "gson")
.version("2.8.6") .version("2.9.1")
alias("guava") alias("guava")
.to("com.google.guava", "guava") .to("com.google.guava", "guava")
.version("30.1.1-android") .version("31.1-android")
alias("microsoft.graph") alias("microsoft.graph")
.to("com.microsoft.graph", "microsoft-graph") .to("com.microsoft.graph", "microsoft-graph")
.version("5.31.0") .version("5.34.0")
alias("microsoft.identity") alias("microsoft.identity")
.to("com.microsoft.identity.client", "msal") .to("com.microsoft.identity.client", "msal")
.version("4.0.0") .version("4.0.1")
version("protobuf", "3.14.0") version("protobuf", "3.14.0")
alias("protobuf.protoc") alias("protobuf.protoc")
@ -371,7 +367,7 @@ dependencyResolutionManagement {
.to("com.google.protobuf", "protobuf-javalite") .to("com.google.protobuf", "protobuf-javalite")
.versionRef("protobuf") .versionRef("protobuf")
version("koin", "3.1.6") version("koin", "3.2.0")
alias("koin.android") alias("koin.android")
.to("io.insert-koin", "koin-android") .to("io.insert-koin", "koin-android")
.versionRef("koin") .versionRef("koin")
@ -385,13 +381,7 @@ dependencyResolutionManagement {
alias("lottie") alias("lottie")
.to("com.airbnb.android", "lottie-compose") .to("com.airbnb.android", "lottie-compose")
.version("5.0.3") .version("5.2.0")
} }
} }
} }
include(":notifications")
include(":accounts")
include(":appshortcuts")
include(":material-color-utilities")
include(":backup")
include(":customattrs")

5
ui/build.gradle.kts
View File

@ -83,10 +83,6 @@ dependencies {
// Legacy dependencies // Legacy dependencies
implementation(libs.androidx.transition) implementation(libs.androidx.transition)
implementation(libs.materialcomponents.core)
implementation(libs.materialcomponents.composethemeadapter)
implementation(libs.materialcomponents.composethemeadapter3)
implementation(libs.draglinearlayout) implementation(libs.draglinearlayout)
implementation(libs.accompanist.insets) implementation(libs.accompanist.insets)
@ -139,7 +135,6 @@ dependencies {
implementation(project(":badges")) implementation(project(":badges"))
implementation(project(":crashreporter")) implementation(project(":crashreporter"))
implementation(project(":notifications")) implementation(project(":notifications"))
implementation(project(":transition"))
implementation(project(":contacts")) implementation(project(":contacts"))
implementation(project(":permissions")) implementation(project(":permissions"))
implementation(project(":websites")) implementation(project(":websites"))

1
widgets/build.gradle.kts
View File

@ -48,7 +48,6 @@ dependencies {
implementation(project(":calendar")) implementation(project(":calendar"))
implementation(project(":music")) implementation(project(":music"))
implementation(project(":ktx")) implementation(project(":ktx"))
implementation(project(":transition"))
implementation(project(":base")) implementation(project(":base"))
implementation(project(":preferences")) implementation(project(":preferences"))
implementation(project(":database")) implementation(project(":database"))