diff --git a/build.gradle b/build.gradle index db48776d..6af74354 100644 --- a/build.gradle +++ b/build.gradle @@ -6,12 +6,12 @@ buildscript { ] ext.versions = [ 'architectureComponents': [ - 'lifecycle': '2.2.0-alpha05', - 'room': '2.2.0', - 'paging': '2.1.0' + 'lifecycle': '2.2.0', + 'room': '2.2.3', + 'paging': '2.1.1' ], - 'grpc':'1.21.0', - 'kotlin': '1.3.50', + 'grpc':'1.27.0', + 'kotlin': '1.3.61', 'coroutines': '1.3.2', 'junitJupiter': '5.5.2' ] @@ -23,16 +23,16 @@ buildscript { } } dependencies { - classpath 'com.android.tools.build:gradle:3.6.0-beta01' + classpath 'com.android.tools.build:gradle:3.6.0-rc02' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:${versions.kotlin}" classpath "org.jetbrains.kotlin:kotlin-allopen:${versions.kotlin}" - classpath "org.jetbrains.dokka:dokka-gradle-plugin:0.9.18" - classpath "com.github.ben-manes:gradle-versions-plugin:0.21.0" + classpath "org.jetbrains.dokka:dokka-gradle-plugin:0.10.1" + classpath "com.github.ben-manes:gradle-versions-plugin:0.27.0" classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1' - classpath "com.google.protobuf:protobuf-gradle-plugin:0.8.8" - classpath 'com.getkeepsafe.dexcount:dexcount-gradle-plugin:0.8.6' + classpath "com.google.protobuf:protobuf-gradle-plugin:0.8.11" + classpath 'com.getkeepsafe.dexcount:dexcount-gradle-plugin:1.0.2' classpath 'com.github.str4d:rust-android-gradle:68b4ecc053' - classpath 'org.owasp:dependency-check-gradle:5.2.1' + classpath 'org.owasp:dependency-check-gradle:5.3.0' } } @@ -51,11 +51,12 @@ apply plugin: 'org.mozilla.rust-android-gradle.rust-android' apply plugin: 'org.owasp.dependencycheck' group = 'cash.z.android.wallet' -version = '1.0.0-beta01' +version = '1.0.0-beta02' repositories { google() jcenter() + maven { url 'https://jitpack.io' } } android { @@ -66,7 +67,7 @@ android { defaultConfig { minSdkVersion buildConfig.minSdkVersion targetSdkVersion buildConfig.targetSdkVersion - versionCode = 1_00_00_201 // 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. + versionCode = 1_00_00_202 // 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" testInstrumentationRunnerArguments clearPackageData: 'true' @@ -185,7 +186,7 @@ cargo { dependencies { - implementation 'androidx.appcompat:appcompat:1.1.0' + implementation 'androidx.appcompat:appcompat:1.2.0-alpha02' // Architecture Components: Lifecycle implementation "androidx.lifecycle:lifecycle-runtime:${versions.architectureComponents.lifecycle}" @@ -200,7 +201,7 @@ dependencies { kapt "androidx.room:room-compiler:${versions.architectureComponents.room}" // Kotlin - implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:${versions.kotlin}" + implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:${versions.kotlin}" implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:${versions.coroutines}" implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:${versions.coroutines}" @@ -220,8 +221,8 @@ dependencies { // Tests testImplementation 'androidx.multidex:multidex:2.0.1' testImplementation "org.jetbrains.kotlin:kotlin-reflect:${versions.kotlin}" - testImplementation 'org.mockito:mockito-junit-jupiter:2.26.0' - testImplementation 'com.nhaarman.mockitokotlin2:mockito-kotlin:2.1.0' + testImplementation 'org.mockito:mockito-junit-jupiter:3.2.4' + testImplementation 'com.nhaarman.mockitokotlin2:mockito-kotlin:2.2.0' testImplementation "org.junit.jupiter:junit-jupiter-api:${versions.junitJupiter}" testImplementation "org.junit.jupiter:junit-jupiter-engine:${versions.junitJupiter}" testImplementation "org.junit.jupiter:junit-jupiter-migrationsupport:${versions.junitJupiter}" @@ -231,13 +232,19 @@ dependencies { // Attempting to use JUnit5 via https://github.com/mannodermaus/android-junit5 was painful. The plugin configuration // was buggy, crashing in several places. It also would require a separate test flavor because it's minimum API 26 // because "JUnit 5 uses Java 8-specific APIs that didn't exist on Android before the Oreo release." - androidTestImplementation 'com.nhaarman.mockitokotlin2:mockito-kotlin:2.1.0' - androidTestImplementation 'org.mockito:mockito-android:2.25.1' + androidTestImplementation 'com.nhaarman.mockitokotlin2:mockito-kotlin:2.2.0' + androidTestImplementation 'org.mockito:mockito-android:3.2.4' androidTestImplementation "androidx.test:runner:1.2.0" androidTestImplementation "androidx.test:core:1.2.0" androidTestImplementation "androidx.arch.core:core-testing:2.1.0" androidTestImplementation 'androidx.test.ext:junit:1.1.1' androidTestImplementation 'androidx.test:runner:1.2.0' + + // sample mnemonic plugin + androidTestImplementation 'com.github.zcash:zcash-android-wallet-plugins:1.0.0' + androidTestImplementation 'com.madgag.spongycastle:core:1.58.0.0' + androidTestImplementation 'io.github.novacrypto:BIP39:2019.01.27' + androidTestImplementation 'io.github.novacrypto:securestring:2019.01.27' } preBuild.dependsOn includeDirBugFix diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 7e164f7a..24497d99 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip