Update and cleanup dependencies

This commit is contained in:
MM20 2023-04-17 13:14:59 +02:00
parent 847fe08acd
commit 64e7528cb0
No known key found for this signature in database
GPG Key ID: 0B61A8F2DEAFA389
6 changed files with 20 additions and 34 deletions

2
.idea/kotlinc.xml generated
View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<project version="4"> <project version="4">
<component name="KotlinJpsPluginSettings"> <component name="KotlinJpsPluginSettings">
<option name="version" value="1.8.10" /> <option name="version" value="1.8.20" />
</component> </component>
</project> </project>

View File

@ -102,7 +102,6 @@ dependencies {
//Android Jetpack //Android Jetpack
implementation(libs.androidx.appcompat) implementation(libs.androidx.appcompat)
implementation(libs.androidx.cardview)
implementation(libs.androidx.browser) implementation(libs.androidx.browser)
implementation(libs.androidx.palette) implementation(libs.androidx.palette)
implementation(libs.androidx.core) implementation(libs.androidx.core)

View File

@ -113,8 +113,6 @@ dependencies {
implementation(libs.coil.core) implementation(libs.coil.core)
implementation(libs.coil.compose) implementation(libs.coil.compose)
implementation(libs.lottie)
implementation(project(":libs:material-color-utilities")) implementation(project(":libs:material-color-utilities"))
implementation(project(":core:base")) implementation(project(":core:base"))

View File

@ -24,6 +24,13 @@ val OpenSourceLicenses = arrayOf(
licenseText = R.raw.license_apache_2, licenseText = R.raw.license_apache_2,
url = "https://github.com/Kotlin/kotlinx.collections.immutable" url = "https://github.com/Kotlin/kotlinx.collections.immutable"
), ),
OpenSourceLibrary(
name = "KotlinX Serialization",
description = "Kotlin serialization consists of a compiler plugin, that generates visitor code for serializable classes, runtime library with core serialization API and support libraries with various serialization formats.",
licenseName = R.string.apache_license_name,
licenseText = R.raw.license_apache_2,
url = "https://github.com/Kotlin/kotlinx.serialization"
),
OpenSourceLibrary( OpenSourceLibrary(
name = "Android Jetpack", name = "Android Jetpack",
description = "A collection of Android software components to make it easier to develop great Android apps.", description = "A collection of Android software components to make it easier to develop great Android apps.",
@ -200,14 +207,6 @@ val OpenSourceLicenses = arrayOf(
licenseText = R.raw.license_apache_2, licenseText = R.raw.license_apache_2,
url = "https://source.android.com/" url = "https://source.android.com/"
), ),
OpenSourceLibrary(
name = "Lottie",
copyrightNote = "Copyright (c) 2017 Airbnb",
description = "Lottie is a library for Android, iOS, Web, and Windows that parses Adobe After Effects animations exported as json with Bodymovin and renders them natively on mobile and on the web",
licenseName = R.string.mit_license_name,
licenseText = R.raw.license_mit,
url = "https://airbnb.design/lottie/"
),
OpenSourceLibrary( OpenSourceLibrary(
name = "Protobuf", name = "Protobuf",
copyrightNote = "Copyright 2008 Google Inc. All rights reserved.", copyrightNote = "Copyright 2008 Google Inc. All rights reserved.",

View File

@ -38,7 +38,6 @@ dependencies {
implementation(libs.bundles.kotlin) implementation(libs.bundles.kotlin)
implementation(libs.androidx.appcompat) implementation(libs.androidx.appcompat)
implementation(libs.materialcomponents.core) implementation(libs.materialcomponents.core)
implementation(libs.androidx.recyclerview)
implementation(project(":core:base")) implementation(project(":core:base"))

View File

@ -9,7 +9,7 @@ dependencyResolutionManagement {
version("targetSdk", "33") version("targetSdk", "33")
} }
create("libs") { create("libs") {
version("kotlin", "1.8.10") version("kotlin", "1.8.20")
version("kotlinx.coroutines", "1.6.4") version("kotlinx.coroutines", "1.6.4")
library("kotlin.stdlib", "org.jetbrains.kotlin", "kotlin-stdlib") library("kotlin.stdlib", "org.jetbrains.kotlin", "kotlin-stdlib")
.versionRef("kotlin") .versionRef("kotlin")
@ -34,7 +34,7 @@ dependencyResolutionManagement {
library("kotlinx.serialization.json", "org.jetbrains.kotlinx", "kotlinx-serialization-json") library("kotlinx.serialization.json", "org.jetbrains.kotlinx", "kotlinx-serialization-json")
.versionRef("kotlinx.serialization") .versionRef("kotlinx.serialization")
version("androidx.compose.compiler", "1.4.4") version("androidx.compose.compiler", "1.4.5")
library("androidx.compose.runtime", "androidx.compose.runtime", "runtime") library("androidx.compose.runtime", "androidx.compose.runtime", "runtime")
.version("1.5.0-alpha02") .version("1.5.0-alpha02")
library("androidx.compose.livedata", "androidx.compose.runtime", "runtime-livedata") library("androidx.compose.livedata", "androidx.compose.runtime", "runtime-livedata")
@ -58,7 +58,7 @@ dependencyResolutionManagement {
library("androidx.compose.material3", "androidx.compose.material3", "material3") library("androidx.compose.material3", "androidx.compose.material3", "material3")
.version("1.1.0-beta02") .version("1.1.0-beta02")
version("androidx.lifecycle", "2.6.0-beta01") version("androidx.lifecycle", "2.6.1")
library("androidx.lifecycle.viewmodel", "androidx.lifecycle", "lifecycle-viewmodel-ktx") library("androidx.lifecycle.viewmodel", "androidx.lifecycle", "lifecycle-viewmodel-ktx")
.versionRef("androidx.lifecycle") .versionRef("androidx.lifecycle")
library("androidx.lifecycle.livedata", "androidx.lifecycle", "lifecycle-livedata-ktx") library("androidx.lifecycle.livedata", "androidx.lifecycle", "lifecycle-livedata-ktx")
@ -123,12 +123,6 @@ dependencyResolutionManagement {
library("androidx.constraintlayout", "androidx.constraintlayout", "constraintlayout") library("androidx.constraintlayout", "androidx.constraintlayout", "constraintlayout")
.version("2.1.3") .version("2.1.3")
library("androidx.cardview", "androidx.cardview", "cardview")
.version("1.0.0")
library("androidx.recyclerview", "androidx.recyclerview", "recyclerview")
.version("1.3.0-alpha01")
library("androidx.transition", "androidx.transition", "transition") library("androidx.transition", "androidx.transition", "transition")
.version("1.4.1") .version("1.4.1")
@ -164,7 +158,7 @@ dependencyResolutionManagement {
) )
library("androidx.navigation.compose", "androidx.navigation", "navigation-compose") library("androidx.navigation.compose", "androidx.navigation", "navigation-compose")
.version("2.6.0-alpha01") .version("2.6.0-alpha09")
library("materialcomponents.core", "com.google.android.material", "material") library("materialcomponents.core", "com.google.android.material", "material")
.version("1.8.0-alpha01") .version("1.8.0-alpha01")
@ -184,7 +178,7 @@ dependencyResolutionManagement {
) )
) )
version("coil", "2.2.1") version("coil", "2.3.0")
library("coil.core", "io.coil-kt", "coil") library("coil.core", "io.coil-kt", "coil")
.versionRef("coil") .versionRef("coil")
library("coil.svg", "io.coil-kt", "coil-svg") library("coil.svg", "io.coil-kt", "coil-svg")
@ -193,19 +187,19 @@ dependencyResolutionManagement {
.versionRef("coil") .versionRef("coil")
library("composecolorpicker", "com.godaddy.android.colorpicker", "compose-color-picker") library("composecolorpicker", "com.godaddy.android.colorpicker", "compose-color-picker")
.version("0.5.0") .version("0.7.0")
library("leakcanary", "com.squareup.leakcanary", "leakcanary-android") library("leakcanary", "com.squareup.leakcanary", "leakcanary-android")
.version("2.9.1") .version("2.10")
library("suncalc", "org.shredzone.commons", "commons-suncalc") library("suncalc", "org.shredzone.commons", "commons-suncalc")
.version("3.5") .version("3.7")
library("jsoup", "org.jsoup", "jsoup") library("jsoup", "org.jsoup", "jsoup")
.version("1.15.3") .version("1.15.4")
library("commons.text", "org.apache.commons", "commons-text") library("commons.text", "org.apache.commons", "commons-text")
.version("1.9") .version("1.10.0")
// 4.4.2 is the last GPL compatible version, don't update to 5.x // 4.4.2 is the last GPL compatible version, don't update to 5.x
library("mathparser", "org.mariuszgromada.math", "MathParser.org-mXparser") library("mathparser", "org.mariuszgromada.math", "MathParser.org-mXparser")
@ -227,9 +221,9 @@ dependencyResolutionManagement {
.version("31.1-android") .version("31.1-android")
library("microsoft.graph", "com.microsoft.graph", "microsoft-graph") library("microsoft.graph", "com.microsoft.graph", "microsoft-graph")
.version("5.42.0") .version("5.53.0")
library("microsoft.identity", "com.microsoft.identity.client", "msal") library("microsoft.identity", "com.microsoft.identity.client", "msal")
.version("4.1.0") .version("4.2.0")
version("protobuf", "3.14.0") version("protobuf", "3.14.0")
library("protobuf.protoc", "com.google.protobuf", "protoc") library("protobuf.protoc", "com.google.protobuf", "protoc")
@ -246,9 +240,6 @@ dependencyResolutionManagement {
library("tinypinyin", "com.github.promeg", "tinypinyin") library("tinypinyin", "com.github.promeg", "tinypinyin")
.version("2.0.2") .version("2.0.2")
library("lottie", "com.airbnb.android", "lottie-compose")
.version("5.2.0")
version("junit", "4.13") version("junit", "4.13")
library("junit", "junit", "junit").versionRef("junit") library("junit", "junit", "junit").versionRef("junit")
bundle("tests", listOf("junit")) bundle("tests", listOf("junit"))