diff --git a/settings.gradle.kts b/settings.gradle.kts index cbac3c60..c4eab86d 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -48,20 +48,15 @@ dependencyResolutionManagement { create("libs") { version("kotlin", "1.7.10") version("kotlinx.coroutines", "1.6.4") - alias("kotlin.stdlib") - .to("org.jetbrains.kotlin", "kotlin-stdlib") + library("kotlin.stdlib", "org.jetbrains.kotlin", "kotlin-stdlib") .versionRef("kotlin") - alias("kotlin.gradle") - .to("org.jetbrains.kotlin", "kotlin-gradle-plugin") + library("kotlin.gradle","org.jetbrains.kotlin", "kotlin-gradle-plugin") .versionRef("kotlin") - alias("kotlinx.coroutines.core") - .to("org.jetbrains.kotlinx", "kotlinx-coroutines-core") + library("kotlinx.coroutines.core", "org.jetbrains.kotlinx", "kotlinx-coroutines-core") .versionRef("kotlinx.coroutines") - alias("kotlinx.coroutines.android") - .to("org.jetbrains.kotlinx", "kotlinx-coroutines-android") + library("kotlinx.coroutines.android", "org.jetbrains.kotlinx", "kotlinx-coroutines-android") .versionRef("kotlinx.coroutines") - alias("kotlinx.collections.immutable") - .to("org.jetbrains.kotlinx", "kotlinx-collections-immutable") + library("kotlinx.collections.immutable", "org.jetbrains.kotlinx", "kotlinx-collections-immutable") .version("0.3.5") bundle( "kotlin", @@ -74,55 +69,39 @@ dependencyResolutionManagement { ) version("androidx.compose.compiler", "1.3.1") - alias("androidx.compose.runtime") - .to("androidx.compose.runtime", "runtime") + library("androidx.compose.runtime", "androidx.compose.runtime", "runtime") .version("1.3.0-beta03") - alias("androidx.compose.livedata") - .to("androidx.compose.runtime", "runtime-livedata") + library("androidx.compose.livedata", "androidx.compose.runtime", "runtime-livedata") .version("1.3.0-beta03") - alias("androidx.compose.foundation") - .to("androidx.compose.foundation", "foundation") + library("androidx.compose.foundation", "androidx.compose.foundation", "foundation") .version("1.3.0-beta03") - alias("androidx.compose.foundationlayout") - .to("androidx.compose.foundation", "foundation-layout") + library("androidx.compose.foundationlayout", "androidx.compose.foundation", "foundation-layout") .version("1.3.0-beta03") - alias("androidx.compose.ui") - .to("androidx.compose.ui", "ui") + library("androidx.compose.ui", "androidx.compose.ui", "ui") .version("1.3.0-beta03") - alias("androidx.compose.uitooling") - .to("androidx.compose.ui", "ui-tooling") + library("androidx.compose.uitooling", "androidx.compose.ui", "ui-tooling") .version("1.3.0-beta03") - alias("androidx.compose.material") - .to("androidx.compose.material", "material") + library("androidx.compose.material", "androidx.compose.material", "material") .version("1.3.0-beta03") - alias("androidx.compose.materialicons") - .to("androidx.compose.material", "material-icons-extended") + library("androidx.compose.materialicons", "androidx.compose.material", "material-icons-extended") .version("1.3.0-beta03") - alias("androidx.compose.animation") - .to("androidx.compose.animation", "animation") + library("androidx.compose.animation", "androidx.compose.animation", "animation") .version("1.3.0-beta03") - alias("androidx.compose.animationgraphics") - .to("androidx.compose.animation", "animation-graphics") + library("androidx.compose.animationgraphics", "androidx.compose.animation", "animation-graphics") .version("1.3.0-beta03") - alias("androidx.compose.material3") - .to("androidx.compose.material3", "material3") + library("androidx.compose.material3", "androidx.compose.material3", "material3") .version("1.0.0-beta02") version("androidx.lifecycle", "2.6.0-alpha02") - alias("androidx.lifecycle.viewmodel") - .to("androidx.lifecycle", "lifecycle-viewmodel-ktx") + library("androidx.lifecycle.viewmodel", "androidx.lifecycle", "lifecycle-viewmodel-ktx") .versionRef("androidx.lifecycle") - alias("androidx.lifecycle.livedata") - .to("androidx.lifecycle", "lifecycle-livedata-ktx") + library("androidx.lifecycle.livedata", "androidx.lifecycle", "lifecycle-livedata-ktx") .versionRef("androidx.lifecycle") - alias("androidx.lifecycle.common") - .to("androidx.lifecycle", "lifecycle-common-java8") + library("androidx.lifecycle.common", "androidx.lifecycle", "lifecycle-common-java8") .versionRef("androidx.lifecycle") - alias("androidx.lifecycle.runtime") - .to("androidx.lifecycle", "lifecycle-runtime-ktx") + library("androidx.lifecycle.runtime", "androidx.lifecycle", "lifecycle-runtime-ktx") .versionRef("androidx.lifecycle") - alias("androidx.lifecycle.viewmodelcompose") - .to("androidx.lifecycle", "lifecycle-viewmodel-compose") + library("androidx.lifecycle.viewmodelcompose", "androidx.lifecycle", "lifecycle-viewmodel-compose") .versionRef("androidx.lifecycle") bundle( "androidx.lifecycle", @@ -135,106 +114,79 @@ dependencyResolutionManagement { ) version("accompanist", "0.26.4-beta") - alias("accompanist.insets") - .to("com.google.accompanist", "accompanist-insets") + library("accompanist.insets", "com.google.accompanist", "accompanist-insets") .versionRef("accompanist") - alias("accompanist.systemuicontroller") - .to("com.google.accompanist", "accompanist-systemuicontroller") + library("accompanist.systemuicontroller", "com.google.accompanist", "accompanist-systemuicontroller") .versionRef("accompanist") - alias("accompanist.pager") - .to("com.google.accompanist", "accompanist-pager") + library("accompanist.pager", "com.google.accompanist", "accompanist-pager") .versionRef("accompanist") - alias("accompanist.pagerindicators") - .to("com.google.accompanist", "accompanist-pager-indicators") + library("accompanist.pagerindicators", "com.google.accompanist", "accompanist-pager-indicators") .versionRef("accompanist") - alias("accompanist.flowlayout") - .to("com.google.accompanist", "accompanist-flowlayout") + library("accompanist.flowlayout", "com.google.accompanist", "accompanist-flowlayout") .versionRef("accompanist") - alias("accompanist.navigationanimation") - .to("com.google.accompanist", "accompanist-navigation-animation") + library("accompanist.navigationanimation", "com.google.accompanist", "accompanist-navigation-animation") .versionRef("accompanist") - alias("androidx.core") - .to("androidx.core", "core-ktx") + library("androidx.core", "androidx.core", "core-ktx") .version("1.9.0") version("androidx.appcompat", "1.6.0-rc01") - alias("androidx.appcompat") - .to("androidx.appcompat", "appcompat") + library("androidx.appcompat", "androidx.appcompat", "appcompat") .versionRef("androidx.appcompat") version("androidx.activity", "1.6.0-rc02") - alias("androidx.activity") - .to("androidx.activity", "activity-ktx") + library("androidx.activity", "androidx.activity", "activity-ktx") .versionRef("androidx.activity") - alias("androidx.activitycompose") - .to("androidx.activity", "activity-compose") + library("androidx.activitycompose", "androidx.activity", "activity-compose") .versionRef("androidx.activity") - alias("androidx.work") - .to("androidx.work", "work-runtime-ktx") + library("androidx.work", "androidx.work", "work-runtime-ktx") .version("2.8.0-alpha04") - alias("androidx.browser") - .to("androidx.browser", "browser") + library("androidx.browser", "androidx.browser", "browser") .version("1.4.0") - alias("androidx.palette") - .to("androidx.palette", "palette") + library("androidx.palette", "androidx.palette", "palette") .version("1.0.0") - alias("androidx.media2") - .to("androidx.media2", "media2-session") + library("androidx.media2", "androidx.media2", "media2-session") .version("1.2.1") - alias("androidx.constraintlayout") - .to("androidx.constraintlayout", "constraintlayout") + library("androidx.constraintlayout", "androidx.constraintlayout", "constraintlayout") .version("2.1.3") - alias("androidx.cardview") - .to("androidx.cardview", "cardview") + library("androidx.cardview", "androidx.cardview", "cardview") .version("1.0.0") - alias("androidx.recyclerview") - .to("androidx.recyclerview", "recyclerview") + library("androidx.recyclerview", "androidx.recyclerview", "recyclerview") .version("1.3.0-alpha01") - alias("androidx.transition") - .to("androidx.transition", "transition") + library("androidx.transition", "androidx.transition", "transition") .version("1.4.1") - alias("androidx.exifinterface") - .to("androidx.exifinterface", "exifinterface") + library("androidx.exifinterface", "androidx.exifinterface", "exifinterface") .version("1.3.3") - alias("androidx.securitycrypto") - .to("androidx.security", "security-crypto") + library("androidx.securitycrypto", "androidx.security", "security-crypto") .version("1.1.0-alpha03") - alias("androidx.datastore") - .to("androidx.datastore", "datastore") + library("androidx.datastore", "androidx.datastore", "datastore") .version("1.0.0") version("androidx.room", "2.5.0-alpha03") - alias("androidx.roomruntime") - .to("androidx.room", "room-runtime") + library("androidx.roomruntime", "androidx.room", "room-runtime") .versionRef("androidx.room") - alias("androidx.roomcompiler") - .to("androidx.room", "room-compiler") + library("androidx.roomcompiler", "androidx.room", "room-compiler") .versionRef("androidx.room") - alias("androidx.room") - .to("androidx.room", "room-ktx") + library("androidx.room", "androidx.room", "room-ktx") .versionRef("androidx.room") version("androidx.appsearch", "1.1.0-alpha02") - alias("androidx.appsearch") - .to("androidx.appsearch", "appsearch") + library("androidx.appsearch", "androidx.appsearch", "appsearch") .versionRef("androidx.appsearch") - alias("androidx.appsearchcompiler") - .to("androidx.appsearch", "appsearch-compiler") + library("androidx.appsearchcompiler", "androidx.appsearch", "appsearch-compiler") .versionRef("androidx.appsearch") - alias("androidx.appsearchstorage") - .to("androidx.appsearch", "appsearch-platform-storage") + library("androidx.appsearchstorage", "androidx.appsearch", "appsearch-platform-storage") .versionRef("androidx.appsearch") bundle( "androidx.appsearch", listOf( @@ -243,23 +195,18 @@ dependencyResolutionManagement { ) ) - alias("androidx.navigation.compose") - .to("androidx.navigation", "navigation-compose") + library("androidx.navigation.compose", "androidx.navigation", "navigation-compose") .version("2.6.0-alpha01") - alias("materialcomponents.core") - .to("com.google.android.material", "material") + library("materialcomponents.core", "com.google.android.material", "material") .version("1.8.0-alpha01") - alias("okhttp") - .to("com.squareup.okhttp3", "okhttp") + library("okhttp", "com.squareup.okhttp3", "okhttp") .version("4.10.0") - alias("retrofit.core") - .to("com.squareup.retrofit2", "retrofit") + library("retrofit.core", "com.squareup.retrofit2", "retrofit") .version("2.9.0") - alias("retrofit.gson") - .to("com.squareup.retrofit2", "converter-gson") + library("retrofit.gson", "com.squareup.retrofit2", "converter-gson") .version("2.9.0") bundle( "retrofit", @@ -270,91 +217,68 @@ dependencyResolutionManagement { ) version("coil", "2.2.1") - alias("coil.core") - .to("io.coil-kt", "coil") + library("coil.core", "io.coil-kt", "coil") .versionRef("coil") - alias("coil.svg") - .to("io.coil-kt", "coil-svg") + library("coil.svg", "io.coil-kt", "coil-svg") .versionRef("coil") - alias("coil.compose") - .to("io.coil-kt", "coil-compose") + library("coil.compose", "io.coil-kt", "coil-compose") .versionRef("coil") - alias("composecolorpicker") - .to("com.godaddy.android.colorpicker", "compose-color-picker") + library("composecolorpicker", "com.godaddy.android.colorpicker", "compose-color-picker") .version("0.5.0") - alias("leakcanary") - .to("com.squareup.leakcanary", "leakcanary-android") + library("leakcanary", "com.squareup.leakcanary", "leakcanary-android") .version("2.9.1") - alias("suncalc") - .to("org.shredzone.commons", "commons-suncalc") + library("suncalc", "org.shredzone.commons", "commons-suncalc") .version("3.5") - alias("jsoup") - .to("org.jsoup", "jsoup") + library("jsoup", "org.jsoup", "jsoup") .version("1.15.3") - alias("commons.text") - .to("org.apache.commons", "commons-text") + library("commons.text", "org.apache.commons", "commons-text") .version("1.9") // 4.4.2 is the last GPL compatible version, don't update to 5.x - alias("mathparser") - .to("org.mariuszgromada.math", "MathParser.org-mXparser") + library("mathparser", "org.mariuszgromada.math", "MathParser.org-mXparser") .version("4.4.2") - alias("google.auth") - .to("com.google.auth", "google-auth-library-oauth2-http") + library("google.auth", "com.google.auth", "google-auth-library-oauth2-http") .version("1.11.0") - alias("google.apiclient") - .to("com.google.api-client", "google-api-client-android") + library("google.apiclient", "com.google.api-client", "google-api-client-android") .version("2.0.0") - alias("google.drive") - .to("com.google.apis", "google-api-services-drive") + library("google.drive", "com.google.apis", "google-api-services-drive") .version("v3-rev197-1.25.0") - alias("google.oauth2") - .to("com.google.apis", "google-api-services-oauth2") + library("google.oauth2", "com.google.apis", "google-api-services-oauth2") .version("v2-rev157-1.25.0") - alias("gson") - .to("com.google.code.gson", "gson") + library("gson", "com.google.code.gson", "gson") .version("2.9.1") - alias("guava") - .to("com.google.guava", "guava") + library("guava", "com.google.guava", "guava") .version("31.1-android") - alias("microsoft.graph") - .to("com.microsoft.graph", "microsoft-graph") + library("microsoft.graph", "com.microsoft.graph", "microsoft-graph") .version("5.34.0") - alias("microsoft.identity") - .to("com.microsoft.identity.client", "msal") + library("microsoft.identity", "com.microsoft.identity.client", "msal") .version("4.0.1") version("protobuf", "3.14.0") - alias("protobuf.protoc") - .to("com.google.protobuf", "protoc") + library("protobuf.protoc", "com.google.protobuf", "protoc") .versionRef("protobuf") - alias("protobuf.javalite") - .to("com.google.protobuf", "protobuf-javalite") + library("protobuf.javalite", "com.google.protobuf", "protobuf-javalite") .versionRef("protobuf") version("koin", "3.2.0") - alias("koin.android") - .to("io.insert-koin", "koin-android") + library("koin.android", "io.insert-koin", "koin-android") .versionRef("koin") - alias("koin.androidxcompose") - .to("io.insert-koin", "koin-androidx-compose") + library("koin.androidxcompose", "io.insert-koin", "koin-androidx-compose") .versionRef("koin") - alias("tinypinyin") - .to("com.github.promeg", "tinypinyin") + library("tinypinyin", "com.github.promeg", "tinypinyin") .version("2.0.2") - alias("lottie") - .to("com.airbnb.android", "lottie-compose") + library("lottie", "com.airbnb.android", "lottie-compose") .version("5.2.0") } }