From f17922ad3b139eb1e2d75df5804c74497dd29c49 Mon Sep 17 00:00:00 2001 From: Rowdy Mitchell Chotkan Date: Tue, 27 Feb 2024 21:07:48 +0100 Subject: [PATCH] Unify dependency versions --- app/build.gradle | 36 +++++++++++------------ build.gradle | 11 ++++++- common-ethereum/build.gradle | 4 +-- common/build.gradle | 26 ++++++++--------- currencyii/build.gradle | 34 +++++++++++----------- debug/build.gradle | 16 +++++----- eurotoken/build.gradle | 30 +++++++++---------- freedomOfComputing/build.gradle | 18 ++++++------ musicdao-datafeeder/build.gradle | 2 +- musicdao/build.gradle | 50 +++++++++++++++----------------- peerai/build.gradle | 10 +++---- valuetransfer/build.gradle | 38 ++++++++++++------------ 12 files changed, 140 insertions(+), 135 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 520b4746d..d7edfe725 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -16,7 +16,7 @@ buildscript { dependencies { classpath 'com.google.firebase:firebase-crashlytics-gradle:2.9.2' - classpath("com.google.dagger:hilt-android-gradle-plugin:$hilt_ver") + classpath("com.google.dagger:hilt-android-gradle-plugin:$dagger_version") } } @@ -122,10 +122,10 @@ dependencies { // AndroidX implementation "androidx.datastore:datastore-preferences:1.0.0" - implementation 'androidx.appcompat:appcompat:1.5.1' - implementation 'androidx.core:core-ktx:1.9.0' - implementation 'androidx.constraintlayout:constraintlayout:2.1.4' - implementation "androidx.recyclerview:recyclerview:1.2.1" + implementation "androidx.appcompat:appcompat:$appcompat_version" + implementation "androidx.core:core-ktx:$core_version" + implementation "androidx.constraintlayout:constraintlayout:$constraintlayout_version" + implementation "androidx.recyclerview:recyclerview:$recyclerview_version" implementation "androidx.navigation:navigation-fragment-ktx:$nav_version" implementation "androidx.lifecycle:lifecycle-common-java8:$lifecycle_version" @@ -134,7 +134,7 @@ dependencies { implementation 'com.google.firebase:firebase-crashlytics:18.3.1' // Material - implementation 'com.google.android.material:material:1.7.0' + implementation "com.google.android.material:material:$material_version" // Kotlin implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" @@ -145,16 +145,16 @@ dependencies { // Logging implementation('net.java.dev.jna:jna:5.12.1@aar') - implementation 'com.github.MattSkala:recyclerview-itemadapter:0.4' + implementation "com.github.MattSkala:recyclerview-itemadapter:$recyclerview_adapter_version" implementation project(':currencyii') // Testing - testImplementation 'junit:junit:4.13.2' - androidTestImplementation 'androidx.test.ext:junit:1.1.5' + testImplementation "junit:junit:$junit_version" + androidTestImplementation "androidx.test.ext:junit:$android_junit_version" // Hilt - implementation("com.google.dagger:hilt-android:$hilt_ver") - kapt("com.google.dagger:hilt-android-compiler:$hilt_ver") + implementation("com.google.dagger:hilt-android:$dagger_version") + kapt("com.google.dagger:hilt-android-compiler:$dagger_version") // Room implementation "androidx.room:room-runtime:$room_version" @@ -163,18 +163,18 @@ dependencies { androidTestImplementation 'androidx.test:monitor:1.6.1' implementation 'androidx.annotation:annotation:1.5.0' implementation 'androidx.coordinatorlayout:coordinatorlayout:1.1.0' - implementation 'androidx.core:core:1.9.0' + implementation "androidx.core:core:$core_version" implementation 'androidx.datastore:datastore-core:1.0.0' implementation 'androidx.datastore:datastore-preferences-core:1.0.0' - implementation 'androidx.fragment:fragment:1.5.4' - implementation 'androidx.lifecycle:lifecycle-viewmodel-savedstate:2.6.0-alpha05' - implementation 'androidx.lifecycle:lifecycle-viewmodel:2.6.0-alpha05' + implementation "androidx.fragment:fragment:$fragment_version" + implementation "androidx.lifecycle:lifecycle-viewmodel-savedstate:$lifecycle_version" + implementation "androidx.lifecycle:lifecycle-viewmodel:$lifecycle_version" implementation 'androidx.preference:preference:1.2.0' implementation 'androidx.sqlite:sqlite:2.4.0' - implementation 'app.cash.sqldelight:android-driver:2.0.1' - implementation 'app.cash.sqldelight:runtime:2.0.1' + implementation "app.cash.sqldelight:android-driver:$sqldelight_version" + implementation "app.cash.sqldelight:runtime:$sqldelight_version" implementation 'com.google.dagger:dagger:2.50' - implementation 'com.google.dagger:hilt-core:2.50' + implementation "com.google.dagger:hilt-core:$dagger_version" implementation 'com.google.errorprone:error_prone_annotations:2.9.0' implementation 'com.google.guava:guava:31.0.1-android' implementation 'javax.inject:javax.inject:1' diff --git a/build.gradle b/build.gradle index 378d74979..615508cf0 100644 --- a/build.gradle +++ b/build.gradle @@ -11,9 +11,18 @@ buildscript { ext.lifecycle_version = "2.5.1" ext.jlibtorrent_version = '1.2.17.0' ext.dokka_version = "0.10.1" - ext.hilt_ver = '2.50' + ext.dagger_version = '2.50' ext.room_version = '2.6.1' ext.mockk_version = '1.13.9' + ext.material_version = '1.7.0' + ext.core_version = '1.9.0' + ext.appcompat_version = '1.5.1' + ext.constraintlayout_version = '2.1.4' + ext.recyclerview_version = '1.2.1' + ext.recyclerview_adapter_version = '0.4' + ext.junit_version = '4.13.2' + ext.android_junit_version = '1.1.5' + repositories { google() jcenter() diff --git a/common-ethereum/build.gradle b/common-ethereum/build.gradle index 8e4618f36..a956b4cd9 100644 --- a/common-ethereum/build.gradle +++ b/common-ethereum/build.gradle @@ -60,7 +60,7 @@ dependencies { api project(':geth-android') - testImplementation 'junit:junit:4.13.2' + testImplementation "junit:junit:$junit_version" // Transitive dependencies. api 'io.reactivex.rxjava2:rxjava:2.2.2' @@ -71,7 +71,7 @@ dependencies { exclude group: 'org.bouncycastle' } implementation 'net.sourceforge.streamsupport:streamsupport-cfuture:1.7.0' - implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.8.0' + implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutines_version" implementation('org.web3j:tuples:4.6.0-android') { exclude group: 'org.bouncycastle' } diff --git a/common/build.gradle b/common/build.gradle index a8f3161f4..374e4b3f3 100644 --- a/common/build.gradle +++ b/common/build.gradle @@ -83,9 +83,9 @@ dependencies { implementation 'com.google.guava:guava:30.0-android' // AndroidX - api 'androidx.appcompat:appcompat:1.1.0' - api 'androidx.constraintlayout:constraintlayout:1.1.3' - implementation 'androidx.core:core-ktx:1.9.0' + api "androidx.appcompat:appcompat:$appcompat_version" + api "androidx.constraintlayout:constraintlayout:$constraintlayout_version" + implementation "androidx.core:core-ktx:$core_version" implementation "androidx.navigation:navigation-fragment-ktx:$nav_version" implementation "androidx.lifecycle:lifecycle-common-java8:$lifecycle_version" implementation 'androidx.databinding:viewbinding:8.2.2' @@ -94,7 +94,7 @@ dependencies { api 'com.journeyapps:zxing-android-embedded:4.3.0' // Material - api 'com.google.android.material:material:1.1.0' + api "com.google.android.material:material:$material_version" // Kotlin implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" @@ -113,27 +113,27 @@ dependencies { implementation files('libs/jlibtorrent-android-x86_64-' + jlibtorrent_version + '.jar') // Testing - testImplementation 'junit:junit:4.12' + testImplementation "junit:junit:$junit_version" testImplementation "org.jetbrains.kotlinx:kotlinx-coroutines-test:$coroutines_version" testImplementation "io.mockk:mockk:$mockk_version" testImplementation "app.cash.sqldelight:sqlite-driver:$sqldelight_version" testImplementation "com.goterl:lazysodium-java:5.1.4" // Transitive dependencies - api 'androidx.fragment:fragment:1.5.4' - api 'androidx.navigation:navigation-ui:2.5.3' + api "androidx.fragment:fragment:$fragment_version" + api "androidx.navigation:navigation-ui:$nav_version" api 'androidx.viewpager2:viewpager2:1.0.0' api(project(':ipv8')) { exclude module: 'lazysodium-java' } - implementation 'androidx.core:core:1.9.0' + implementation "androidx.core:core:$core_version" implementation 'androidx.customview:customview:1.1.0' - implementation 'androidx.lifecycle:lifecycle-common:2.5.1' - implementation 'androidx.lifecycle:lifecycle-livedata-core:2.5.1' - implementation 'androidx.navigation:navigation-runtime:2.5.3' + implementation "androidx.lifecycle:lifecycle-common:$lifecycle_version" + implementation "androidx.lifecycle:lifecycle-livedata-core:$lifecycle_version" + implementation "androidx.navigation:navigation-runtime:$nav_version" implementation 'androidx.sqlite:sqlite:2.4.0' - implementation 'app.cash.sqldelight:android-driver:2.0.1' - implementation 'app.cash.sqldelight:coroutines-extensions:2.0.1' + implementation "app.cash.sqldelight:android-driver:$sqldelight_version" + implementation "app.cash.sqldelight:coroutines-extensions:$sqldelight_version" implementation 'com.google.zxing:core:3.4.1' testImplementation 'io.mockk:mockk-dsl:1.13.9' } diff --git a/currencyii/build.gradle b/currencyii/build.gradle index bb3ee3364..fc6c99769 100644 --- a/currencyii/build.gradle +++ b/currencyii/build.gradle @@ -55,14 +55,14 @@ dependencies { api project(':common') // AndroidX - api 'androidx.constraintlayout:constraintlayout:1.1.3' - implementation 'androidx.appcompat:appcompat:1.1.0' - implementation 'androidx.core:core-ktx:1.9.0' - implementation "androidx.recyclerview:recyclerview:1.1.0" + api "androidx.constraintlayout:constraintlayout:$constraintlayout_version" + implementation "androidx.appcompat:appcompat:$appcompat_version" + implementation "androidx.core:core-ktx:$core_version" + implementation "androidx.recyclerview:recyclerview:$recyclerview_version" implementation "androidx.lifecycle:lifecycle-common-java8:$lifecycle_version" // Material - api 'com.google.android.material:material:1.1.0' + api "com.google.android.material:material:$material_version" // Kotlin implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" @@ -73,7 +73,7 @@ dependencies { // Testing testImplementation 'org.junit.jupiter:junit-jupiter:5.7.1' testImplementation "io.mockk:mockk:$mockk_version" - androidTestImplementation 'androidx.test.ext:junit:1.1.5' + androidTestImplementation "androidx.test.ext:junit:$android_junit_version" // BitcoinJ api 'org.bitcoinj:bitcoinj-core:0.15.10' @@ -83,24 +83,24 @@ dependencies { // Transitive dependencies androidTestImplementation 'androidx.test:monitor:1.6.1' - androidTestImplementation 'junit:junit:4.13.2' - api 'androidx.fragment:fragment:1.5.4' - api 'androidx.lifecycle:lifecycle-viewmodel-savedstate:2.5.1' - api 'androidx.navigation:navigation-common:2.5.3' + androidTestImplementation "junit:junit:$junit_version" + api "androidx.fragment:fragment:$fragment_version" + api "androidx.lifecycle:lifecycle-viewmodel-savedstate:$lifecycle_version" + api "androidx.navigation:navigation-common:$nav_version" api 'androidx.swiperefreshlayout:swiperefreshlayout:1.0.0' api 'com.google.code.findbugs:jsr305:3.0.2' api 'org.bouncycastle:bcprov-jdk15to18:1.68' api(project(':ipv8')) { exclude module: 'lazysodium-java' } - implementation 'androidx.core:core:1.9.0' + implementation "androidx.core:core:$core_version" implementation 'androidx.customview:customview:1.1.0' - implementation 'androidx.lifecycle:lifecycle-common:2.5.1' - implementation 'androidx.lifecycle:lifecycle-livedata-core:2.5.1' - implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.5.1' - implementation 'androidx.navigation:navigation-fragment:2.5.3' - implementation 'androidx.navigation:navigation-runtime:2.5.3' - implementation 'androidx.navigation:navigation-ui:2.5.3' + implementation "androidx.lifecycle:lifecycle-common:$lifecycle_version" + implementation "androidx.lifecycle:lifecycle-livedata-core:$lifecycle_version" + implementation "androidx.lifecycle:lifecycle-runtime-ktx:$lifecycle_version" + implementation "androidx.navigation:navigation-fragment:$nav_version" + implementation "androidx.navigation:navigation-runtime:$nav_version" + implementation "androidx.navigation:navigation-ui:$nav_version" implementation 'androidx.viewpager2:viewpager2:1.0.0' implementation 'com.google.guava:guava:30.0-android' testImplementation 'org.junit.jupiter:junit-jupiter-api:5.8.2' diff --git a/debug/build.gradle b/debug/build.gradle index 0bf076f65..3dd90f444 100644 --- a/debug/build.gradle +++ b/debug/build.gradle @@ -46,7 +46,7 @@ dependencies { api project(':common') // AndroidX - implementation 'androidx.core:core-ktx:1.9.0' + implementation "androidx.core:core-ktx:$core_version" implementation "androidx.lifecycle:lifecycle-common-java8:$lifecycle_version" // Kotlin @@ -56,15 +56,15 @@ dependencies { implementation "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version" // Testing - testImplementation 'junit:junit:4.12' + testImplementation "junit:junit:$junit_version" // Transitive dependencies - implementation 'androidx.core:core:1.9.0' - implementation 'androidx.fragment:fragment:1.5.4' - implementation 'androidx.lifecycle:lifecycle-common:2.5.1' - implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.5.1' - implementation 'androidx.navigation:navigation-fragment:2.5.3' - implementation 'androidx.navigation:navigation-runtime:2.5.3' + implementation "androidx.core:core:$core_version" + implementation "androidx.fragment:fragment:$fragment_version" + implementation "androidx.lifecycle:lifecycle-common:$lifecycle_version" + implementation "androidx.lifecycle:lifecycle-runtime-ktx:$lifecycle_version" + implementation "androidx.navigation:navigation-fragment:$nav_version" + implementation "androidx.navigation:navigation-runtime:$nav_version" implementation(project(':ipv8')) { exclude module: 'lazysodium-java' } diff --git a/eurotoken/build.gradle b/eurotoken/build.gradle index 539e80bee..cedd90a76 100644 --- a/eurotoken/build.gradle +++ b/eurotoken/build.gradle @@ -54,16 +54,16 @@ dependencies { api project(':common') // AndroidX - api 'androidx.constraintlayout:constraintlayout:2.0.1' - api 'androidx.recyclerview:recyclerview:1.1.0' - api 'com.github.MattSkala:recyclerview-itemadapter:0.4' - implementation 'androidx.appcompat:appcompat:1.2.0' + api "androidx.constraintlayout:constraintlayout:$constraintlayout_version" + api "androidx.recyclerview:recyclerview:$recyclerview_version" + api "com.github.MattSkala:recyclerview-itemadapter:$recyclerview_adapter_version" + implementation "androidx.appcompat:appcompat:$appcompat_version" implementation "androidx.room:room-runtime:$room_version" implementation "androidx.lifecycle:lifecycle-common-java8:$lifecycle_version" implementation "androidx.lifecycle:lifecycle-livedata-ktx:$lifecycle_version" // Material - api 'com.google.android.material:material:1.1.0' + api "com.google.android.material:material:$material_version" // Kotlin api "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" @@ -75,22 +75,22 @@ dependencies { api 'io.github.microutils:kotlin-logging:1.7.7' // Testing - testImplementation 'junit:junit:4.12' - androidTestImplementation 'androidx.test.ext:junit:1.1.5' + testImplementation "junit:junit:$junit_version" + androidTestImplementation "androidx.test.ext:junit:$android_junit_version" // Transitive dependencies androidTestImplementation 'androidx.test:monitor:1.6.1' api(project(':ipv8')) { exclude module: 'lazysodium-java' } - implementation 'androidx.core:core:1.9.0' - implementation 'androidx.fragment:fragment:1.5.4' - implementation 'androidx.lifecycle:lifecycle-common:2.5.1' - implementation 'androidx.lifecycle:lifecycle-livedata-core:2.5.1' - implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.5.1' - implementation 'androidx.navigation:navigation-fragment:2.5.3' - implementation 'androidx.navigation:navigation-runtime:2.5.3' + implementation "androidx.core:core:$core_version" + implementation "androidx.fragment:fragment:$fragment_version" + implementation "androidx.lifecycle:lifecycle-common:$lifecycle_version" + implementation "androidx.lifecycle:lifecycle-livedata-core:$lifecycle_version" + implementation "androidx.lifecycle:lifecycle-runtime-ktx:$lifecycle_version" + implementation "androidx.navigation:navigation-fragment:$nav_version" + implementation "androidx.navigation:navigation-runtime:$nav_version" implementation 'androidx.sqlite:sqlite:2.4.0' - implementation 'app.cash.sqldelight:android-driver:2.0.1' + implementation "app.cash.sqldelight:android-driver:$sqldelight_version" } diff --git a/freedomOfComputing/build.gradle b/freedomOfComputing/build.gradle index cf25ac33b..a43db8f1b 100644 --- a/freedomOfComputing/build.gradle +++ b/freedomOfComputing/build.gradle @@ -56,16 +56,16 @@ dependencies { implementation files('../common/libs/jlibtorrent-android-x86-' + jlibtorrent_version + '.jar') implementation files('../common/libs/jlibtorrent-android-x86_64-' + jlibtorrent_version + '.jar') - api 'androidx.appcompat:appcompat:1.1.0' - api 'androidx.constraintlayout:constraintlayout:1.1.3' - implementation 'androidx.core:core-ktx:1.9.0' + api "androidx.appcompat:appcompat:$appcompat_version" + api "androidx.constraintlayout:constraintlayout:$constraintlayout_version" + implementation "androidx.core:core-ktx:$core_version" - api 'com.google.android.material:material:1.1.0' + api "com.google.android.material:material:$material_version" implementation 'io.github.microutils:kotlin-logging:1.7.7' - testImplementation 'junit:junit:4.12' + testImplementation "junit:junit:$junit_version" testImplementation "io.mockk:mockk:$mockk_version" testImplementation group: 'org.awaitility', name: 'awaitility', version: '3.0.0' - androidTestImplementation 'androidx.test.ext:junit:1.1.5' + androidTestImplementation "androidx.test.ext:junit:$android_junit_version" // Kotlin implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" @@ -75,13 +75,13 @@ dependencies { // Transitive dependencies androidTestImplementation 'androidx.test:monitor:1.6.1' - androidTestImplementation 'junit:junit:4.13.2' + androidTestImplementation "junit:junit:$junit_version" api 'androidx.coordinatorlayout:coordinatorlayout:1.1.0' api(project(':ipv8')) { exclude module: 'lazysodium-java' } - implementation 'androidx.core:core:1.9.0' - implementation 'androidx.fragment:fragment:1.5.4' + implementation "androidx.core:core:$core_version" + implementation "androidx.fragment:fragment:$fragment_version" implementation 'androidx.transition:transition:1.4.1' implementation project(':ipv8-android') testImplementation 'io.mockk:mockk-dsl:1.13.9' diff --git a/musicdao-datafeeder/build.gradle b/musicdao-datafeeder/build.gradle index 68b80bdd7..23bd02822 100644 --- a/musicdao-datafeeder/build.gradle +++ b/musicdao-datafeeder/build.gradle @@ -22,7 +22,7 @@ dependencies { implementation files('../common/libs/jlibtorrent-' + jlibtorrent_version + '.jar') // Transitive dependencies - implementation 'app.cash.sqldelight:runtime:2.0.1' + implementation "app.cash.sqldelight:runtime:$sqldelight_version" implementation(project(':ipv8')) { exclude module: 'lazysodium-java' } diff --git a/musicdao/build.gradle b/musicdao/build.gradle index 9f33d4f50..77ec503de 100644 --- a/musicdao/build.gradle +++ b/musicdao/build.gradle @@ -12,14 +12,10 @@ buildscript { } dependencies { - classpath("com.google.dagger:hilt-android-gradle-plugin:$hilt_ver") + classpath("com.google.dagger:hilt-android-gradle-plugin:$dagger_version") } } -configurations.all { - resolutionStrategy { force 'androidx.core:core-ktx:1.7.0-alpha01' } -} - android { useLibrary 'android.test.base' useLibrary 'android.test.mock' @@ -87,8 +83,8 @@ dependencies { implementation files('../common/libs/jlibtorrent-android-x86_64-' + jlibtorrent_version + '.jar') implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" - api 'androidx.appcompat:appcompat:1.2.0' - implementation 'com.google.android.material:material:1.3.0' + api "androidx.appcompat:appcompat:$appcompat_version" + implementation "com.google.android.material:material:$material_version" // BitTorrent/Libtorrent libraries implementation 'com.turn:ttorrent-core:1.5' @@ -115,7 +111,7 @@ dependencies { // Tooling support (Previews, etc.) implementation 'androidx.compose.ui:ui-tooling:1.0.1' // Integration with ViewModels - implementation 'androidx.lifecycle:lifecycle-viewmodel-compose:1.0.0-alpha07' + implementation "androidx.lifecycle:lifecycle-viewmodel-compose:$lifecycle_version" // Runtime implementation "androidx.compose.runtime:runtime-livedata:1.0.1" @@ -130,9 +126,9 @@ dependencies { kapt("androidx.room:room-compiler:$room_version") // Hilt - api "com.google.dagger:hilt-android:$hilt_ver" + api "com.google.dagger:hilt-android:$dagger_version" implementation "androidx.hilt:hilt-navigation-compose:1.0.0-alpha03" - kapt("com.google.dagger:hilt-android-compiler:$hilt_ver") + kapt("com.google.dagger:hilt-android-compiler:$dagger_version") // GSON api "com.google.code.gson:gson:2.8.9" @@ -145,16 +141,16 @@ dependencies { api 'androidx.compose.runtime:runtime:1.4.0-alpha05' api 'androidx.compose.ui:ui-graphics:1.4.0-alpha05' api 'androidx.compose.ui:ui:1.4.0-alpha05' - api 'androidx.lifecycle:lifecycle-livedata-core:2.6.0-alpha05' - api 'androidx.lifecycle:lifecycle-viewmodel:2.6.0-alpha05' - api 'androidx.navigation:navigation-common:2.5.3' - api 'androidx.navigation:navigation-runtime:2.5.3' + api "androidx.lifecycle:lifecycle-livedata-core:$lifecycle_version" + api "androidx.lifecycle:lifecycle-viewmodel:$lifecycle_version" + api "androidx.navigation:navigation-common:$nav_version" + api "androidx.navigation:navigation-runtime:$nav_version" api 'com.google.code.findbugs:jsr305:3.0.2' api 'com.google.dagger:dagger:2.50' - api 'com.google.dagger:hilt-core:2.50' + api "com.google.dagger:hilt-core:$dagger_version" api 'javax.inject:javax.inject:1' api 'org.bouncycastle:bcprov-jdk15to18:1.68' - api 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.8.0' + api "org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutines_version" api(project(':ipv8')) { exclude module: 'lazysodium-java' } @@ -165,18 +161,18 @@ dependencies { implementation 'androidx.compose.runtime:runtime-saveable:1.4.0-alpha05' implementation 'androidx.compose.ui:ui-text:1.4.0-alpha05' implementation 'androidx.compose.ui:ui-unit:1.4.0-alpha05' - implementation 'androidx.core:core:1.9.0' - implementation 'androidx.fragment:fragment:1.5.4' - implementation 'androidx.lifecycle:lifecycle-common:2.6.0-alpha05' - implementation 'androidx.lifecycle:lifecycle-livedata-core-ktx:2.6.0-alpha05' - implementation 'androidx.lifecycle:lifecycle-livedata:2.6.0-alpha05' - implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.6.0-alpha05' - implementation 'androidx.lifecycle:lifecycle-runtime:2.6.0-alpha05' - implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.6.0-alpha05' - implementation 'androidx.lifecycle:lifecycle-viewmodel-savedstate:2.6.0-alpha05' - implementation 'androidx.navigation:navigation-compose:2.5.3' + implementation "androidx.core:core:$core_version" + implementation "androidx.fragment:fragment:$fragment_version" + implementation "androidx.lifecycle:lifecycle-common:$lifecycle_version" + implementation "androidx.lifecycle:lifecycle-livedata-core-ktx:$lifecycle_version" + implementation "androidx.lifecycle:lifecycle-livedata:$lifecycle_version" + implementation "androidx.lifecycle:lifecycle-runtime-ktx:$lifecycle_version" + implementation "androidx.lifecycle:lifecycle-runtime:$lifecycle_version" + implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:$lifecycle_version" + implementation "androidx.lifecycle:lifecycle-viewmodel-savedstate:$lifecycle_version" + implementation "androidx.navigation:navigation-compose:$nav_version" implementation 'androidx.preference:preference:1.1.1' - implementation 'androidx.room:room-common:2.6.1' + implementation "androidx.room:room-common:$room_version" implementation 'androidx.sqlite:sqlite:2.4.0' implementation 'com.google.android.exoplayer:exoplayer-common:2.17.1' implementation 'com.google.android.exoplayer:exoplayer-datasource:2.17.1' diff --git a/peerai/build.gradle b/peerai/build.gradle index 9b6171b18..f07a8a2f3 100644 --- a/peerai/build.gradle +++ b/peerai/build.gradle @@ -42,16 +42,16 @@ android { dependencies { api project(':common') - api 'androidx.constraintlayout:constraintlayout:2.1.4' + api "androidx.constraintlayout:constraintlayout:$constraintlayout_version" implementation 'com.google.code.gson:gson:2.8.8' - implementation 'com.google.android.material:material:1.5.0' + implementation "com.google.android.material:material:$material_version" implementation 'com.squareup.picasso:picasso:2.8' - testImplementation 'junit:junit:4.13.2' - androidTestImplementation 'androidx.test.ext:junit:1.1.5' + testImplementation "junit:junit:$junit_version" + androidTestImplementation "androidx.test.ext:junit:$android_junit_version" // Transitive dependencies androidTestImplementation 'androidx.test:monitor:1.6.1' - androidTestImplementation 'junit:junit:4.13.2' + androidTestImplementation "junit:junit:$junit_version" } tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).all { diff --git a/valuetransfer/build.gradle b/valuetransfer/build.gradle index ec946fb39..e773607c4 100644 --- a/valuetransfer/build.gradle +++ b/valuetransfer/build.gradle @@ -69,17 +69,17 @@ dependencies { api project(':eurotoken') // AndroidX - api 'androidx.appcompat:appcompat:1.1.0' - api 'androidx.constraintlayout:constraintlayout:1.1.3' - api "androidx.recyclerview:recyclerview:1.1.0" - implementation 'androidx.core:core-ktx:1.9.0' + api "androidx.appcompat:appcompat:$appcompat_version" + api "androidx.constraintlayout:constraintlayout:$constraintlayout_version" + api "androidx.recyclerview:recyclerview:$recyclerview_version" + implementation "androidx.core:core-ktx:$core_version" implementation "androidx.lifecycle:lifecycle-runtime:$lifecycle_version" implementation "androidx.lifecycle:lifecycle-common-java8:$lifecycle_version" implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:$lifecycle_version" implementation "androidx.lifecycle:lifecycle-livedata-ktx:$lifecycle_version" // Material - api 'com.google.android.material:material:1.2.0' + api "com.google.android.material:material:$material_version" // Kotlin implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" @@ -90,7 +90,7 @@ dependencies { // Logging implementation 'io.github.microutils:kotlin-logging:1.7.7' - api 'com.github.MattSkala:recyclerview-itemadapter:0.4' + api "com.github.MattSkala:recyclerview-itemadapter:$recyclerview_adapter_version" implementation 'com.github.bumptech.glide:glide:4.11.0' implementation "androidx.room:room-runtime:$room_version" implementation 'com.google.android.gms:play-services-maps:18.2.0' @@ -98,8 +98,8 @@ dependencies { annotationProcessor 'com.github.bumptech.glide:compiler:4.11.0' // Testing - testImplementation 'junit:junit:4.12' - androidTestImplementation 'androidx.test.ext:junit:1.1.5' + testImplementation "junit:junit:$junit_version" + androidTestImplementation "androidx.test.ext:junit:$android_junit_version" // Blocking dialog and top snacbkbar api 'com.jaredrummler:blocking-dialog:1.0.0' @@ -127,24 +127,24 @@ dependencies { // Transitive dependencies androidTestImplementation 'androidx.test:monitor:1.6.1' api 'androidx.cardview:cardview:1.0.0' - api 'androidx.core:core:1.9.0' - api 'androidx.fragment:fragment:1.5.4' - api 'androidx.lifecycle:lifecycle-livedata-core:2.5.1' + api "androidx.core:core:$core_version" + api "androidx.fragment:fragment:$fragment_version" + api "androidx.lifecycle:lifecycle-livedata-core:$lifecycle_version" api 'androidx.viewpager:viewpager:1.0.0' api 'com.google.mlkit:common:16.0.0' api(project(':ipv8')) { exclude module: 'lazysodium-java' } implementation 'androidx.documentfile:documentfile:1.0.0' - implementation 'androidx.lifecycle:lifecycle-common:2.5.1' - implementation 'androidx.lifecycle:lifecycle-livedata-core-ktx:2.5.1' - implementation 'androidx.lifecycle:lifecycle-process:2.2.0' - implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.5.1' - implementation 'androidx.lifecycle:lifecycle-viewmodel-savedstate:2.5.1' - implementation 'androidx.lifecycle:lifecycle-viewmodel:2.5.1' + implementation "androidx.lifecycle:lifecycle-common:$lifecycle_version" + implementation "androidx.lifecycle:lifecycle-livedata-core-ktx:$lifecycle_version" + implementation "androidx.lifecycle:lifecycle-process:$lifecycle_version" + implementation "androidx.lifecycle:lifecycle-runtime-ktx:$lifecycle_version" + implementation "androidx.lifecycle:lifecycle-viewmodel-savedstate:$lifecycle_version" + implementation "androidx.lifecycle:lifecycle-viewmodel:$lifecycle_version" implementation 'androidx.sqlite:sqlite:2.4.0' - implementation 'app.cash.sqldelight:android-driver:2.0.1' - implementation 'app.cash.sqldelight:coroutines-extensions:2.0.1' + implementation "app.cash.sqldelight:android-driver:$sqldelight_version" + implementation "app.cash.sqldelight:coroutines-extensions:$sqldelight_version" implementation 'com.google.mlkit:vision-common:16.0.0' implementation 'net.sf.scuba:scuba-smartcards:0.0.18' implementation project(':ipv8-android')