Updated build and dependencies.
This commit is contained in:
parent
a2a53f3cb8
commit
9b756d60da
|
@ -11,7 +11,7 @@ apply plugin: 'com.google.firebase.firebase-perf'
|
|||
|
||||
archivesBaseName = 'zcash-android-wallet'
|
||||
group = 'cash.z.ecc.android'
|
||||
version = '1.0.0-dev12'
|
||||
version = '1.0.0-alpha17'
|
||||
|
||||
android {
|
||||
compileSdkVersion Deps.compileSdkVersion
|
||||
|
@ -21,7 +21,7 @@ android {
|
|||
applicationId 'cash.z.ecc.android'
|
||||
minSdkVersion Deps.minSdkVersion
|
||||
targetSdkVersion Deps.targetSdkVersion
|
||||
versionCode = 1_00_00_112
|
||||
versionCode = 1_00_00_017
|
||||
// last digits are alpha(0XX) beta(2XX) rc(4XX) release(8XX). Ex: 1_08_04_401 is an release candidate build of version 1.8.4 and 1_08_04_800 would be the final release.
|
||||
versionName = "$version"
|
||||
testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
|
||||
|
@ -113,6 +113,9 @@ dependencies {
|
|||
implementation project(':lockbox')
|
||||
implementation project(':sdk')
|
||||
|
||||
// Zcash
|
||||
implementation 'com.github.zcash:zcash-android-wallet-plugins:1.0.0'
|
||||
|
||||
// Kotlin
|
||||
implementation Deps.Kotlin.STDLIB
|
||||
|
||||
|
@ -143,10 +146,10 @@ dependencies {
|
|||
implementation 'io.github.novacrypto:securestring:2019.01.27'
|
||||
|
||||
// grpc-java
|
||||
implementation "io.grpc:grpc-okhttp:1.21.0"
|
||||
implementation "io.grpc:grpc-android:1.21.0"
|
||||
implementation "io.grpc:grpc-protobuf-lite:1.21.0"
|
||||
implementation "io.grpc:grpc-stub:1.21.0"
|
||||
implementation "io.grpc:grpc-okhttp:1.27.0"
|
||||
implementation "io.grpc:grpc-android:1.27.0"
|
||||
implementation "io.grpc:grpc-protobuf-lite:1.27.0"
|
||||
implementation "io.grpc:grpc-stub:1.27.0"
|
||||
implementation 'javax.annotation:javax.annotation-api:1.3.2'
|
||||
// solves error: Duplicate class com.google.common.util.concurrent.ListenableFuture found in modules jetified-guava-26.0-android.jar (com.google.guava:guava:26.0-android) and listenablefuture-1.0.jar (com.google.guava:listenablefuture:1.0)
|
||||
// per this recommendation from Chris Povirk, given guava's decision to split ListenableFuture away from Guava: https://groups.google.com/d/msg/guava-discuss/GghaKwusjcY/bCIAKfzOEwAJ
|
||||
|
@ -154,26 +157,27 @@ dependencies {
|
|||
|
||||
// Analytics
|
||||
implementation 'com.mixpanel.android:mixpanel-android:5.6.3'
|
||||
implementation 'com.google.firebase:firebase-analytics:17.2.1'
|
||||
implementation 'com.google.firebase:firebase-analytics:17.2.2'
|
||||
implementation 'com.crashlytics.sdk.android:crashlytics:2.10.1'
|
||||
implementation 'com.crashlytics.sdk.android:crashlytics-ndk:2.1.1'
|
||||
implementation 'com.google.firebase:firebase-perf:19.0.4'
|
||||
implementation 'com.google.firebase:firebase-perf:19.0.5'
|
||||
|
||||
// QR Scanning
|
||||
implementation 'com.google.firebase:firebase-ml-vision:24.0.1'
|
||||
implementation 'androidx.camera:camera-core:1.0.0-alpha08'
|
||||
implementation 'androidx.camera:camera-camera2:1.0.0-alpha08'
|
||||
implementation "androidx.camera:camera-view:1.0.0-alpha05"
|
||||
implementation "androidx.camera:camera-extensions:1.0.0-alpha05"
|
||||
implementation "androidx.camera:camera-lifecycle:1.0.0-alpha02"
|
||||
implementation 'androidx.camera:camera-core:1.0.0-alpha10'
|
||||
implementation 'androidx.camera:camera-camera2:1.0.0-alpha10'
|
||||
implementation "androidx.camera:camera-view:1.0.0-alpha07"
|
||||
implementation "androidx.camera:camera-extensions:1.0.0-alpha07"
|
||||
implementation "androidx.camera:camera-lifecycle:1.0.0-alpha10"
|
||||
|
||||
// Misc.
|
||||
implementation 'com.airbnb.android:lottie:3.1.0'
|
||||
implementation 'com.facebook.stetho:stetho:1.5.1'
|
||||
implementation 'com.github.gmale:chips-input-layout:4cd87089930fc16176f9fad1362b48a392449e23'
|
||||
|
||||
implementation "com.github.gmale:nachos:8a71c6a"
|
||||
// check for build errors at https://jitpack.io/com/github/gmale/chips-input-layout/<version>/build.log
|
||||
// implementation 'com.github.gmale:chips-input-layout:4750760a7222bc04ca48266b387456d2b03541a7'
|
||||
|
||||
implementation project(':chipsinputlayout')
|
||||
implementation 'androidx.annotation:annotation:1.1.0'
|
||||
|
||||
// Tests
|
||||
|
||||
|
|
|
@ -1,6 +1,9 @@
|
|||
import cash.z.ecc.android.Deps
|
||||
|
||||
buildscript {
|
||||
ext {
|
||||
kotlin_version = '1.3.61'
|
||||
}
|
||||
repositories {
|
||||
google()
|
||||
jcenter()
|
||||
|
@ -9,7 +12,7 @@ buildscript {
|
|||
}
|
||||
}
|
||||
dependencies {
|
||||
classpath 'com.android.tools.build:gradle:3.6.0-rc01'
|
||||
classpath 'com.android.tools.build:gradle:3.6.0-rc02'
|
||||
classpath 'com.google.gms:google-services:4.3.3'
|
||||
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:${Deps.kotlinVersion}"
|
||||
classpath 'io.fabric.tools:gradle:1.31.2'
|
||||
|
|
|
@ -3,7 +3,7 @@ package cash.z.ecc.android
|
|||
object Deps {
|
||||
// For use in the top-level build.gradle which gives an error when provided
|
||||
// `Deps.Kotlin.version` directly
|
||||
const val kotlinVersion = "1.3.60"
|
||||
const val kotlinVersion = "1.3.61"
|
||||
|
||||
const val compileSdkVersion = 29
|
||||
const val buildToolsVersion = "29.0.2"
|
||||
|
@ -37,7 +37,7 @@ object Deps {
|
|||
const val INJECT = "javax.inject:javax.inject:1"
|
||||
}
|
||||
object Kotlin : Version(kotlinVersion) {
|
||||
val STDLIB = "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$version"
|
||||
val STDLIB = "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$version"
|
||||
object Coroutines : Version("1.3.2") {
|
||||
val ANDROID = "org.jetbrains.kotlinx:kotlinx-coroutines-android:$version"
|
||||
val CORE = "org.jetbrains.kotlinx:kotlinx-coroutines-core:$version"
|
||||
|
|
|
@ -1,3 +1,4 @@
|
|||
rootProject.name='Zcash Wallet'
|
||||
include ':app', ':qrecycler', ':feedback', ':mnemonic', ':lockbox', ':sdk'
|
||||
project(":sdk").projectDir = file("../zcash-android-wallet-sdk")
|
||||
include ':app', ':qrecycler', ':feedback', ':mnemonic', ':lockbox', ':sdk', ':chipsinputlayout'
|
||||
project(":sdk").projectDir = file("../zcash-android-wallet-sdk")
|
||||
project(":chipsinputlayout").projectDir = file("../../clones/chips-input-layout/library")
|
||||
|
|
Loading…
Reference in New Issue