[#1347] Adopt Zcash SDK 2.1.1-SNAPSHOT
* [#1347] Adopt Zcash SDK 2.1.1-SNAPSHOT - Closes #1347 * Add missing Progurad rules
This commit is contained in:
parent
fc1ce4087d
commit
0e6b8f83a0
|
@ -9,6 +9,9 @@
|
|||
# Generate the combined proguard configuration for debugging.
|
||||
-printconfiguration build/outputs/proguard-config.txt
|
||||
|
||||
# This is generated automatically by the Android Gradle plugin.
|
||||
-dontwarn com.google.j2objc.annotations.ReflectionSupport
|
||||
-dontwarn com.google.j2objc.annotations.RetainedWith
|
||||
-dontwarn androidx.compose.ui.util.MathHelpersKt
|
||||
-dontwarn com.google.common.util.concurrent.ListenableFuture
|
||||
-dontwarn com.google.errorprone.annotations.InlineMe
|
||||
|
|
|
@ -12,7 +12,6 @@ org.jetbrains.kotlin:kotlin-gradle-plugin-model:1.7.10=kotlinCompilerPluginClass
|
|||
org.jetbrains.kotlin:kotlin-native-utils:1.7.10=kotlinCompilerPluginClasspathTest
|
||||
org.jetbrains.kotlin:kotlin-project-model:1.7.10=kotlinCompilerPluginClasspathTest
|
||||
org.jetbrains.kotlin:kotlin-reflect:1.6.10=kotlinCompilerClasspath
|
||||
org.jetbrains.kotlin:kotlin-reflect:1.7.10=testCompileClasspath,testRuntimeClasspath
|
||||
org.jetbrains.kotlin:kotlin-reflect:1.9.22=compileClasspath
|
||||
org.jetbrains.kotlin:kotlin-sam-with-receiver-compiler-plugin-embeddable:1.9.22=kotlinCompilerPluginClasspathMain
|
||||
org.jetbrains.kotlin:kotlin-sam-with-receiver:1.7.10=kotlinCompilerPluginClasspathTest
|
||||
|
@ -26,10 +25,6 @@ org.jetbrains.kotlin:kotlin-scripting-compiler-impl-embeddable:1.7.10=kotlinComp
|
|||
org.jetbrains.kotlin:kotlin-scripting-compiler-impl-embeddable:1.9.22=kotlinCompilerPluginClasspathMain
|
||||
org.jetbrains.kotlin:kotlin-scripting-jvm:1.7.10=kotlinCompilerPluginClasspathTest
|
||||
org.jetbrains.kotlin:kotlin-scripting-jvm:1.9.22=kotlinCompilerPluginClasspathMain
|
||||
org.jetbrains.kotlin:kotlin-stdlib-common:1.7.10=kotlinCompilerPluginClasspathTest,testCompileClasspath,testRuntimeClasspath
|
||||
org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.7.10=testCompileClasspath,testRuntimeClasspath
|
||||
org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.7.10=testCompileClasspath,testRuntimeClasspath
|
||||
org.jetbrains.kotlin:kotlin-stdlib:1.7.10=kotlinCompilerPluginClasspathTest,testCompileClasspath,testRuntimeClasspath
|
||||
org.jetbrains.kotlin:kotlin-stdlib:1.9.22=compileClasspath,kotlinCompilerClasspath,kotlinCompilerPluginClasspathMain
|
||||
org.jetbrains.kotlin:kotlin-tooling-core:1.7.10=kotlinCompilerPluginClasspathTest
|
||||
org.jetbrains.kotlin:kotlin-util-io:1.7.10=kotlinCompilerPluginClasspathTest
|
||||
|
|
|
@ -190,7 +190,7 @@ ZXING_VERSION=3.5.3
|
|||
ZCASH_BIP39_VERSION=1.0.8
|
||||
|
||||
# WARNING: Ensure a non-snapshot version is used before releasing to production
|
||||
ZCASH_SDK_VERSION=2.1.0-SNAPSHOT
|
||||
ZCASH_SDK_VERSION=2.1.1-SNAPSHOT
|
||||
|
||||
# Toolchain is the Java version used to build the application, which is separate from the
|
||||
# Java version used to run the application.
|
||||
|
|
|
@ -86,7 +86,7 @@ fun PrimaryButton(
|
|||
horizontal = ZcashTheme.dimens.spacingNone,
|
||||
vertical = ZcashTheme.dimens.spacingSmall
|
||||
),
|
||||
contentPaddingValues: PaddingValues = PaddingValues(all = 15.5.dp)
|
||||
contentPaddingValues: PaddingValues = PaddingValues(all = 16.5.dp)
|
||||
) {
|
||||
Button(
|
||||
shape = RectangleShape,
|
||||
|
|
Loading…
Reference in New Issue