From b913dacebfadd1f9a094468127f69d735ef6bc65 Mon Sep 17 00:00:00 2001 From: fekt Date: Mon, 18 Nov 2024 17:52:51 +0000 Subject: [PATCH] Fix build depedencies --- app/build.gradle | 5 ++++- buildSrc/src/main/java/cash/z/ecc/android/Dependencies.kt | 2 +- .../src/main/java/cash/z/ecc/kotlin/mnemonic/Mnemonics.kt | 4 +++- settings.gradle.kts | 1 - 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 194c868..e2df26b 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -180,7 +180,10 @@ dependencies { // Misc. implementation Deps.Misc.LOTTIE - implementation Deps.Misc.CHIPS + implementation Deps.Misc.CHIPS, { + exclude module: 'ChipsLayoutManager' + } + implementation 'com.github.BelooS:ChipsLayoutManager:v0.3.7' implementation Deps.Misc.Plugins.QR_SCANNER // Tests diff --git a/buildSrc/src/main/java/cash/z/ecc/android/Dependencies.kt b/buildSrc/src/main/java/cash/z/ecc/android/Dependencies.kt index b2c1cd6..5ae47ac 100644 --- a/buildSrc/src/main/java/cash/z/ecc/android/Dependencies.kt +++ b/buildSrc/src/main/java/cash/z/ecc/android/Dependencies.kt @@ -69,7 +69,7 @@ object Deps { } } object Zcash { - const val ANDROID_WALLET_PLUGINS = "cash.z.ecc.android:zcash-android-wallet-plugins:1.0.0" + const val ANDROID_WALLET_PLUGINS = "com.github.zcash:zcash-android-wallet-plugins:1.0.0" const val KOTLIN_BIP39 = "cash.z.ecc.android:kotlin-bip39:1.0.4" /* SDK uses mavenLocal build with DRGX customizations for now diff --git a/mnemonic/src/main/java/cash/z/ecc/kotlin/mnemonic/Mnemonics.kt b/mnemonic/src/main/java/cash/z/ecc/kotlin/mnemonic/Mnemonics.kt index 3d27b32..6e05a3b 100644 --- a/mnemonic/src/main/java/cash/z/ecc/kotlin/mnemonic/Mnemonics.kt +++ b/mnemonic/src/main/java/cash/z/ecc/kotlin/mnemonic/Mnemonics.kt @@ -10,7 +10,9 @@ import java.util.* import java.util.Locale.ENGLISH class Mnemonics : MnemonicPlugin { + /* Build fails for overrides nothing override fun fullWordList(languageCode: String) = Mnemonics.getCachedWords(Locale.ENGLISH.language) + */ override fun nextEntropy(): ByteArray = WordCount.COUNT_24.toEntropy() override fun nextMnemonic(): CharArray = MnemonicCode(WordCount.COUNT_24).chars override fun nextMnemonic(entropy: ByteArray): CharArray = MnemonicCode(entropy).chars @@ -22,4 +24,4 @@ class Mnemonics : MnemonicPlugin { fun validate(mnemonic: CharArray) { MnemonicCode(mnemonic).validate() } -} +} \ No newline at end of file diff --git a/settings.gradle.kts b/settings.gradle.kts index 051c6ff..9d22f16 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -17,7 +17,6 @@ dependencyResolutionManagement { google() mavenCentral() maven("https://jitpack.io") - jcenter() /* // Uncomment to use a snapshot version of the SDK, e.g. when the SDK version ends in -SNAPSHOT