diff --git a/app/build.gradle.kts b/app/build.gradle.kts index d13ea264..a2067b0a 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -87,7 +87,6 @@ dependencies { implementation(libs.androidx.cardview) implementation(libs.androidx.browser) implementation(libs.androidx.palette) - implementation(libs.androidx.fragment) implementation(libs.androidx.core) implementation(libs.androidx.exifinterface) implementation(libs.materialcomponents.core) @@ -132,7 +131,6 @@ dependencies { implementation(project(":permissions")) implementation(project(":preferences")) implementation(project(":search")) - implementation(project(":transition")) implementation(project(":unitconverter")) implementation(project(":ui")) implementation(project(":weather")) diff --git a/base/src/main/java/de/mm20/launcher2/licenses/OpenSourceLicenses.kt b/base/src/main/java/de/mm20/launcher2/licenses/OpenSourceLicenses.kt index 47b30294..3d9592ff 100644 --- a/base/src/main/java/de/mm20/launcher2/licenses/OpenSourceLicenses.kt +++ b/base/src/main/java/de/mm20/launcher2/licenses/OpenSourceLicenses.kt @@ -102,7 +102,7 @@ val OpenSourceLicenses = arrayOf( url = "https://github.com/justasm/DragLinearLayout" ), OpenSourceLibrary( - name = "mXparser", + name = "mXparser (Version 4.4.2)", description = "A super easy, rich, fast and highly flexible math expression parser library", licenseName = R.string.bsd_2clause_name, licenseText = R.raw.license_bsd_2clause, diff --git a/ktx/src/main/java/de/mm20/launcher2/ktx/Fragment.kt b/ktx/src/main/java/de/mm20/launcher2/ktx/Fragment.kt deleted file mode 100644 index 52b9038d..00000000 --- a/ktx/src/main/java/de/mm20/launcher2/ktx/Fragment.kt +++ /dev/null @@ -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 diff --git a/settings.gradle.kts b/settings.gradle.kts index 942d41ab..fc374c39 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -22,7 +22,6 @@ include(":crashreporter") include(":music") include(":preferences") include(":base") -include(":transition") include(":widgets") include(":weather") include(":i18n") @@ -32,6 +31,12 @@ include(":app") include(":permissions") include(":ui") include(":compat") +include(":notifications") +include(":accounts") +include(":appshortcuts") +include(":material-color-utilities") +include(":backup") +include(":customattrs") dependencyResolutionManagement { versionCatalogs { @@ -68,42 +73,42 @@ dependencyResolutionManagement { ) ) - version("androidx.compose.compiler", "1.3.0") + version("androidx.compose.compiler", "1.3.1") alias("androidx.compose.runtime") .to("androidx.compose.runtime", "runtime") - .version("1.3.0-beta01") + .version("1.3.0-beta02") alias("androidx.compose.livedata") .to("androidx.compose.runtime", "runtime-livedata") - .version("1.3.0-beta01") + .version("1.3.0-beta02") alias("androidx.compose.foundation") .to("androidx.compose.foundation", "foundation") - .version("1.3.0-beta01") + .version("1.3.0-beta02") alias("androidx.compose.foundationlayout") .to("androidx.compose.foundation", "foundation-layout") - .version("1.3.0-beta01") + .version("1.3.0-beta02") alias("androidx.compose.ui") .to("androidx.compose.ui", "ui") - .version("1.3.0-beta01") + .version("1.3.0-beta02") alias("androidx.compose.uitooling") .to("androidx.compose.ui", "ui-tooling") - .version("1.3.0-beta01") + .version("1.3.0-beta02") alias("androidx.compose.material") .to("androidx.compose.material", "material") - .version("1.3.0-beta01") + .version("1.3.0-beta02") alias("androidx.compose.materialicons") .to("androidx.compose.material", "material-icons-extended") - .version("1.3.0-beta01") + .version("1.3.0-beta02") alias("androidx.compose.animation") .to("androidx.compose.animation", "animation") - .version("1.3.0-beta01") + .version("1.3.0-beta02") alias("androidx.compose.animationgraphics") .to("androidx.compose.animation", "animation-graphics") - .version("1.3.0-beta01") + .version("1.3.0-beta02") alias("androidx.compose.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") .to("androidx.lifecycle", "lifecycle-viewmodel-ktx") .versionRef("androidx.lifecycle") @@ -129,7 +134,7 @@ dependencyResolutionManagement { ) ) - version("accompanist", "0.26.1-alpha") + version("accompanist", "0.26.2-beta") alias("accompanist.insets") .to("com.google.accompanist", "accompanist-insets") .versionRef("accompanist") @@ -151,14 +156,14 @@ dependencyResolutionManagement { alias("androidx.core") .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") .to("androidx.appcompat", "appcompat") .versionRef("androidx.appcompat") - version("androidx.activity", "1.4.0") + version("androidx.activity", "1.6.0-rc02") alias("androidx.activity") .to("androidx.activity", "activity-ktx") .versionRef("androidx.activity") @@ -168,7 +173,7 @@ dependencyResolutionManagement { alias("androidx.work") .to("androidx.work", "work-runtime-ktx") - .version("2.7.1") + .version("2.8.0-alpha04") alias("androidx.browser") .to("androidx.browser", "browser") @@ -202,10 +207,6 @@ dependencyResolutionManagement { .to("androidx.exifinterface", "exifinterface") .version("1.3.3") - alias("androidx.fragment") - .to("androidx.fragment", "fragment-ktx") - .version("1.4.1") - alias("androidx.securitycrypto") .to("androidx.security", "security-crypto") .version("1.1.0-alpha03") @@ -214,7 +215,7 @@ dependencyResolutionManagement { .to("androidx.datastore", "datastore") .version("1.0.0") - version("androidx.room", "2.5.0-alpha02") + version("androidx.room", "2.5.0-alpha03") alias("androidx.roomruntime") .to("androidx.room", "room-runtime") .versionRef("androidx.room") @@ -225,7 +226,7 @@ dependencyResolutionManagement { .to("androidx.room", "room-ktx") .versionRef("androidx.room") - version("androidx.appsearch", "1.0.0-alpha04") + version("androidx.appsearch", "1.1.0-alpha02") alias("androidx.appsearch") .to("androidx.appsearch", "appsearch") .versionRef("androidx.appsearch") @@ -244,17 +245,11 @@ dependencyResolutionManagement { alias("androidx.navigation.compose") .to("androidx.navigation", "navigation-compose") - .version("2.5.0-rc02") + .version("2.6.0-alpha01") alias("materialcomponents.core") .to("com.google.android.material", "material") - .version("1.6.0-beta01") - 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") + .version("1.8.0-alpha01") alias("okhttp") .to("com.squareup.okhttp3", "okhttp") @@ -274,7 +269,7 @@ dependencyResolutionManagement { ) ) - version("coil", "2.1.0") + version("coil", "2.2.1") alias("coil.core") .to("io.coil-kt", "coil") .versionRef("coil") @@ -287,7 +282,7 @@ dependencyResolutionManagement { alias("composecolorpicker") .to("com.godaddy.android.colorpicker", "compose-color-picker") - .version("0.3.1") + .version("0.5.0") alias("leakcanary") .to("com.squareup.leakcanary", "leakcanary-android") @@ -299,7 +294,7 @@ dependencyResolutionManagement { alias("jsoup") .to("org.jsoup", "jsoup") - .version("1.14.2") + .version("1.15.3") alias("commons.text") .to("org.apache.commons", "commons-text") @@ -331,16 +326,17 @@ dependencyResolutionManagement { .to("com.jmedeisis", "draglinearlayout") .version("1.1.0") + // 4.4.2 is the last GPL compatible version, don't update to 5.x alias("mathparser") .to("org.mariuszgromada.math", "MathParser.org-mXparser") .version("4.4.2") alias("google.auth") .to("com.google.auth", "google-auth-library-oauth2-http") - .version("1.4.0") + .version("1.11.0") alias("google.apiclient") .to("com.google.api-client", "google-api-client-android") - .version("1.33.2") + .version("2.0.0") alias("google.drive") .to("com.google.apis", "google-api-services-drive") .version("v3-rev197-1.25.0") @@ -350,18 +346,18 @@ dependencyResolutionManagement { alias("gson") .to("com.google.code.gson", "gson") - .version("2.8.6") + .version("2.9.1") alias("guava") .to("com.google.guava", "guava") - .version("30.1.1-android") + .version("31.1-android") alias("microsoft.graph") .to("com.microsoft.graph", "microsoft-graph") - .version("5.31.0") + .version("5.34.0") alias("microsoft.identity") .to("com.microsoft.identity.client", "msal") - .version("4.0.0") + .version("4.0.1") version("protobuf", "3.14.0") alias("protobuf.protoc") @@ -371,7 +367,7 @@ dependencyResolutionManagement { .to("com.google.protobuf", "protobuf-javalite") .versionRef("protobuf") - version("koin", "3.1.6") + version("koin", "3.2.0") alias("koin.android") .to("io.insert-koin", "koin-android") .versionRef("koin") @@ -385,13 +381,7 @@ dependencyResolutionManagement { alias("lottie") .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") diff --git a/ui/build.gradle.kts b/ui/build.gradle.kts index 04bbdeac..27ad79f6 100644 --- a/ui/build.gradle.kts +++ b/ui/build.gradle.kts @@ -83,10 +83,6 @@ dependencies { // Legacy dependencies implementation(libs.androidx.transition) - implementation(libs.materialcomponents.core) - implementation(libs.materialcomponents.composethemeadapter) - implementation(libs.materialcomponents.composethemeadapter3) - implementation(libs.draglinearlayout) implementation(libs.accompanist.insets) @@ -139,7 +135,6 @@ dependencies { implementation(project(":badges")) implementation(project(":crashreporter")) implementation(project(":notifications")) - implementation(project(":transition")) implementation(project(":contacts")) implementation(project(":permissions")) implementation(project(":websites")) diff --git a/widgets/build.gradle.kts b/widgets/build.gradle.kts index 8c589290..7138142b 100644 --- a/widgets/build.gradle.kts +++ b/widgets/build.gradle.kts @@ -48,7 +48,6 @@ dependencies { implementation(project(":calendar")) implementation(project(":music")) implementation(project(":ktx")) - implementation(project(":transition")) implementation(project(":base")) implementation(project(":preferences")) implementation(project(":database"))