From 4a89075d5ad98debe0534477f1715531ebacc029 Mon Sep 17 00:00:00 2001 From: Tangem Date: Tue, 22 Nov 2022 11:48:01 +0300 Subject: [PATCH] Updated on 2026-08-14 --- app/build.gradle.kts | 1 + buildSrc/src/main/java/Dependency.kt | 3 ++- core/utils/build.gradle.kts | 31 ++++++----------------- features/referral/domain/build.gradle.kts | 31 ++++++----------------- libs/crypto/build.gradle.kts | 28 +++++--------------- 5 files changed, 26 insertions(+), 68 deletions(-) diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 81a98a6e98..d1e7b40573 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -110,6 +110,7 @@ dependencies { implementation(project(":network")) implementation(project(":common")) implementation(project(":core:ui")) + implementation(project(":core:utils")) implementation(project(":libs:crypto")) implementation(project(":libs:auth")) diff --git a/buildSrc/src/main/java/Dependency.kt b/buildSrc/src/main/java/Dependency.kt index f93b728008..c1375a7b76 100644 --- a/buildSrc/src/main/java/Dependency.kt +++ b/buildSrc/src/main/java/Dependency.kt @@ -42,8 +42,9 @@ object Library { const val googlePlayServicesWallet = "com.google.android.gms:play-services-wallet:" + Versions.googlePlayServicesWallet const val hilt = "com.google.dagger:hilt-android:" + Versions.hilt + const val hiltCore = "com.google.dagger:hilt-core:" + Versions.hilt const val hiltKapt = "com.google.dagger:hilt-compiler:" + Versions.hilt - const val jodatime = "net.danlew:android.joda:" + Versions.jodatime + const val jodatime = "joda-time:joda-time:" + Versions.jodatime const val kotsonGsonExt = "com.github.salomonbrys.kotson:kotson:" + Versions.kotsonGsonExt const val lottie = "com.airbnb.android:lottie:" + Versions.lottie const val materialComponent = "com.google.android.material:material:" + Versions.googleMaterialComponent diff --git a/core/utils/build.gradle.kts b/core/utils/build.gradle.kts index 917187555f..9f88778542 100644 --- a/core/utils/build.gradle.kts +++ b/core/utils/build.gradle.kts @@ -1,35 +1,20 @@ plugins { - id("com.android.library") - kotlin("android") + id("java-library") + id("org.jetbrains.kotlin.jvm") kotlin("kapt") - id("com.google.dagger.hilt.android") -} - -android { - - defaultConfig { - compileSdk = AppConfig.compileSdkVersion - minSdk = AppConfig.minSdkVersion - targetSdk = AppConfig.targetSdkVersion - } - - kotlinOptions { - jvmTarget = JavaVersion.VERSION_1_8.toString() - } - - compileOptions { - sourceCompatibility = JavaVersion.VERSION_1_8 - targetCompatibility = JavaVersion.VERSION_1_8 - isCoreLibraryDesugaringEnabled = false - } } dependencies { /** DI */ - implementation(Library.hilt) + implementation(Library.hiltCore) kapt(Library.hiltKapt) /** Coroutines */ implementation(Library.coroutine) +} + +java { + sourceCompatibility = JavaVersion.VERSION_1_8 + targetCompatibility = JavaVersion.VERSION_1_8 } \ No newline at end of file diff --git a/features/referral/domain/build.gradle.kts b/features/referral/domain/build.gradle.kts index bcee4c51cc..fe5dace957 100644 --- a/features/referral/domain/build.gradle.kts +++ b/features/referral/domain/build.gradle.kts @@ -1,27 +1,7 @@ plugins { - id("com.android.library") - kotlin("android") + id("java-library") + id("org.jetbrains.kotlin.jvm") kotlin("kapt") - id("com.google.dagger.hilt.android") -} - -android { - - defaultConfig { - compileSdk = AppConfig.compileSdkVersion - minSdk = AppConfig.minSdkVersion - targetSdk = AppConfig.targetSdkVersion - } - - kotlinOptions { - jvmTarget = JavaVersion.VERSION_1_8.toString() - } - - compileOptions { - sourceCompatibility = JavaVersion.VERSION_1_8 - targetCompatibility = JavaVersion.VERSION_1_8 - isCoreLibraryDesugaringEnabled = false - } } dependencies { @@ -34,6 +14,11 @@ dependencies { implementation(Library.jodatime) /** DI */ - implementation(Library.hilt) + implementation(Library.hiltCore) kapt(Library.hiltKapt) +} + +java { + sourceCompatibility = JavaVersion.VERSION_1_8 + targetCompatibility = JavaVersion.VERSION_1_8 } \ No newline at end of file diff --git a/libs/crypto/build.gradle.kts b/libs/crypto/build.gradle.kts index b6d1313ae0..de1a6876a4 100644 --- a/libs/crypto/build.gradle.kts +++ b/libs/crypto/build.gradle.kts @@ -1,29 +1,15 @@ plugins { - id("com.android.library") - kotlin("android") -} - -android { - - defaultConfig { - compileSdk = AppConfig.compileSdkVersion - minSdk = AppConfig.minSdkVersion - targetSdk = AppConfig.targetSdkVersion - } - - kotlinOptions { - jvmTarget = JavaVersion.VERSION_1_8.toString() - } - - compileOptions { - sourceCompatibility = JavaVersion.VERSION_1_8 - targetCompatibility = JavaVersion.VERSION_1_8 - isCoreLibraryDesugaringEnabled = false - } + id("java-library") + id("org.jetbrains.kotlin.jvm") } dependencies { /** Coroutines */ implementation(Library.coroutine) +} + +java { + sourceCompatibility = JavaVersion.VERSION_1_8 + targetCompatibility = JavaVersion.VERSION_1_8 } \ No newline at end of file