diff --git a/anvilcodegen/build.gradle.kts b/anvilcodegen/build.gradle.kts index 57758f8909..62a8b9d878 100644 --- a/anvilcodegen/build.gradle.kts +++ b/anvilcodegen/build.gradle.kts @@ -23,7 +23,7 @@ dependencies { implementation(projects.anvilannotations) api(libs.anvil.compiler.api) implementation(libs.anvil.compiler.utils) - implementation("com.squareup:kotlinpoet:1.14.2") + implementation(libs.kotlinpoet) implementation(libs.dagger) compileOnly(libs.google.autoservice.annotations) kapt(libs.google.autoservice) diff --git a/features/rageshake/impl/build.gradle.kts b/features/rageshake/impl/build.gradle.kts index eced5c78b8..f119cbf6c8 100644 --- a/features/rageshake/impl/build.gradle.kts +++ b/features/rageshake/impl/build.gradle.kts @@ -44,7 +44,7 @@ dependencies { api(projects.features.rageshake.api) implementation(libs.androidx.datastore.preferences) implementation(platform(libs.network.okhttp.bom)) - implementation("com.squareup.okhttp3:okhttp") + implementation(libs.network.okhttp.okhttp) implementation(libs.coil) implementation(libs.coil.compose) ksp(libs.showkase.processor) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 906c2f3b8b..f9baaa81ef 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -90,6 +90,12 @@ androidx_webkit = "androidx.webkit:webkit:1.8.0" androidx_compose_bom = { module = "androidx.compose:compose-bom", version.ref = "compose_bom" } androidx_compose_material3 = "androidx.compose.material3:material3:1.2.0-alpha10" +androidx_compose_ui = { module = "androidx.compose.ui:ui" } +androidx_compose_ui_tooling = { module = "androidx.compose.ui:ui-tooling" } +androidx_compose_ui_tooling_preview = { module = "androidx.compose.ui:ui-tooling-preview" } +androidx_compose_ui_test_manifest = { module = "androidx.compose.ui:ui-test-manifest" } +androidx_compose_material = { module = "androidx.compose.material:material" } +androidx_compose_material_icons = { module = "androidx.compose.material:material-icons-extended" } # Coroutines coroutines_core = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version.ref = "coroutines" } @@ -105,6 +111,7 @@ squareup_seismic = "com.squareup:seismic:1.0.3" # network network_okhttp_bom = "com.squareup.okhttp3:okhttp-bom:4.12.0" network_okhttp_logging = { module = "com.squareup.okhttp3:logging-interceptor" } +network_okhttp_okhttp = { module = "com.squareup.okhttp3:okhttp" } network_okhttp = { module = "com.squareup.okhttp3:okhttp" } network_retrofit = "com.squareup.retrofit2:retrofit:2.9.0" network_retrofit_converter_serialization = "com.jakewharton.retrofit:retrofit2-kotlinx-serialization-converter:1.0.0" @@ -134,6 +141,7 @@ coil_compose = { module = "io.coil-kt:coil-compose", version.ref = "coil" } coil_gif = { module = "io.coil-kt:coil-gif", version.ref = "coil" } datetime = { module = "org.jetbrains.kotlinx:kotlinx-datetime", version.ref = "datetime" } serialization_json = { module = "org.jetbrains.kotlinx:kotlinx-serialization-json", version.ref = "serialization_json" } +kotlinx_collections_immutable = "org.jetbrains.kotlinx:kotlinx-collections-immutable:0.3.5" showkase = { module = "com.airbnb.android:showkase", version.ref = "showkase" } showkase_processor = { module = "com.airbnb.android:showkase-processor", version.ref = "showkase" } jsoup = "org.jsoup:jsoup:1.16.2" @@ -157,6 +165,8 @@ maplibre = "org.maplibre.gl:android-sdk:10.2.0" maplibre_ktx = "org.maplibre.gl:android-sdk-ktx-v7:2.0.2" maplibre_annotation = "org.maplibre.gl:android-plugin-annotation-v9:2.0.2" opusencoder = "io.element.android:opusencoder:1.1.0" +kotlinpoet = "com.squareup:kotlinpoet:1.14.2" +jna = "net.java.dev.jna:jna:5.13.0@aar" # Analytics posthog = "com.posthog.android:posthog:2.0.3" diff --git a/libraries/matrix/impl/build.gradle.kts b/libraries/matrix/impl/build.gradle.kts index 9dba63362d..026b06f765 100644 --- a/libraries/matrix/impl/build.gradle.kts +++ b/libraries/matrix/impl/build.gradle.kts @@ -44,7 +44,7 @@ dependencies { api(projects.libraries.matrix.api) implementation(libs.dagger) implementation(projects.libraries.core) - implementation("net.java.dev.jna:jna:5.13.0@aar") + implementation(libs.jna) implementation(libs.androidx.datastore.preferences) implementation(libs.serialization.json) diff --git a/libraries/pushproviders/unifiedpush/build.gradle.kts b/libraries/pushproviders/unifiedpush/build.gradle.kts index 5b90f53a08..dfc999c897 100644 --- a/libraries/pushproviders/unifiedpush/build.gradle.kts +++ b/libraries/pushproviders/unifiedpush/build.gradle.kts @@ -41,7 +41,7 @@ dependencies { implementation(projects.libraries.network) implementation(platform(libs.network.okhttp.bom)) - implementation("com.squareup.okhttp3:okhttp") + implementation(libs.network.okhttp.okhttp) implementation(libs.network.retrofit) implementation(libs.serialization.json) diff --git a/plugins/src/main/kotlin/extension/DependencyHandleScope.kt b/plugins/src/main/kotlin/extension/DependencyHandleScope.kt index c6786ef8b3..f6ec8b7cf1 100644 --- a/plugins/src/main/kotlin/extension/DependencyHandleScope.kt +++ b/plugins/src/main/kotlin/extension/DependencyHandleScope.kt @@ -42,16 +42,16 @@ fun DependencyHandlerScope.composeDependencies(libs: LibrariesForLibs) { val composeBom = platform(libs.androidx.compose.bom) implementation(composeBom) androidTestImplementation(composeBom) - implementation("androidx.compose.ui:ui") - implementation("androidx.compose.material:material") - implementation("androidx.compose.material3:material3") - implementation("androidx.compose.material:material-icons-extended") - implementation("androidx.compose.ui:ui-tooling-preview") + implementation(libs.androidx.compose.ui) + implementation(libs.androidx.compose.material) + implementation(libs.androidx.compose.material3) + implementation(libs.androidx.compose.material.icons) + implementation(libs.androidx.compose.ui.tooling.preview) implementation(libs.androidx.activity.compose) - debugImplementation("androidx.compose.ui:ui-tooling") - debugImplementation("androidx.compose.ui:ui-test-manifest") + debugImplementation(libs.androidx.compose.ui.tooling) + debugImplementation(libs.androidx.compose.ui.test.manifest) implementation(libs.showkase) - implementation("org.jetbrains.kotlinx:kotlinx-collections-immutable:0.3.5") + implementation(libs.kotlinx.collections.immutable) } private fun DependencyHandlerScope.addImplementationProjects( diff --git a/tests/konsist/build.gradle.kts b/tests/konsist/build.gradle.kts index 6658c0c5e0..1ce4e9f232 100644 --- a/tests/konsist/build.gradle.kts +++ b/tests/konsist/build.gradle.kts @@ -25,7 +25,7 @@ android { dependencies { val composeBom = platform(libs.androidx.compose.bom) testImplementation(composeBom) - testImplementation("androidx.compose.ui:ui-tooling-preview") + testImplementation(libs.androidx.compose.ui.tooling.preview) testImplementation(libs.test.junit) testImplementation(libs.test.konsist) testImplementation(libs.test.truth)