From 1d55242f8ac511fe4b2a52773b152738dc1564bf Mon Sep 17 00:00:00 2001 From: Sergey Pankratov Date: Thu, 15 Feb 2024 16:25:53 +0500 Subject: [PATCH] move to toml --- app/build.gradle | 62 ++--- build.gradle | 212 +----------------- common/build.gradle | 72 +++--- .../co/soramitsu/common/domain/AppVersion.kt | 2 +- core-api/build.gradle | 4 +- core-db/build.gradle | 30 +-- feature-account-api/build.gradle | 18 +- feature-account-impl/build.gradle | 68 +++--- feature-crowdloan-api/build.gradle | 6 +- feature-crowdloan-impl/build.gradle | 58 +++-- feature-onboarding-impl/build.gradle | 42 ++-- feature-polkaswap-impl/build.gradle.kts | 6 - feature-soracard-impl/build.gradle.kts | 6 - feature-splash/build.gradle | 37 ++- feature-staking-api/build.gradle | 4 +- feature-staking-impl/build.gradle | 64 +++--- feature-success-impl/build.gradle.kts | 6 - feature-wallet-api/build.gradle | 17 +- feature-wallet-impl/build.gradle | 88 ++++---- feature-walletconnect-impl/build.gradle.kts | 6 +- gradle/libs.versions.toml | 117 +++++++++- runtime-permission/build.gradle | 2 +- runtime/build.gradle | 27 ++- test-shared/build.gradle | 24 +- 24 files changed, 409 insertions(+), 569 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index a34ede0ab0..096fae4362 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -176,58 +176,58 @@ dependencies { implementation project(':feature-walletconnect-api') implementation project(':feature-walletconnect-impl') - implementation kotlinDep + implementation libs.kotlin.stdlib.jdk7 - implementation androidDep - implementation constraintDep + implementation libs.appcompat + implementation libs.constraintlayout - implementation zXingEmbeddedDep + implementation libs.zxing.embedded - implementation navigationFragmentDep - implementation navigationUiDep + implementation libs.navigation.fragment.ktx + implementation libs.navigation.ui.ktx - implementation roomDep + implementation libs.room.runtime - implementation daggerDep - kapt daggerKapt + implementation libs.hilt.android + kapt libs.hilt.compiler - implementation lifecycleProcessDep - kapt lifecycleKapt + implementation libs.lifecycle.process + kapt libs.lifecycle.compiler - implementation lifeCycleKtxDep + implementation libs.lifecycle.runtime.ktx - implementation gsonConvertedDep + implementation libs.converter.gson - implementation gifDep +// implementation "pl.droidsonroids.gif:android-gif-drawable:1.2.25" - compileOnly wsDep + compileOnly libs.nv.websocket.client - implementation coroutinesDep + implementation libs.coroutines.core testImplementation project(':test-shared') - implementation insetterDep + implementation libs.insetter.widgets - implementation liveDataKtxDep + implementation libs.lifecycle.livedata.ktx - implementation jnaDep - implementation beaconDep, withoutJna + implementation libs.jna + implementation libs.beacon.android.sdk, withoutJna - kaptAndroidTest daggerKapt - implementation storiesDep + kaptAndroidTest libs.hilt.compiler + implementation libs.storiesProgressView - implementation compose - debugImplementation composeDebug + implementation libs.bundles.compose + debugImplementation libs.bundles.composeDebug - implementation soraUiCoreDep + implementation libs.sora.ui - implementation(platform(libs.walletconnectBomDep)) - implementation(libs.walletconnectCoreDep) - implementation(libs.walletconnectWeb3WalletDep) + implementation platform(libs.walletconnectBomDep) + implementation libs.walletconnectCoreDep + implementation libs.walletconnectWeb3WalletDep - androidTestImplementation androidTestRunnerDep - androidTestImplementation androidTestRulesDep - androidTestImplementation androidJunitDep + androidTestImplementation libs.runner + androidTestImplementation libs.rules + androidTestImplementation libs.ext.junit } task printVersion { diff --git a/build.gradle b/build.gradle index 115cae522d..e89819a5fc 100644 --- a/build.gradle +++ b/build.gradle @@ -14,205 +14,11 @@ buildscript { targetSdkVersion = 33 kotlinVersion = '1.9.22' - - materialVersion = '1.8.0' - cardViewVersion = '1.0.0' - constraintVersion = '2.1.4' - - coroutinesVersion = '1.7.3' - - biometricVersion = '1.1.0' - - progressButtonsVersion = '2.1.0' - xNetworkingVersion = '0.2.5-temp7' - - soraUiCoreVersion = '0.2.17' - - daggerVersion = '2.47' - javaxInjectVersion = '1' - - architectureComponentVersion = '2.6.1' - roomVersion = '2.6.1' - - retrofitVersion = '2.9.0' - okhttpVersion = '4.11.0' - gsonVersion = '2.10.1' - - navControllerVersion = '2.7.0' - - junitVersion = '4.13.2' - mockitoVersion = '5.2.0' - robolectricVersion = '4.9.2' - - bouncyCastleVersion = '1.73' - - gifVersion = '1.2.25' - - zXingVersion = '3.5.1' - zXingEmbeddedVersion = '4.3.0' - - biometricDep = "androidx.biometric:biometric:$biometricVersion" - - firebaseAppDistrVersion = '4.0.0' - playPublisherVersion = '3.8.1' - - wsVersion = '2.14' - - insetterVersion = "0.5.0" - - shimmerVersion = '0.5.0' - - storiesVersion = '3.0.1' - - coilVersion = '2.2.2' - - androidxCoreVersion = '1.12.0' - - composeVersion = '1.5.1' - composeFoundationVersion = '1.5.1' composeCompilerVersion = '1.5.9' - appcompatVersion = '1.6.1' - recyclerviewVersion = '1.2.0' - lifecycleVersion = '2.6.1' - - serializationVersion = '1.5.1' - - activityKtx = '1.7.0' - fragmentKtx = '1.6.2' - minifyRelease = true - beaconVersion = "3.2.4" - - sharedFeaturesVersion = "1.1.1.23-FLW" - - coilDep = "io.coil-kt:coil:$coilVersion" - coilSvg = "io.coil-kt:coil-svg:$coilVersion" - - kotlinDep = "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlinVersion" - - insetterDep = "dev.chrisbanes.insetter:insetter-widgets:$insetterVersion" - - androidDep = "androidx.appcompat:appcompat:$appcompatVersion" - cardViewDep = "androidx.cardview:cardview:$cardViewVersion" - recyclerViewDep = "androidx.recyclerview:recyclerview:$recyclerviewVersion" - constraintDep = "androidx.constraintlayout:constraintlayout:$constraintVersion" - materialDep = "com.google.android.material:material:$materialVersion" - androidxCoreDep = "androidx.core:core-ktx:$androidxCoreVersion" - activityKtxDep = "androidx.activity:activity-ktx:$activityKtx" - fragmentKtxDep = "androidx.fragment:fragment-ktx:$fragmentKtx" - - daggerDep = "com.google.dagger:hilt-android:$daggerVersion" - daggerKapt = "com.google.dagger:hilt-compiler:$daggerVersion" - - compose = [ - "androidx.compose.runtime:runtime:$composeVersion", - "androidx.compose.ui:ui:$composeVersion", - "androidx.compose.runtime:runtime-livedata:$composeVersion", - "androidx.compose.compiler:compiler:$composeCompilerVersion", - "androidx.compose.foundation:foundation:$composeFoundationVersion", - "androidx.compose.material:material:$composeVersion", - "com.google.android.material:compose-theme-adapter:1.2.1", - "androidx.compose.animation:animation:$composeVersion", - "androidx.compose.animation:animation-graphics:$composeVersion", - "androidx.compose.ui:ui-tooling-preview:$composeVersion", - "androidx.activity:activity-compose:1.7.0", - "androidx.lifecycle:lifecycle-viewmodel-compose:2.6.1", - "com.valentinilk.shimmer:compose-shimmer:1.0.4", - "androidx.constraintlayout:constraintlayout-compose:1.0.1", - "com.google.accompanist:accompanist-swiperefresh:0.28.0", - "com.google.accompanist:accompanist-webview:0.28.0", - "io.coil-kt:coil-compose:$coilVersion", - "androidx.navigation:navigation-compose:$navControllerVersion", - "androidx.hilt:hilt-navigation-compose:1.0.0" - ] - composeDebug = [ - "androidx.compose.ui:ui-tooling:$composeVersion", - //fix compose preview https://stackoverflow.com/a/71830120 - "androidx.customview:customview:1.2.0-alpha02", - "androidx.customview:customview-poolingcontainer:1.0.0" - ] - - lifecycleProcessDep = "androidx.lifecycle:lifecycle-process:$lifecycleVersion" - - lifecycleKapt = "androidx.lifecycle:lifecycle-compiler:$architectureComponentVersion" - - coroutinesDep = "org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutinesVersion" - coroutinesAndroidDep = "org.jetbrains.kotlinx:kotlinx-coroutines-android:$coroutinesVersion" - coroutinesRxDep = "org.jetbrains.kotlinx:kotlinx-coroutines-rx2:$coroutinesVersion" - - // viewModelScope - viewModelKtxDep = "androidx.lifecycle:lifecycle-viewmodel-ktx:$architectureComponentVersion" - - // liveData builder - liveDataKtxDep = "androidx.lifecycle:lifecycle-livedata-ktx:$architectureComponentVersion" - - // lifecycle scopes - lifeCycleKtxDep = "androidx.lifecycle:lifecycle-runtime-ktx:$architectureComponentVersion" - - roomDep = "androidx.room:room-runtime:$roomVersion" - roomKtxDep = "androidx.room:room-ktx:$roomVersion" - roomKapt = "androidx.room:room-compiler:$roomVersion" - - navigationFragmentDep = "androidx.navigation:navigation-fragment-ktx:$navControllerVersion" - navigationUiDep = "androidx.navigation:navigation-ui-ktx:$navControllerVersion" - - bouncyCastleDep = "org.bouncycastle:bcprov-jdk18on:$bouncyCastleVersion" - - retrofitDep = "com.squareup.retrofit2:retrofit:$retrofitVersion" - interceptorVersion = "com.squareup.okhttp3:logging-interceptor:$okhttpVersion" - gsonConvertedDep = "com.squareup.retrofit2:converter-gson:$retrofitVersion" - scalarsConverterDep = "com.squareup.retrofit2:converter-scalars:$retrofitVersion" - - gsonDep = "com.google.code.gson:gson:$gsonVersion" - - zXingCoreDep = "com.google.zxing:core:$zXingVersion" - zXingEmbeddedDep = "com.journeyapps:zxing-android-embedded:$zXingEmbeddedVersion" - - gifDep = "pl.droidsonroids.gif:android-gif-drawable:$gifVersion" - - wsDep = "com.neovisionaries:nv-websocket-client:$wsVersion" withoutBasic = { exclude group: 'jp.co.soramitsu.xnetworking', module: 'basic' } - xNetworkingSorawalletDep = "jp.co.soramitsu.xnetworking:sorawallet-android:$xNetworkingVersion" - xNetworkingFearlessDep = "jp.co.soramitsu.xnetworking:fearlesswallet-android:$xNetworkingVersion" - xNetworkingBasicDep = "jp.co.soramitsu.xnetworking:basic-android:$xNetworkingVersion" - soraUiCoreDep = "jp.co.soramitsu:ui-core:$soraUiCoreVersion" - - shimmerDep = "com.facebook.shimmer:shimmer:$shimmerVersion" - - storiesDep = "com.github.ildixhaferri:StoriesProgressView:$storiesVersion" - opencsvDep = "com.opencsv:opencsv:5.7.1" - - jUnitDep = "junit:junit:$junitVersion" - mockitoDep = "org.mockito:mockito-inline:$mockitoVersion" - mockitoCoreDep = "org.mockito:mockito-core:2.23.0" - mockitoKotlinDep = "org.mockito.kotlin:mockito-kotlin:4.1.0" - robolectricDep = "org.robolectric:robolectric:$robolectricVersion" - robolectricMultidexDep = "org.robolectric:shadows-multidex:$robolectricVersion" - archCoreTestDep = "androidx.arch.core:core-testing:$architectureComponentVersion" - - progressButtonDep = "com.github.razir.progressbutton:progressbutton:$progressButtonsVersion" - - androidTestRunnerDep = 'androidx.test:runner:1.5.2' - androidTestRulesDep = 'androidx.test:rules:1.5.0' - androidJunitDep = 'androidx.test.ext:junit:1.1.5' - - roomTestsDep = "androidx.room:room-testing:$roomVersion" - withoutJna = { exclude group: 'net.java.dev.jna' } - beaconDep = "com.github.airgap-it:beacon-android-sdk:$beaconVersion" - jnaDep = "net.java.dev.jna:jna:5.9.0@aar" - - sharedFeaturesCoreDep = "jp.co.soramitsu.shared_features:core:$sharedFeaturesVersion" - sharedFeaturesXcmDep = "jp.co.soramitsu.shared_features:xcm:$sharedFeaturesVersion" - sharedFeaturesBackupDep = "jp.co.soramitsu.shared_features:backup:$sharedFeaturesVersion" - - web3jDep = "org.web3j:core:4.8.8-android" - withoutJavaWS = { exclude module: 'java-websocket-lib' } - - serializationDep = "org.jetbrains.kotlinx:kotlinx-serialization-json:$serializationVersion" - - coroutinesTest = "org.jetbrains.kotlinx:kotlinx-coroutines-test:$coroutinesVersion" } repositories { @@ -223,17 +29,17 @@ buildscript { } dependencies { classpath libs.gradleplugins.android - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion" - classpath "org.jetbrains.kotlin:kotlin-serialization:$kotlinVersion" + classpath libs.gradleplugins.kotlin + classpath libs.kotlin.serialization classpath libs.google.services - classpath "com.google.firebase:firebase-appdistribution-gradle:$firebaseAppDistrVersion" - classpath "com.github.triplet.gradle:play-publisher:$playPublisherVersion" - classpath "com.google.dagger:hilt-android-gradle-plugin:$daggerVersion" - classpath 'org.jacoco:org.jacoco.core:0.8.8' - classpath "org.sonarsource.scanner.gradle:sonarqube-gradle-plugin:3.3" + classpath libs.firebase.appdistribution.gradle + classpath libs.play.publisher + classpath libs.gradleplugins.hiltAndroid + classpath libs.org.jacoco.core + classpath libs.sonarqube.gradle.plugin } - configurations.all { + configurations.configureEach { resolutionStrategy { cacheChangingModulesFor 0, 'seconds' } @@ -262,6 +68,6 @@ tasks.register('clean', Delete) { delete rootProject.buildDir } -task runTest(type: GradleBuild) { +tasks.register('runTest', GradleBuild) { tasks = ['clean', 'detektAll', 'runModuleTests', 'jacocoTestReport'] } \ No newline at end of file diff --git a/common/build.gradle b/common/build.gradle index 888ee5a4b1..c5362d9bad 100644 --- a/common/build.gradle +++ b/common/build.gradle @@ -15,7 +15,6 @@ android { testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" - buildConfigField "String", "APP_VERSION_NAME", "\"${rootProject.versionName}\"" buildConfigField "long", "VERSION_CODE", "${rootProject.versionCode}" buildConfigField "String", "VERSION_NAME", "\"${rootProject.versionName}\"" @@ -110,56 +109,55 @@ dependencies { api project(":core-api") implementation project(':runtime-permission') - implementation kotlinDep + implementation libs.kotlin.stdlib.jdk7 - implementation androidxCoreDep - implementation androidDep - implementation cardViewDep - implementation recyclerViewDep - implementation materialDep - implementation constraintDep + implementation libs.core.ktx + implementation libs.appcompat + implementation libs.cardview + implementation libs.recyclerview + implementation libs.material + implementation libs.constraintlayout - implementation bouncyCastleDep + implementation libs.bouncycastle - implementation coroutinesDep - implementation liveDataKtxDep - implementation lifeCycleKtxDep + implementation libs.coroutines.core + implementation libs.lifecycle.livedata.ktx + implementation libs.lifecycle.runtime.ktx - implementation viewModelKtxDep + implementation libs.lifecycle.viewmodel.ktx - implementation daggerDep - implementation 'androidx.navigation:navigation-fragment-ktx:2.5.3' - kapt daggerKapt + implementation libs.hilt.android + implementation libs.navigation.fragment.ktx + kapt libs.hilt.compiler - kapt lifecycleKapt - implementation lifecycleProcessDep + implementation libs.lifecycle.process + kapt libs.lifecycle.compiler -// implementation retrofitDep - implementation gsonConvertedDep - implementation scalarsConverterDep - implementation interceptorVersion + implementation libs.converter.gson + implementation libs.converter.scalars + implementation libs.logging.interceptor - implementation zXingCoreDep - implementation zXingEmbeddedDep + implementation libs.zxing.core + implementation libs.zxing.embedded - implementation progressButtonDep + implementation libs.progressbutton - implementation wsDep - implementation xNetworkingBasicDep - implementation xNetworkingFearlessDep, withoutBasic - implementation xNetworkingSorawalletDep, withoutBasic + implementation libs.nv.websocket.client + implementation libs.xnetworking.basic + implementation libs.xnetworking.fearless, withoutBasic + implementation libs.xnetworking.sorawallet, withoutBasic - implementation compose - debugImplementation composeDebug + implementation libs.bundles.compose + debugImplementation libs.bundles.composeDebug - implementation soraUiCoreDep + implementation libs.sora.ui - api coilDep - api coilSvg + api libs.coil + api libs.coil.svg - testImplementation jUnitDep - testImplementation mockitoDep + testImplementation libs.junit + testImplementation libs.mockito.inline testImplementation project(':test-shared') - api sharedFeaturesCoreDep + api libs.sharedFeaturesCoreDep } \ No newline at end of file diff --git a/common/src/main/java/jp/co/soramitsu/common/domain/AppVersion.kt b/common/src/main/java/jp/co/soramitsu/common/domain/AppVersion.kt index 3281c29894..3a25005619 100644 --- a/common/src/main/java/jp/co/soramitsu/common/domain/AppVersion.kt +++ b/common/src/main/java/jp/co/soramitsu/common/domain/AppVersion.kt @@ -16,7 +16,7 @@ data class AppVersion(val major: Int, val minor: Int, val buildNum: Int) { } fun current(): AppVersion { - return fromString(BuildConfig.APP_VERSION_NAME.split("-").first()) + return fromString(BuildConfig.VERSION_NAME.split("-").first()) } fun isSupported(versionText: String?): Boolean { diff --git a/core-api/build.gradle b/core-api/build.gradle index 11f00589cc..03af2589c2 100644 --- a/core-api/build.gradle +++ b/core-api/build.gradle @@ -26,6 +26,6 @@ android { } dependencies { - implementation coroutinesDep - implementation sharedFeaturesCoreDep + implementation libs.coroutines.core + implementation libs.sharedFeaturesCoreDep } \ No newline at end of file diff --git a/core-db/build.gradle b/core-db/build.gradle index 865f7c4b31..985c15b7be 100644 --- a/core-db/build.gradle +++ b/core-db/build.gradle @@ -20,12 +20,6 @@ android { } } - buildTypes { - release { - - } - } - compileOptions { sourceCompatibility = JavaVersion.VERSION_17 targetCompatibility = JavaVersion.VERSION_17 @@ -47,23 +41,23 @@ dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) implementation project(":common") - implementation gsonDep + implementation libs.gson - implementation kotlinDep + implementation libs.kotlin.stdlib.jdk7 - implementation coroutinesDep + implementation libs.coroutines.core - implementation daggerDep - kapt daggerKapt + implementation libs.hilt.android + kapt libs.hilt.compiler - implementation roomDep - implementation roomKtxDep - kapt roomKapt + implementation libs.room.runtime + implementation libs.room.ktx + kapt libs.room.compiler - androidTestImplementation androidTestRunnerDep - androidTestImplementation androidTestRulesDep - androidTestImplementation androidJunitDep + androidTestImplementation libs.runner + androidTestImplementation libs.rules + androidTestImplementation libs.ext.junit - androidTestImplementation roomTestsDep + androidTestImplementation libs.room.testing androidTestImplementation project(':test-shared') } \ No newline at end of file diff --git a/feature-account-api/build.gradle b/feature-account-api/build.gradle index 89ee024c77..23b4d2491b 100644 --- a/feature-account-api/build.gradle +++ b/feature-account-api/build.gradle @@ -31,20 +31,20 @@ android { } dependencies { - implementation coroutinesDep implementation project(':runtime') implementation project(":common") - implementation fragmentKtxDep - implementation liveDataKtxDep - implementation androidDep - implementation materialDep + implementation libs.coroutines.core + implementation libs.fragmentKtx + implementation libs.lifecycle.livedata.ktx + implementation libs.appcompat + implementation libs.material - implementation compose - debugImplementation composeDebug + implementation libs.bundles.compose + debugImplementation libs.bundles.composeDebug api project(':core-api') - api sharedFeaturesCoreDep - api sharedFeaturesBackupDep + api libs.sharedFeaturesCoreDep + api libs.sharedFeaturesBackupDep } \ No newline at end of file diff --git a/feature-account-impl/build.gradle b/feature-account-impl/build.gradle index a5929422c5..c5494c8da9 100644 --- a/feature-account-impl/build.gradle +++ b/feature-account-impl/build.gradle @@ -13,13 +13,6 @@ android { targetSdkVersion rootProject.targetSdkVersion testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" - buildConfigField "String", "APP_VERSION_NAME", "\"${rootProject.versionName}\"" - } - - buildTypes { - release { - - } } buildFeatures { @@ -55,49 +48,50 @@ dependencies { implementation project(':feature-soracard-api') implementation project(':feature-soracard-impl') implementation project(':feature-polkaswap-api') - implementation kotlinDep + implementation libs.kotlin.stdlib.jdk7 + + implementation libs.appcompat + implementation libs.core.ktx + implementation libs.material + implementation libs.cardview + implementation libs.constraintlayout - implementation androidDep - implementation androidxCoreDep - implementation materialDep - implementation cardViewDep - implementation constraintDep + implementation libs.biometric - implementation biometricDep + implementation libs.zxing.core + implementation libs.zxing.embedded - implementation zXingCoreDep - implementation zXingEmbeddedDep + implementation libs.bouncycastle - implementation bouncyCastleDep + implementation libs.coroutines.core + implementation libs.coroutines.android - implementation coroutinesDep - implementation coroutinesAndroidDep - implementation viewModelKtxDep - implementation liveDataKtxDep - implementation lifeCycleKtxDep + implementation libs.lifecycle.viewmodel.ktx + implementation libs.lifecycle.livedata.ktx + implementation libs.lifecycle.runtime.ktx - implementation fragmentKtxDep + implementation libs.fragmentKtx - implementation navigationFragmentDep - implementation navigationUiDep + implementation libs.navigation.fragment.ktx + implementation libs.navigation.ui.ktx - implementation daggerDep - kapt daggerKapt + implementation libs.hilt.android + kapt libs.hilt.compiler - implementation roomDep - kapt roomKapt + implementation libs.room.runtime + kapt libs.room.compiler - kapt lifecycleKapt + kapt libs.lifecycle.compiler - implementation compose - debugImplementation composeDebug + implementation libs.bundles.compose + debugImplementation libs.bundles.composeDebug - testImplementation jUnitDep - testImplementation mockitoDep + testImplementation libs.junit + testImplementation libs.mockito.inline - implementation gsonDep + implementation libs.gson - api sharedFeaturesCoreDep + api libs.sharedFeaturesCoreDep - implementation sharedFeaturesBackupDep + implementation libs.sharedFeaturesBackupDep } \ No newline at end of file diff --git a/feature-crowdloan-api/build.gradle b/feature-crowdloan-api/build.gradle index c18577ce13..db1958478c 100644 --- a/feature-crowdloan-api/build.gradle +++ b/feature-crowdloan-api/build.gradle @@ -26,13 +26,13 @@ android { } dependencies { - implementation coroutinesDep implementation project(':runtime') implementation project(":common") - implementation daggerDep + implementation libs.coroutines.core + implementation libs.hilt.android - implementation androidDep + implementation libs.appcompat api project(':core-api') api project(':core-db') diff --git a/feature-crowdloan-impl/build.gradle b/feature-crowdloan-impl/build.gradle index 6f011e827c..b906a1af53 100644 --- a/feature-crowdloan-impl/build.gradle +++ b/feature-crowdloan-impl/build.gradle @@ -15,12 +15,6 @@ android { testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" } - buildTypes { - release { - - } - } - buildFeatures { viewBinding = true } @@ -46,42 +40,42 @@ dependencies { implementation project(':feature-wallet-api') implementation project(':runtime') - implementation kotlinDep + implementation libs.kotlin.stdlib.jdk7 - implementation androidDep - implementation materialDep - implementation cardViewDep - implementation constraintDep + implementation libs.appcompat + implementation libs.material + implementation libs.cardview + implementation libs.constraintlayout - implementation coroutinesDep - implementation coroutinesAndroidDep - implementation viewModelKtxDep - implementation liveDataKtxDep - implementation lifeCycleKtxDep + implementation libs.coroutines.core + implementation libs.coroutines.android + implementation libs.lifecycle.viewmodel.ktx + implementation libs.lifecycle.livedata.ktx + implementation libs.lifecycle.runtime.ktx - implementation fragmentKtxDep + implementation libs.fragmentKtx - implementation insetterDep + implementation libs.insetter.widgets - implementation daggerDep - implementation 'androidx.legacy:legacy-support-v4:1.0.0' - kapt daggerKapt + implementation libs.hilt.android + implementation libs.legacy.support.v4 + kapt libs.hilt.compiler - implementation roomDep - kapt roomKapt + implementation libs.room.runtime + kapt libs.room.compiler - kapt lifecycleKapt + kapt libs.lifecycle.compiler - testImplementation jUnitDep - testImplementation mockitoDep + testImplementation libs.junit + testImplementation libs.mockito.inline - compileOnly wsDep + compileOnly libs.nv.websocket.client - implementation gsonDep - implementation retrofitDep + implementation libs.gson + implementation libs.retrofit - implementation shimmerDep - implementation storiesDep + implementation libs.shimmer + implementation libs.storiesProgressView - implementation coilDep + implementation libs.coil } \ No newline at end of file diff --git a/feature-onboarding-impl/build.gradle b/feature-onboarding-impl/build.gradle index 5e29b11f31..784e4d9e78 100644 --- a/feature-onboarding-impl/build.gradle +++ b/feature-onboarding-impl/build.gradle @@ -16,12 +16,6 @@ android { } - buildTypes { - release { - - } - } - buildFeatures { viewBinding = true compose true @@ -51,31 +45,31 @@ dependencies { implementation project(':feature-account-api') implementation project(':feature-wallet-api') - implementation kotlinDep + implementation libs.kotlin.stdlib.jdk7 - implementation androidxCoreDep - implementation androidDep - implementation materialDep - implementation constraintDep + implementation libs.core.ktx + implementation libs.appcompat + implementation libs.material + implementation libs.constraintlayout - implementation fragmentKtxDep + implementation libs.fragmentKtx - implementation coroutinesDep + implementation libs.coroutines.core - implementation daggerDep - kapt daggerKapt + implementation libs.hilt.android + kapt libs.hilt.compiler - kapt lifecycleKapt - implementation gsonConvertedDep + kapt libs.lifecycle.compiler + implementation libs.converter.gson - implementation compose - debugImplementation composeDebug + implementation libs.bundles.compose + debugImplementation libs.bundles.composeDebug - testImplementation jUnitDep - testImplementation mockitoDep + testImplementation libs.junit + testImplementation libs.mockito.inline - implementation zXingCoreDep - implementation zXingEmbeddedDep + implementation libs.zxing.core + implementation libs.zxing.embedded - implementation sharedFeaturesBackupDep + implementation libs.sharedFeaturesBackupDep } diff --git a/feature-polkaswap-impl/build.gradle.kts b/feature-polkaswap-impl/build.gradle.kts index 6b1be4e8e3..9814fbb69b 100644 --- a/feature-polkaswap-impl/build.gradle.kts +++ b/feature-polkaswap-impl/build.gradle.kts @@ -14,12 +14,6 @@ android { targetSdk = rootProject.ext["targetSdkVersion"] as Int } - buildTypes { - release { - - } - } - buildFeatures { compose = true } diff --git a/feature-soracard-impl/build.gradle.kts b/feature-soracard-impl/build.gradle.kts index 99d12d0a7f..c0f1572e11 100644 --- a/feature-soracard-impl/build.gradle.kts +++ b/feature-soracard-impl/build.gradle.kts @@ -17,12 +17,6 @@ android { targetSdk = rootProject.ext["targetSdkVersion"] as Int } - buildTypes { - release { - - } - } - buildFeatures { compose = true } diff --git a/feature-splash/build.gradle b/feature-splash/build.gradle index 81ff92d7e9..a1ea3845bd 100644 --- a/feature-splash/build.gradle +++ b/feature-splash/build.gradle @@ -14,12 +14,6 @@ android { } - buildTypes { - release { - - } - } - buildFeatures { viewBinding = true } @@ -39,27 +33,26 @@ android { dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) - implementation project(':common') - implementation project(':feature-account-api') + implementation projects.common + implementation projects.featureAccountApi - implementation kotlinDep + implementation libs.kotlin.stdlib.jdk7 - implementation androidDep + implementation libs.appcompat - implementation daggerDep - kapt daggerKapt + implementation libs.hilt.android + kapt libs.hilt.compiler - implementation viewModelKtxDep - kapt lifecycleKapt + implementation libs.lifecycle.viewmodel.ktx + kapt libs.lifecycle.compiler - implementation fragmentKtxDep + implementation libs.fragmentKtx - testImplementation jUnitDep - testImplementation mockitoDep - implementation gsonConvertedDep + testImplementation libs.junit + testImplementation libs.mockito.inline + implementation libs.converter.gson - implementation coroutinesDep - implementation coroutinesAndroidDep - implementation viewModelKtxDep - implementation liveDataKtxDep + implementation libs.coroutines.core + implementation libs.coroutines.android + implementation libs.lifecycle.livedata.ktx } diff --git a/feature-staking-api/build.gradle b/feature-staking-api/build.gradle index 27295d1ddb..c1d3f689a8 100644 --- a/feature-staking-api/build.gradle +++ b/feature-staking-api/build.gradle @@ -27,9 +27,9 @@ android { } dependencies { - implementation coroutinesDep + implementation libs.coroutines.core - implementation daggerDep + implementation libs.hilt.android implementation project(':runtime') implementation project(':common') diff --git a/feature-staking-impl/build.gradle b/feature-staking-impl/build.gradle index 66532569d4..eba8307983 100644 --- a/feature-staking-impl/build.gradle +++ b/feature-staking-impl/build.gradle @@ -16,12 +16,6 @@ android { testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" } - buildTypes { - release { - - } - } - buildFeatures { viewBinding = true compose = true @@ -53,46 +47,46 @@ dependencies { implementation project(':feature-wallet-api') implementation project(':runtime') - implementation kotlinDep + implementation libs.kotlin.stdlib.jdk7 - implementation androidDep - implementation materialDep - implementation cardViewDep - implementation constraintDep + implementation libs.appcompat + implementation libs.material + implementation libs.cardview + implementation libs.constraintlayout - implementation coroutinesDep - implementation coroutinesAndroidDep - implementation viewModelKtxDep - implementation liveDataKtxDep - implementation lifeCycleKtxDep + implementation libs.coroutines.core + implementation libs.coroutines.android + implementation libs.lifecycle.viewmodel.ktx + implementation libs.lifecycle.livedata.ktx + implementation libs.lifecycle.runtime.ktx - implementation fragmentKtxDep + implementation libs.fragmentKtx - implementation insetterDep + implementation libs.insetter.widgets - implementation daggerDep - implementation 'androidx.legacy:legacy-support-v4:1.0.0' - kapt daggerKapt + implementation libs.hilt.android + implementation libs.legacy.support.v4 + kapt libs.hilt.compiler - implementation roomDep - kapt roomKapt + implementation libs.room.runtime + kapt libs.room.compiler - implementation lifecycleProcessDep - kapt lifecycleKapt + implementation libs.lifecycle.process + kapt libs.lifecycle.compiler - testImplementation jUnitDep - testImplementation mockitoDep + testImplementation libs.junit + testImplementation libs.mockito.inline - compileOnly wsDep + compileOnly libs.nv.websocket.client - implementation gsonDep - implementation retrofitDep + implementation libs.gson + implementation libs.retrofit - implementation shimmerDep + implementation libs.shimmer - implementation compose - debugImplementation composeDebug + implementation libs.bundles.compose + debugImplementation libs.bundles.composeDebug - implementation gsonConvertedDep - implementation scalarsConverterDep + implementation libs.converter.gson + implementation libs.converter.scalars } \ No newline at end of file diff --git a/feature-success-impl/build.gradle.kts b/feature-success-impl/build.gradle.kts index 29c6fcf1b0..91c9df2f50 100644 --- a/feature-success-impl/build.gradle.kts +++ b/feature-success-impl/build.gradle.kts @@ -14,12 +14,6 @@ android { targetSdk = rootProject.ext["targetSdkVersion"] as Int } - buildTypes { - release { - - } - } - buildFeatures { compose = true } diff --git a/feature-wallet-api/build.gradle b/feature-wallet-api/build.gradle index aaf9f15071..cbfc62e2bb 100644 --- a/feature-wallet-api/build.gradle +++ b/feature-wallet-api/build.gradle @@ -30,23 +30,22 @@ android { } dependencies { - implementation coroutinesDep + implementation libs.coroutines.core implementation project(':runtime') implementation project(':feature-account-api') implementation project(":common") - implementation androidDep - implementation materialDep + implementation libs.appcompat + implementation libs.material - implementation daggerDep + implementation libs.hilt.android - implementation androidDep - implementation constraintDep + implementation libs.constraintlayout - implementation viewModelKtxDep + implementation libs.lifecycle.viewmodel.ktx - implementation compose - debugImplementation composeDebug + implementation libs.bundles.compose + debugImplementation libs.bundles.composeDebug api project(':core-api') api project(':core-db') diff --git a/feature-wallet-impl/build.gradle b/feature-wallet-impl/build.gradle index 8c75d04ecd..2f0dd4abbb 100644 --- a/feature-wallet-impl/build.gradle +++ b/feature-wallet-impl/build.gradle @@ -77,68 +77,68 @@ dependencies { implementation project(':runtime-permission') implementation project(':feature-walletconnect-api') - implementation(platform(libs.walletconnectBomDep)) - implementation(libs.walletconnectCoreDep) - implementation(libs.walletconnectWeb3WalletDep) + implementation platform(libs.walletconnectBomDep) + implementation libs.walletconnectCoreDep + implementation libs.walletconnectWeb3WalletDep - implementation kotlinDep + implementation libs.kotlin.stdlib.jdk7 - implementation androidDep - implementation materialDep - implementation cardViewDep - implementation constraintDep + implementation libs.appcompat + implementation libs.material + implementation libs.cardview + implementation libs.constraintlayout - implementation coroutinesDep - implementation coroutinesAndroidDep - implementation coroutinesRxDep - implementation viewModelKtxDep - implementation liveDataKtxDep - implementation lifeCycleKtxDep + implementation libs.coroutines.core + implementation libs.coroutines.android + implementation libs.kotlinx.coroutines.rx2 + implementation libs.lifecycle.viewmodel.ktx + implementation libs.lifecycle.livedata.ktx + implementation libs.lifecycle.runtime.ktx - implementation fragmentKtxDep + implementation libs.fragmentKtx - implementation daggerDep - implementation 'androidx.legacy:legacy-support-v4:1.0.0' - kapt daggerKapt + implementation libs.hilt.android + implementation libs.legacy.support.v4 + kapt libs.hilt.compiler - implementation roomDep - kapt roomKapt + implementation libs.room.runtime + kapt libs.room.compiler - kapt lifecycleKapt + kapt libs.lifecycle.compiler - implementation bouncyCastleDep + implementation libs.bouncycastle - testImplementation jUnitDep - testImplementation mockitoDep + testImplementation libs.junit + testImplementation libs.mockito.inline - implementation gsonDep - implementation retrofitDep + implementation libs.gson + implementation libs.retrofit - implementation wsDep - implementation xNetworkingBasicDep - implementation xNetworkingFearlessDep, withoutBasic - implementation xNetworkingSorawalletDep, withoutBasic + implementation libs.nv.websocket.client + implementation libs.xnetworking.basic + implementation libs.xnetworking.fearless, withoutBasic + implementation libs.xnetworking.sorawallet, withoutBasic - implementation zXingCoreDep - implementation zXingEmbeddedDep + implementation libs.zxing.core + implementation libs.zxing.embedded - implementation insetterDep + implementation libs.insetter.widgets - implementation jnaDep - implementation beaconDep, withoutJna + implementation libs.jna + implementation libs.beacon.android.sdk, withoutJna - implementation shimmerDep + implementation libs.shimmer - implementation compose - debugImplementation composeDebug + implementation libs.bundles.compose + debugImplementation libs.bundles.composeDebug - implementation opencsvDep + implementation libs.opencsv - implementation navigationFragmentDep - implementation navigationUiDep + implementation libs.navigation.fragment.ktx + implementation libs.navigation.ui.ktx - implementation sharedFeaturesXcmDep - implementation sharedFeaturesBackupDep + implementation libs.sharedFeaturesXcmDep + implementation libs.sharedFeaturesBackupDep - implementation web3jDep + implementation libs.web3jDep } \ No newline at end of file diff --git a/feature-walletconnect-impl/build.gradle.kts b/feature-walletconnect-impl/build.gradle.kts index dfcde58d21..534e1b6b4e 100644 --- a/feature-walletconnect-impl/build.gradle.kts +++ b/feature-walletconnect-impl/build.gradle.kts @@ -46,8 +46,8 @@ dependencies { implementation(libs.walletconnectCoreDep) implementation(libs.walletconnectWeb3WalletDep) - implementation(libs.zXing.core) - implementation(libs.zXing.embedded) + implementation(libs.zxing.core) + implementation(libs.zxing.embedded) implementation(projects.featureAccountApi) implementation(projects.featureAccountImpl) @@ -61,6 +61,4 @@ dependencies { implementation(projects.featureWalletImpl) testImplementation(libs.junit) -// testImplementation mockitoDep -// testImplementation project(':test-shared') } \ No newline at end of file diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 835825f43b..257f43a630 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,14 +1,51 @@ [versions] +activityCompose = "1.7.0" +appcompat = "1.6.1" +accompanistVersion = "0.28.0" +architectureComponentVersion = "2.6.1" +biometricVersion = "1.1.0" +beaconVersion = "3.2.4" +bouncyCastleVersion = "1.73" +cardViewVersion = "1.0.0" compose = "1.5.1" composeFoundation = "1.5.1" +composeShimmer = "1.0.4" +constraintVersion = "2.1.4" +constraintlayoutComposeVersion = "1.0.1" +coreKtx = "1.12.0" +customview = "1.2.0-alpha02" +customviewPoolingcontainer = "1.0.0" +firebaseAppdistributionGradle = "4.1.0" fragmentKtx = "1.6.2" composeThemeAdapter = "1.2.1" -googleServices = "4.3.15" +googleServices = "4.4.1" +hiltNavComposeVersion = "1.0.0" +insetterVersion = "0.5.0" +jna = "5.9.0" junit = "4.13.2" +junitVersion = "1.1.5" +legacySupportV4 = "1.0.0" material = "1.8.0" -coroutines = "1.6.4" +coroutines = "1.7.3" +mockitoKotlin = "4.1.0" +mockitoVersion = "5.2.0" +navControllerVersion = "2.7.0" +okhttpVersion = "4.11.0" +opencsv = "5.7.1" +orgJacocoCore = "0.8.8" +playPublisher = "3.8.1" +progressButtonsVersion = "2.1.0" +recyclerviewVersion = "1.2.0" +roomRuntime = "2.6.1" +roomVersion = "2.6.1" +rules = "1.5.0" +runner = "1.5.2" +shimmerVersion = "0.5.0" +sonarqubeGradlePlugin = "3.3" soraUiCore = "0.2.17" kotlinxSerializationjson = "1.5.1" +storiesVersion = "3.0.1" +wsVersion = "2.14" xNetworking = "0.2.5-temp7" retrofit = "2.9.0" gson = "2.10.1" @@ -20,13 +57,58 @@ sharedFeaturesVersion = "1.1.1.23-FLW" web3j = "4.8.8-android" walletconnectBom = "1.18.0" coilVersion = "2.2.2" -zXingVersion = "3.5.1" -zXingEmbeddedVersion = "4.3.0" +zxingVersion = "3.5.1" +zxingEmbeddedVersion = "4.3.0" [libraries] +appcompat = { module = "androidx.appcompat:appcompat", version.ref = "appcompat" } +bouncycastle = { module = "org.bouncycastle:bcprov-jdk18on", version.ref = "bouncyCastleVersion" } +biometric = { module = "androidx.biometric:biometric", version.ref = "biometricVersion" } +cardview = { module = "androidx.cardview:cardview", version.ref = "cardViewVersion" } +coil = { module = "io.coil-kt:coil", version.ref = "coilVersion" } +coil-svg = { module = "io.coil-kt:coil-svg", version.ref = "coilVersion" } +constraintlayout = { module = "androidx.constraintlayout:constraintlayout", version.ref = "constraintVersion" } +converter-gson = { module = "com.squareup.retrofit2:converter-gson", version.ref = "retrofit" } +converter-scalars = { module = "com.squareup.retrofit2:converter-scalars", version.ref = "retrofit" } +core-ktx = { module = "androidx.core:core-ktx", version.ref = "coreKtx" } +ext-junit = { module = "androidx.test.ext:junit", version.ref = "junitVersion" } +firebase-appdistribution-gradle = { module = "com.google.firebase:firebase-appdistribution-gradle", version.ref = "firebaseAppdistributionGradle" } +insetter-widgets = { module = "dev.chrisbanes.insetter:insetter-widgets", version.ref = "insetterVersion" } +jna = { module = "net.java.dev.jna:jna", version.ref = "jna" } junit = { module = "junit:junit", version.ref = "junit" } -zXing-core = { module = "com.google.zxing:core", version.ref = "zXingVersion" } -zXing-embedded = { module = "com.journeyapps:zxing-android-embedded", version.ref = "zXingEmbeddedVersion" } +kotlin-serialization = { module = "org.jetbrains.kotlin:kotlin-serialization", version.ref = "kotlin" } +kotlin-stdlib-jdk7 = { module = "org.jetbrains.kotlin:kotlin-stdlib-jdk7", version.ref = "kotlin" } +kotlinx-coroutines-rx2 = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-rx2", version.ref = "coroutines" } +kotlinx-coroutines-test = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-test", version.ref = "coroutines" } +legacy-support-v4 = { module = "androidx.legacy:legacy-support-v4", version.ref = "legacySupportV4" } +lifecycle-compiler = { module = "androidx.lifecycle:lifecycle-compiler", version.ref = "architectureComponentVersion" } +lifecycle-livedata-ktx = { module = "androidx.lifecycle:lifecycle-livedata-ktx", version.ref = "architectureComponentVersion" } +lifecycle-process = { module = "androidx.lifecycle:lifecycle-process", version.ref = "architectureComponentVersion" } +lifecycle-runtime-ktx = { module = "androidx.lifecycle:lifecycle-runtime-ktx", version.ref = "architectureComponentVersion" } +lifecycle-viewmodel-ktx = { module = "androidx.lifecycle:lifecycle-viewmodel-ktx", version.ref = "architectureComponentVersion" } +logging-interceptor = { module = "com.squareup.okhttp3:logging-interceptor", version.ref = "okhttpVersion" } +mockito-core = { module = "org.mockito:mockito-core", version.ref = "mockitoVersion" } +mockito-inline = { module = "org.mockito:mockito-inline", version.ref = "mockitoVersion" } +mockito-kotlin = { module = "org.mockito.kotlin:mockito-kotlin", version.ref = "mockitoKotlin" } +navigation-fragment-ktx = { module = "androidx.navigation:navigation-fragment-ktx", version.ref = "navControllerVersion" } +navigation-ui-ktx = { module = "androidx.navigation:navigation-ui-ktx", version.ref = "navControllerVersion" } +nv-websocket-client = { module = "com.neovisionaries:nv-websocket-client", version.ref = "wsVersion" } +opencsv = { module = "com.opencsv:opencsv", version.ref = "opencsv" } +org-jacoco-core = { module = "org.jacoco:org.jacoco.core", version.ref = "orgJacocoCore" } +play-publisher = { module = "com.github.triplet.gradle:play-publisher", version.ref = "playPublisher" } +progressbutton = { module = "com.github.razir.progressbutton:progressbutton", version.ref = "progressButtonsVersion" } +recyclerview = { module = "androidx.recyclerview:recyclerview", version.ref = "recyclerviewVersion" } +room-ktx = { module = "androidx.room:room-ktx", version.ref = "roomVersion" } +room-runtime = { module = "androidx.room:room-runtime", version.ref = "roomRuntime" } +room-compiler = { module = "androidx.room:room-compiler", version.ref = "roomRuntime" } +room-testing = { module = "androidx.room:room-testing", version.ref = "roomVersion" } +rules = { module = "androidx.test:rules", version.ref = "rules" } +runner = { module = "androidx.test:runner", version.ref = "runner" } +shimmer = { module = "com.facebook.shimmer:shimmer", version.ref = "shimmerVersion" } +sonarqube-gradle-plugin = { module = "org.sonarsource.scanner.gradle:sonarqube-gradle-plugin", version.ref = "sonarqubeGradlePlugin" } +storiesProgressView = { module = "com.github.ildixhaferri:StoriesProgressView", version.ref = "storiesVersion" } +zxing-core = { module = "com.google.zxing:core", version.ref = "zxingVersion" } +zxing-embedded = { module = "com.journeyapps:zxing-android-embedded", version.ref = "zxingEmbeddedVersion" } google-services = { module = "com.google.gms:google-services", version.ref = "googleServices" } gradleplugins-detekt = { module = "io.gitlab.arturbosch.detekt:detekt-gradle-plugin", version.ref = "detekt" } @@ -56,8 +138,21 @@ compose-themeAdapter = { module = "com.google.android.material:compose-theme-ada compose-animation = { module = "androidx.compose.animation:animation", version.ref = "compose" } compose-animationGraphics = { module = "androidx.compose.animation:animation-graphics", version.ref = "compose" } compose-uiToolingPreview = { module = "androidx.compose.ui:ui-tooling-preview", version.ref = "compose" } - +compose-uiTooling = { module = "androidx.compose.ui:ui-tooling", version.ref = "compose" } +compose-shimmer = { module = "com.valentinilk.shimmer:compose-shimmer", version.ref = "composeShimmer" } +activity-compose = { module = "androidx.activity:activity-compose", version.ref = "activityCompose" } +lifecycle-viewmodel-compose = { module = "androidx.lifecycle:lifecycle-viewmodel-compose", version.ref = "architectureComponentVersion" } +constraintlayout-compose = { module = "androidx.constraintlayout:constraintlayout-compose", version.ref = "constraintlayoutComposeVersion" } coil-compose = { module = "io.coil-kt:coil-compose", version.ref = "coilVersion" } +navigation-compose = { module = "androidx.navigation:navigation-compose", version.ref = "navControllerVersion" } +hilt-navigation-compose = { module = "androidx.hilt:hilt-navigation-compose", version.ref = "hiltNavComposeVersion" } + +accompanist-swiperefresh = { module = "com.google.accompanist:accompanist-swiperefresh", version.ref = "accompanistVersion" } +accompanist-webview = { module = "com.google.accompanist:accompanist-webview", version.ref = "accompanistVersion" } + +#fix compose preview https://stackoverflow.com/a/71830120 +customview = { module = "androidx.customview:customview", version.ref = "customview" } +customview-poolingcontainer = { module = "androidx.customview:customview-poolingcontainer", version.ref = "customviewPoolingcontainer" } fragmentKtx = { module = "androidx.fragment:fragment-ktx", version.ref = "fragmentKtx" } material = { module = "com.google.android.material:material", version.ref = "material" } @@ -71,6 +166,7 @@ detekt-cli = { module = "io.gitlab.arturbosch.detekt:detekt-cli", version.ref = sharedFeaturesCoreDep = { module = "jp.co.soramitsu.shared_features:core", version.ref = "sharedFeaturesVersion" } sharedFeaturesXcmDep = { module = "jp.co.soramitsu.shared_features:xcm", version.ref = "sharedFeaturesVersion" } sharedFeaturesBackupDep = { module = "jp.co.soramitsu.shared_features:backup", version.ref = "sharedFeaturesVersion" } +beacon-android-sdk = { module = "com.github.airgap-it:beacon-android-sdk", version.ref = "beaconVersion" } web3jDep = { module = "org.web3j:core", version.ref = "web3j" } walletconnectBomDep = { module = "com.walletconnect:android-bom", version.ref = "walletconnectBom" } @@ -81,6 +177,11 @@ walletconnectWeb3WalletDep = { module = "com.walletconnect:web3wallet" } compose = [ "compose-runtime", "compose-ui", "compose-runtimeLiveData", "compose-compiler", "compose-foundation", "compose-material", "compose-themeAdapter", "compose-animation", - "compose-animationGraphics", "compose-uiToolingPreview", "coil-compose" + "compose-animationGraphics", "compose-uiToolingPreview", "coil-compose", "compose-shimmer", + "activity-compose", "lifecycle-viewmodel-compose", "constraintlayout-compose", + "navigation-compose", "hilt-navigation-compose", "accompanist-swiperefresh", "accompanist-webview" +] +composeDebug = [ + "compose-uiTooling", "customview", "customview-poolingcontainer" ] coroutines = ["coroutines-core", "coroutines-android"] \ No newline at end of file diff --git a/runtime-permission/build.gradle b/runtime-permission/build.gradle index 116bcc27ac..6351495935 100644 --- a/runtime-permission/build.gradle +++ b/runtime-permission/build.gradle @@ -20,5 +20,5 @@ android { } dependencies { - implementation androidDep + implementation libs.appcompat } \ No newline at end of file diff --git a/runtime/build.gradle b/runtime/build.gradle index f3bd563b3f..c9f75ded31 100644 --- a/runtime/build.gradle +++ b/runtime/build.gradle @@ -13,7 +13,6 @@ android { testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" buildConfigField "String", "TYPES_URL", "\"https://raw.githubusercontent.com/soramitsu/shared-features-utils/master/chains/all_chains_types_android.json\"" - buildConfigField "String", "APP_VERSION_NAME", "\"${rootProject.versionName}\"" buildConfigField("String", "DEFAULT_V13_TYPES_URL", "\"https://raw.githubusercontent.com/soramitsu/shared-features-utils/master/chains/default_v13_types.json\"") } @@ -53,26 +52,26 @@ dependencies { implementation project(":core-api") - implementation gsonDep - implementation serializationDep + implementation libs.gson + implementation libs.kotlinx.serialization.json - implementation kotlinDep + implementation libs.kotlin.stdlib.jdk7 - implementation coroutinesDep - implementation liveDataKtxDep + implementation libs.coroutines.core + implementation libs.lifecycle.livedata.ktx - implementation retrofitDep + implementation libs.retrofit - implementation daggerDep - kapt daggerKapt + implementation libs.hilt.android + kapt libs.hilt.compiler testImplementation project(':test-shared') - androidTestImplementation androidTestRunnerDep - androidTestImplementation androidTestRulesDep - androidTestImplementation androidJunitDep + androidTestImplementation libs.runner + androidTestImplementation libs.rules + androidTestImplementation libs.ext.junit - api sharedFeaturesCoreDep + api libs.sharedFeaturesCoreDep - implementation web3jDep + implementation libs.web3jDep } \ No newline at end of file diff --git a/test-shared/build.gradle b/test-shared/build.gradle index 0acedc7db6..066b8b8e66 100644 --- a/test-shared/build.gradle +++ b/test-shared/build.gradle @@ -12,29 +12,23 @@ android { } - buildTypes { - release { - - } - } namespace 'jp.co.soramitsu.test_shared' } dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) + implementation projects.common - implementation kotlinDep - - implementation project(':common') + implementation libs.kotlin.stdlib.jdk7 - api jUnitDep - api mockitoDep - api mockitoCoreDep - api coroutinesTest - api mockitoKotlinDep + api libs.junit + api libs.mockito.inline + api libs.mockito.core + api libs.mockito.kotlin + api libs.kotlinx.coroutines.test - api wsDep + api libs.nv.websocket.client - api gsonDep + api libs.gson } \ No newline at end of file