zec
/
zcash-android-wallet-sdk
mirror of https://github.com/zcash/zcash-android-wallet-sdk.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

[#921] AGP 8.0.2 

* [#921] AGP 7.4.2

* Bump AGP to version 8.0.2

- Includes necessary changes

* Gradle and Rust plugin compatibility workaround

* Release build proguard rules

After bumping to the AGP 8.0.2 some new proguard rules are autogenerated and one new for the io.grpc.okhttp.OkHttpChannelProvider is needed

* Plugins compatibility workaround update

* Disable unnecessary benchmark module minification

As we just need to keep the target module obfuscated.

* [#1067] Gradle 8.1.1

* [#1068] Activity Compose 1.7.2

* [#1069] Protobuf

* [#1070] Tracing 1.2.0-rc01

* [#1071] JUnit 5.9.3

* [#1072] Mockito 5.3.1

* Demo app release build timeout increase

- Our latest change (double build due to Rust integration issue) possibly causes our build timeout to exceed with the latest Gradle version

* Dep issue template update

* Fix deprecated Runtime.exec()

---------

Co-authored-by: Honza <rychnovsky.honza@gmail.com>
This commit is contained in:
Carter Jernigan 2023-06-09 09:18:11 -04:00 committed by GitHub
parent 938da71777
commit 83910888ea
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
19 changed files with 180 additions and 151 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.github/ISSUE_TEMPLATE/dependency.md vendored
View File

@ -20,5 +20,4 @@ For Gradle itself:
1. Update the [Gradle SHA](https://gradle.org/release-checksums/) in `gradle/wrapper/gradle-wrapper.properties`
1. Update the Gradle wrapper by running `./gradlew wrapper --write-locks`
1. Verify no unexpected entries appear in the lockfiles. _A supply chain attack could occur during this stage. The lockfile narrows the supply chain attack window to this very moment (as opposed to every time a build occurs)_
1. Re-add the [Gradle SHA](https://gradle.org/release-checksums/) to `gradle/wrapper/gradle-wrapper.properties`
1. Are there any new APIs or possible migrations?

2
.github/workflows/pull-request.yml vendored
View File

@ -336,7 +336,7 @@ jobs:
run: |
keytool -genkey -v -keystore $SIGNING_KEY_PATH -keypass android -storepass android -alias androiddebugkey -keyalg RSA -keysize 2048 -validity 100000 -dname "CN=, OU=, O=Test, L=, S=, C=" -noprompt
- name: Build
timeout-minutes: 25
timeout-minutes: 30
env:
ORG_GRADLE_PROJECT_ZCASH_RELEASE_KEYSTORE_PATH: ${{ format('{0}/release.jks', env.home) }}
ORG_GRADLE_PROJECT_ZCASH_RELEASE_KEYSTORE_PASSWORD: android

12
backend-lib/build.gradle.kts
View File

@ -80,6 +80,18 @@ cargo {
profile = "release"
prebuiltToolchains = true
// As a workaround to the Gradle (starting from v7.4.1) and Rust Android Gradle plugin (starting from v0.9.3)
// incompatibility issue we need to add rust jni directory manually. See
// https://github.com/mozilla/rust-android-gradle/issues/118
tasks.whenObjectAdded {
// This covers mergeDebugJniLibFolders, mergeReleaseJniLibFolders, etc.
if (name.contains("^merge.+JniLibFolders$".toRegex())) {
dependsOn("cargoBuild")
// Fix for mergeDebugJniLibFolders UP-TO-DATE
inputs.dir(buildDir.resolve("rustJniLibs/android"))
}
}
}
dependencies {

69
build-conventions/buildscript-gradle.lockfile
View File

@ -1,47 +1,38 @@
# This is a Gradle generated file for dependency locking.
# Manual edits can break the build and are not advised.
# This file is expected to be part of source control.
com.github.gundy:semver4j:0.16.4=classpath
com.google.code.findbugs:jsr305:3.0.2=classpath
com.google.code.gson:gson:2.8.9=classpath
com.google.errorprone:error_prone_annotations:2.3.4=classpath
com.google.guava:failureaccess:1.0.1=classpath
com.google.guava:guava:29.0-jre=classpath
com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=classpath
com.google.j2objc:j2objc-annotations:1.3=classpath
de.undercouch:gradle-download-task:4.1.1=classpath
net.java.dev.jna:jna:5.6.0=classpath
org.checkerframework:checker-qual:2.11.1=classpath
org.gradle.kotlin.kotlin-dsl:org.gradle.kotlin.kotlin-dsl.gradle.plugin:2.4.1=classpath
org.gradle.kotlin:gradle-kotlin-dsl-plugins:2.4.1=classpath
org.gradle.kotlin.kotlin-dsl:org.gradle.kotlin.kotlin-dsl.gradle.plugin:4.0.7=classpath
org.gradle.kotlin:gradle-kotlin-dsl-plugins:4.0.7=classpath
org.jetbrains.intellij.deps:trove4j:1.0.20200330=classpath
org.jetbrains.kotlin:kotlin-android-extensions:1.7.10=classpath
org.jetbrains.kotlin:kotlin-annotation-processing-gradle:1.7.10=classpath
org.jetbrains.kotlin:kotlin-build-common:1.7.10=classpath
org.jetbrains.kotlin:kotlin-compiler-embeddable:1.7.10=classpath
org.jetbrains.kotlin:kotlin-compiler-runner:1.7.10=classpath
org.jetbrains.kotlin:kotlin-daemon-client:1.7.10=classpath
org.jetbrains.kotlin:kotlin-daemon-embeddable:1.7.10=classpath
org.jetbrains.kotlin:kotlin-gradle-plugin-api:1.7.10=classpath
org.jetbrains.kotlin:kotlin-gradle-plugin-idea:1.7.10=classpath
org.jetbrains.kotlin:kotlin-gradle-plugin-model:1.7.10=classpath
org.jetbrains.kotlin:kotlin-gradle-plugin:1.7.10=classpath
org.jetbrains.kotlin:kotlin-klib-commonizer-api:1.7.10=classpath
org.jetbrains.kotlin:kotlin-native-utils:1.7.10=classpath
org.jetbrains.kotlin:kotlin-project-model:1.7.10=classpath
org.jetbrains.kotlin:kotlin-sam-with-receiver:1.7.10=classpath
org.jetbrains.kotlin:kotlin-scripting-common:1.7.10=classpath
org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable:1.7.10=classpath
org.jetbrains.kotlin:kotlin-scripting-compiler-impl-embeddable:1.7.10=classpath
org.jetbrains.kotlin:kotlin-scripting-jvm:1.7.10=classpath
org.jetbrains.kotlin:kotlin-stdlib-common:1.7.10=classpath
org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.7.10=classpath
org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.7.10=classpath
org.jetbrains.kotlin:kotlin-stdlib:1.7.10=classpath
org.jetbrains.kotlin:kotlin-tooling-core:1.7.10=classpath
org.jetbrains.kotlin:kotlin-tooling-metadata:1.7.10=classpath
org.jetbrains.kotlin:kotlin-util-io:1.7.10=classpath
org.jetbrains.kotlin:kotlin-util-klib:1.7.10=classpath
org.jetbrains.kotlin:kotlin-android-extensions:1.8.10=classpath
org.jetbrains.kotlin:kotlin-annotation-processing-gradle:1.8.10=classpath
org.jetbrains.kotlin:kotlin-assignment:1.8.10=classpath
org.jetbrains.kotlin:kotlin-build-common:1.8.10=classpath
org.jetbrains.kotlin:kotlin-compiler-embeddable:1.8.10=classpath
org.jetbrains.kotlin:kotlin-compiler-runner:1.8.10=classpath
org.jetbrains.kotlin:kotlin-daemon-client:1.8.10=classpath
org.jetbrains.kotlin:kotlin-daemon-embeddable:1.8.10=classpath
org.jetbrains.kotlin:kotlin-gradle-plugin-api:1.8.10=classpath
org.jetbrains.kotlin:kotlin-gradle-plugin-idea-proto:1.8.10=classpath
org.jetbrains.kotlin:kotlin-gradle-plugin-idea:1.8.10=classpath
org.jetbrains.kotlin:kotlin-gradle-plugin-model:1.8.10=classpath
org.jetbrains.kotlin:kotlin-gradle-plugin:1.8.10=classpath
org.jetbrains.kotlin:kotlin-klib-commonizer-api:1.8.10=classpath
org.jetbrains.kotlin:kotlin-native-utils:1.8.10=classpath
org.jetbrains.kotlin:kotlin-project-model:1.8.10=classpath
org.jetbrains.kotlin:kotlin-sam-with-receiver:1.8.10=classpath
org.jetbrains.kotlin:kotlin-scripting-common:1.8.10=classpath
org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable:1.8.10=classpath
org.jetbrains.kotlin:kotlin-scripting-compiler-impl-embeddable:1.8.10=classpath
org.jetbrains.kotlin:kotlin-scripting-jvm:1.8.10=classpath
org.jetbrains.kotlin:kotlin-stdlib-common:1.8.10=classpath
org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.8.10=classpath
org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.10=classpath
org.jetbrains.kotlin:kotlin-stdlib:1.8.10=classpath
org.jetbrains.kotlin:kotlin-tooling-core:1.8.10=classpath
org.jetbrains.kotlin:kotlin-util-io:1.8.10=classpath
org.jetbrains.kotlin:kotlin-util-klib:1.8.10=classpath
org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.5.0=classpath
org.jetbrains:annotations:13.0=classpath
empty=

168
build-conventions/gradle.lockfile
View File

@ -1,62 +1,63 @@
# This is a Gradle generated file for dependency locking.
# Manual edits can break the build and are not advised.
# This file is expected to be part of source control.
androidx.databinding:databinding-common:7.4.0=runtimeClasspath
androidx.databinding:databinding-compiler-common:7.4.0=runtimeClasspath
com.android.databinding:baseLibrary:7.4.0=runtimeClasspath
com.android.tools.analytics-library:crash:30.4.0=runtimeClasspath
com.android.tools.analytics-library:protos:30.4.0=runtimeClasspath
com.android.tools.analytics-library:shared:30.4.0=runtimeClasspath
com.android.tools.analytics-library:tracker:30.4.0=runtimeClasspath
androidx.databinding:databinding-common:8.0.2=runtimeClasspath
androidx.databinding:databinding-compiler-common:8.0.2=runtimeClasspath
com.android.databinding:baseLibrary:8.0.2=runtimeClasspath
com.android.tools.analytics-library:crash:31.0.2=runtimeClasspath
com.android.tools.analytics-library:protos:31.0.2=runtimeClasspath
com.android.tools.analytics-library:shared:31.0.2=runtimeClasspath
com.android.tools.analytics-library:tracker:31.0.2=runtimeClasspath
com.android.tools.build.jetifier:jetifier-core:1.0.0-beta10=runtimeClasspath
com.android.tools.build.jetifier:jetifier-processor:1.0.0-beta10=runtimeClasspath
com.android.tools.build:aapt2-proto:7.4.0-8841542=runtimeClasspath
com.android.tools.build:aaptcompiler:7.4.0=runtimeClasspath
com.android.tools.build:apksig:7.4.0=compileClasspath,runtimeClasspath
com.android.tools.build:apkzlib:7.4.0=compileClasspath,runtimeClasspath
com.android.tools.build:builder-model:7.4.0=compileClasspath,runtimeClasspath
com.android.tools.build:builder-test-api:7.4.0=runtimeClasspath
com.android.tools.build:builder:7.4.0=compileClasspath,runtimeClasspath
com.android.tools.build:bundletool:1.11.4=runtimeClasspath
com.android.tools.build:gradle-api:7.4.0=compileClasspath,runtimeClasspath
com.android.tools.build:gradle-settings-api:7.4.0=runtimeClasspath
com.android.tools.build:gradle:7.4.0=compileClasspath,runtimeClasspath
com.android.tools.build:manifest-merger:30.4.0=compileClasspath,runtimeClasspath
com.android.tools.build:aapt2-proto:8.0.2-9289358=runtimeClasspath
com.android.tools.build:aaptcompiler:8.0.2=runtimeClasspath
com.android.tools.build:apksig:8.0.2=compileClasspath,runtimeClasspath
com.android.tools.build:apkzlib:8.0.2=compileClasspath,runtimeClasspath
com.android.tools.build:builder-model:8.0.2=compileClasspath,runtimeClasspath
com.android.tools.build:builder-test-api:8.0.2=runtimeClasspath
com.android.tools.build:builder:8.0.2=compileClasspath,runtimeClasspath
com.android.tools.build:bundletool:1.13.2=runtimeClasspath
com.android.tools.build:gradle-api:8.0.2=compileClasspath,runtimeClasspath
com.android.tools.build:gradle-settings-api:8.0.2=runtimeClasspath
com.android.tools.build:gradle:8.0.2=compileClasspath,runtimeClasspath
com.android.tools.build:manifest-merger:31.0.2=compileClasspath,runtimeClasspath
com.android.tools.build:transform-api:2.0.0-deprecated-use-gradle-api=runtimeClasspath
com.android.tools.ddms:ddmlib:30.4.0=runtimeClasspath
com.android.tools.layoutlib:layoutlib-api:30.4.0=runtimeClasspath
com.android.tools.lint:lint-model:30.4.0=runtimeClasspath
com.android.tools.lint:lint-typedef-remover:30.4.0=runtimeClasspath
com.android.tools.utp:android-device-provider-ddmlib-proto:30.4.0=runtimeClasspath
com.android.tools.utp:android-device-provider-gradle-proto:30.4.0=runtimeClasspath
com.android.tools.utp:android-test-plugin-host-additional-test-output-proto:30.4.0=runtimeClasspath
com.android.tools.utp:android-test-plugin-host-coverage-proto:30.4.0=runtimeClasspath
com.android.tools.utp:android-test-plugin-host-retention-proto:30.4.0=runtimeClasspath
com.android.tools.utp:android-test-plugin-result-listener-gradle-proto:30.4.0=runtimeClasspath
com.android.tools:annotations:30.4.0=runtimeClasspath
com.android.tools:common:30.4.0=runtimeClasspath
com.android.tools:dvlib:30.4.0=runtimeClasspath
com.android.tools:repository:30.4.0=runtimeClasspath
com.android.tools:sdk-common:30.4.0=runtimeClasspath
com.android.tools:sdklib:30.4.0=runtimeClasspath
com.android:signflinger:7.4.0=runtimeClasspath
com.android:zipflinger:7.4.0=compileClasspath,runtimeClasspath
com.android.tools.ddms:ddmlib:31.0.2=runtimeClasspath
com.android.tools.layoutlib:layoutlib-api:31.0.2=runtimeClasspath
com.android.tools.lint:lint-model:31.0.2=runtimeClasspath
com.android.tools.lint:lint-typedef-remover:31.0.2=runtimeClasspath
com.android.tools.utp:android-device-provider-ddmlib-proto:31.0.2=runtimeClasspath
com.android.tools.utp:android-device-provider-gradle-proto:31.0.2=runtimeClasspath
com.android.tools.utp:android-test-plugin-host-additional-test-output-proto:31.0.2=runtimeClasspath
com.android.tools.utp:android-test-plugin-host-coverage-proto:31.0.2=runtimeClasspath
com.android.tools.utp:android-test-plugin-host-logcat-proto:31.0.2=runtimeClasspath
com.android.tools.utp:android-test-plugin-host-retention-proto:31.0.2=runtimeClasspath
com.android.tools.utp:android-test-plugin-result-listener-gradle-proto:31.0.2=runtimeClasspath
com.android.tools:annotations:31.0.2=runtimeClasspath
com.android.tools:common:31.0.2=runtimeClasspath
com.android.tools:dvlib:31.0.2=runtimeClasspath
com.android.tools:repository:31.0.2=runtimeClasspath
com.android.tools:sdk-common:31.0.2=runtimeClasspath
com.android.tools:sdklib:31.0.2=runtimeClasspath
com.android:signflinger:8.0.2=runtimeClasspath
com.android:zipflinger:8.0.2=compileClasspath,runtimeClasspath
com.google.android:annotations:4.1.1.4=runtimeClasspath
com.google.api.grpc:proto-google-common-protos:2.0.1=runtimeClasspath
com.google.auto.value:auto-value-annotations:1.6.2=runtimeClasspath
com.google.code.findbugs:jsr305:3.0.2=runtimeClasspath
com.google.code.gson:gson:2.8.9=runtimeClasspath
com.google.crypto.tink:tink:1.3.0-rc2=runtimeClasspath
com.google.crypto.tink:tink:1.7.0=runtimeClasspath
com.google.dagger:dagger:2.28.3=runtimeClasspath
com.google.errorprone:error_prone_annotations:2.4.0=runtimeClasspath
com.google.errorprone:error_prone_annotations:2.10.0=runtimeClasspath
com.google.flatbuffers:flatbuffers-java:1.12.0=runtimeClasspath
com.google.guava:failureaccess:1.0.1=runtimeClasspath
com.google.guava:guava:30.1-jre=runtimeClasspath
com.google.guava:guava:31.0.1-jre=runtimeClasspath
com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=runtimeClasspath
com.google.j2objc:j2objc-annotations:1.3=runtimeClasspath
com.google.jimfs:jimfs:1.1=runtimeClasspath
com.google.protobuf:protobuf-java-util:3.17.2=runtimeClasspath
com.google.protobuf:protobuf-java:3.17.2=runtimeClasspath
com.google.protobuf:protobuf-java-util:3.19.3=runtimeClasspath
com.google.protobuf:protobuf-java:3.19.3=runtimeClasspath
com.google.testing.platform:core-proto:0.0.8-alpha08=runtimeClasspath
com.googlecode.juniversalchardet:juniversalchardet:1.0.3=runtimeClasspath
com.squareup:javapoet:1.10.0=runtimeClasspath
@ -69,23 +70,24 @@ commons-codec:commons-codec:1.11=runtimeClasspath
commons-io:commons-io:2.12.0=runtimeClasspath
commons-logging:commons-logging:1.2=runtimeClasspath
io.gitlab.arturbosch.detekt:detekt-gradle-plugin:1.23.0=compileClasspath,runtimeClasspath
io.grpc:grpc-api:1.39.0=runtimeClasspath
io.grpc:grpc-context:1.39.0=runtimeClasspath
io.grpc:grpc-core:1.39.0=runtimeClasspath
io.grpc:grpc-netty:1.39.0=runtimeClasspath
io.grpc:grpc-protobuf-lite:1.39.0=runtimeClasspath
io.grpc:grpc-protobuf:1.39.0=runtimeClasspath
io.grpc:grpc-stub:1.39.0=runtimeClasspath
io.netty:netty-buffer:4.1.52.Final=runtimeClasspath
io.netty:netty-codec-http2:4.1.52.Final=runtimeClasspath
io.netty:netty-codec-http:4.1.52.Final=runtimeClasspath
io.netty:netty-codec-socks:4.1.52.Final=runtimeClasspath
io.netty:netty-codec:4.1.52.Final=runtimeClasspath
io.netty:netty-common:4.1.52.Final=runtimeClasspath
io.netty:netty-handler-proxy:4.1.52.Final=runtimeClasspath
io.netty:netty-handler:4.1.52.Final=runtimeClasspath
io.netty:netty-resolver:4.1.52.Final=runtimeClasspath
io.netty:netty-transport:4.1.52.Final=runtimeClasspath
io.grpc:grpc-api:1.45.1=runtimeClasspath
io.grpc:grpc-context:1.45.1=runtimeClasspath
io.grpc:grpc-core:1.45.1=runtimeClasspath
io.grpc:grpc-netty:1.45.1=runtimeClasspath
io.grpc:grpc-protobuf-lite:1.45.1=runtimeClasspath
io.grpc:grpc-protobuf:1.45.1=runtimeClasspath
io.grpc:grpc-stub:1.45.1=runtimeClasspath
io.netty:netty-buffer:4.1.72.Final=runtimeClasspath
io.netty:netty-codec-http2:4.1.72.Final=runtimeClasspath
io.netty:netty-codec-http:4.1.72.Final=runtimeClasspath
io.netty:netty-codec-socks:4.1.72.Final=runtimeClasspath
io.netty:netty-codec:4.1.72.Final=runtimeClasspath
io.netty:netty-common:4.1.72.Final=runtimeClasspath
io.netty:netty-handler-proxy:4.1.72.Final=runtimeClasspath
io.netty:netty-handler:4.1.72.Final=runtimeClasspath
io.netty:netty-resolver:4.1.72.Final=runtimeClasspath
io.netty:netty-tcnative-classes:2.0.46.Final=runtimeClasspath
io.netty:netty-transport:4.1.72.Final=runtimeClasspath
io.perfmark:perfmark-api:0.23.0=runtimeClasspath
jakarta.activation:jakarta.activation-api:1.2.1=runtimeClasspath
jakarta.xml.bind:jakarta.xml.bind-api:2.3.2=runtimeClasspath
@ -97,12 +99,12 @@ net.sf.jopt-simple:jopt-simple:4.9=runtimeClasspath
net.sf.kxml:kxml2:2.3.0=runtimeClasspath
org.apache.commons:commons-compress:1.20=runtimeClasspath
org.apache.httpcomponents:httpclient:4.5.13=runtimeClasspath
org.apache.httpcomponents:httpcore:4.4.13=runtimeClasspath
org.apache.httpcomponents:httpcore:4.4.15=runtimeClasspath
org.apache.httpcomponents:httpmime:4.5.6=runtimeClasspath
org.bitbucket.b_c:jose4j:0.7.0=runtimeClasspath
org.bouncycastle:bcpkix-jdk15on:1.67=runtimeClasspath
org.bouncycastle:bcprov-jdk15on:1.67=runtimeClasspath
org.checkerframework:checker-qual:3.5.0=runtimeClasspath
org.checkerframework:checker-qual:3.12.0=runtimeClasspath
org.codehaus.mojo:animal-sniffer-annotations:1.19=runtimeClasspath
org.glassfish.jaxb:jaxb-runtime:2.3.2=runtimeClasspath
org.glassfish.jaxb:txw2:2.3.2=runtimeClasspath
@ -110,44 +112,50 @@ org.jdom:jdom2:2.0.6=runtimeClasspath
org.jetbrains.intellij.deps:trove4j:1.0.20200330=kotlinCompilerClasspath,runtimeClasspath
org.jetbrains.kotlin:kotlin-android-extensions:1.8.21=runtimeClasspath
org.jetbrains.kotlin:kotlin-annotation-processing-gradle:1.8.21=runtimeClasspath
org.jetbrains.kotlin:kotlin-compiler-embeddable:1.7.10=kotlinCompilerClasspath
org.jetbrains.kotlin:kotlin-compiler-embeddable:1.8.10=kotlinCompilerClasspath
org.jetbrains.kotlin:kotlin-compiler-embeddable:1.8.21=runtimeClasspath
org.jetbrains.kotlin:kotlin-compiler-runner:1.8.21=runtimeClasspath
org.jetbrains.kotlin:kotlin-daemon-client:1.8.21=runtimeClasspath
org.jetbrains.kotlin:kotlin-daemon-embeddable:1.7.10=kotlinCompilerClasspath
org.jetbrains.kotlin:kotlin-daemon-embeddable:1.8.10=kotlinCompilerClasspath
org.jetbrains.kotlin:kotlin-daemon-embeddable:1.8.21=runtimeClasspath
org.jetbrains.kotlin:kotlin-gradle-plugin-annotations:1.8.21=compileClasspath,runtimeClasspath
org.jetbrains.kotlin:kotlin-gradle-plugin-api:1.7.10=kotlinCompilerPluginClasspathMain
org.jetbrains.kotlin:kotlin-gradle-plugin-api:1.8.10=kotlinCompilerPluginClasspathMain
org.jetbrains.kotlin:kotlin-gradle-plugin-api:1.8.21=compileClasspath,runtimeClasspath
org.jetbrains.kotlin:kotlin-gradle-plugin-idea-proto:1.8.21=runtimeClasspath
org.jetbrains.kotlin:kotlin-gradle-plugin-idea:1.8.21=runtimeClasspath
org.jetbrains.kotlin:kotlin-gradle-plugin-model:1.7.10=kotlinCompilerPluginClasspathMain
org.jetbrains.kotlin:kotlin-gradle-plugin-model:1.8.10=kotlinCompilerPluginClasspathMain
org.jetbrains.kotlin:kotlin-gradle-plugin-model:1.8.21=compileClasspath,runtimeClasspath
org.jetbrains.kotlin:kotlin-gradle-plugin:1.8.21=compileClasspath,runtimeClasspath
org.jetbrains.kotlin:kotlin-gradle-plugins-bom:1.8.21=compileClasspath,runtimeClasspath
org.jetbrains.kotlin:kotlin-klib-commonizer-api:1.8.21=runtimeClasspath
org.jetbrains.kotlin:kotlin-native-utils:1.7.10=kotlinCompilerPluginClasspathMain
org.jetbrains.kotlin:kotlin-native-utils:1.8.10=kotlinCompilerPluginClasspathMain
org.jetbrains.kotlin:kotlin-native-utils:1.8.21=compileClasspath,runtimeClasspath
org.jetbrains.kotlin:kotlin-project-model:1.7.10=kotlinCompilerPluginClasspathMain
org.jetbrains.kotlin:kotlin-project-model:1.8.10=kotlinCompilerPluginClasspathMain
org.jetbrains.kotlin:kotlin-project-model:1.8.21=compileClasspath,runtimeClasspath
org.jetbrains.kotlin:kotlin-reflect:1.7.10=compileClasspath,kotlinCompilerClasspath,runtimeClasspath
org.jetbrains.kotlin:kotlin-sam-with-receiver:1.7.10=kotlinCompilerPluginClasspathMain
org.jetbrains.kotlin:kotlin-script-runtime:1.7.10=kotlinCompilerClasspath,kotlinCompilerPluginClasspathMain
org.jetbrains.kotlin:kotlin-scripting-common:1.7.10=kotlinCompilerPluginClasspathMain
org.jetbrains.kotlin:kotlin-reflect:1.6.10=kotlinCompilerClasspath
org.jetbrains.kotlin:kotlin-reflect:1.7.10=runtimeClasspath
org.jetbrains.kotlin:kotlin-reflect:1.8.10=compileClasspath
org.jetbrains.kotlin:kotlin-sam-with-receiver:1.8.10=kotlinCompilerPluginClasspathMain
org.jetbrains.kotlin:kotlin-script-runtime:1.8.10=kotlinCompilerClasspath,kotlinCompilerPluginClasspathMain
org.jetbrains.kotlin:kotlin-scripting-common:1.8.10=kotlinCompilerPluginClasspathMain
org.jetbrains.kotlin:kotlin-scripting-common:1.8.21=runtimeClasspath
org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable:1.7.10=kotlinCompilerPluginClasspathMain
org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable:1.8.10=kotlinCompilerPluginClasspathMain
org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable:1.8.21=runtimeClasspath
org.jetbrains.kotlin:kotlin-scripting-compiler-impl-embeddable:1.7.10=kotlinCompilerPluginClasspathMain
org.jetbrains.kotlin:kotlin-scripting-compiler-impl-embeddable:1.8.10=kotlinCompilerPluginClasspathMain
org.jetbrains.kotlin:kotlin-scripting-compiler-impl-embeddable:1.8.21=runtimeClasspath
org.jetbrains.kotlin:kotlin-scripting-jvm:1.7.10=kotlinCompilerPluginClasspathMain
org.jetbrains.kotlin:kotlin-scripting-jvm:1.8.10=kotlinCompilerPluginClasspathMain
org.jetbrains.kotlin:kotlin-scripting-jvm:1.8.21=runtimeClasspath
org.jetbrains.kotlin:kotlin-stdlib-common:1.7.10=compileClasspath,kotlinCompilerClasspath,kotlinCompilerPluginClasspathMain,runtimeClasspath
org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.7.10=compileClasspath,runtimeClasspath
org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.7.10=compileClasspath,runtimeClasspath
org.jetbrains.kotlin:kotlin-stdlib:1.7.10=compileClasspath,kotlinCompilerClasspath,kotlinCompilerPluginClasspathMain,runtimeClasspath
org.jetbrains.kotlin:kotlin-tooling-core:1.7.10=kotlinCompilerPluginClasspathMain
org.jetbrains.kotlin:kotlin-stdlib-common:1.7.10=runtimeClasspath
org.jetbrains.kotlin:kotlin-stdlib-common:1.8.10=compileClasspath,kotlinCompilerClasspath,kotlinCompilerPluginClasspathMain
org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.7.10=runtimeClasspath
org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.8.10=compileClasspath
org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.7.10=runtimeClasspath
org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.10=compileClasspath
org.jetbrains.kotlin:kotlin-stdlib:1.7.10=runtimeClasspath
org.jetbrains.kotlin:kotlin-stdlib:1.8.10=compileClasspath,kotlinCompilerClasspath,kotlinCompilerPluginClasspathMain
org.jetbrains.kotlin:kotlin-tooling-core:1.8.10=kotlinCompilerPluginClasspathMain
org.jetbrains.kotlin:kotlin-tooling-core:1.8.21=compileClasspath,runtimeClasspath
org.jetbrains.kotlin:kotlin-util-io:1.7.10=kotlinCompilerPluginClasspathMain
org.jetbrains.kotlin:kotlin-util-io:1.8.10=kotlinCompilerPluginClasspathMain
org.jetbrains.kotlin:kotlin-util-io:1.8.21=compileClasspath,runtimeClasspath
org.jetbrains.kotlin:kotlin-util-klib:1.8.21=runtimeClasspath
org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.5.0=runtimeClasspath

4
build-conventions/src/main/kotlin/zcash-sdk.android-conventions.gradle.kts
View File

@ -59,7 +59,7 @@ pluginManager.withPlugin("com.android.library") {
project.the<com.android.build.api.variant.LibraryAndroidComponentsExtension>().apply {
onVariants { variant ->
if (variant.name.toLowerCase(Locale.US).contains("release")) {
if (variant.name.lowercase(Locale.US).contains("release")) {
variant.packaging.resources.excludes.addAll(
listOf(
"META-INF/ASL2.0",
@ -147,7 +147,7 @@ fun com.android.build.gradle.BaseExtension.configureBaseExtension() {
@Suppress("UnstableApiUsage")
managedDevices {
@Suppress("MagicNumber", "PropertyName", "VariableNaming")
@Suppress("MagicNumber", "VariableNaming")
val MANAGED_DEVICES_MIN_SDK = 27
val testDeviceMinSdkVersion = project.properties["ANDROID_MIN_SDK_VERSION"]

6
build-conventions/src/main/kotlin/zcash-sdk.rosetta-conventions.gradle.kts
View File

@ -13,11 +13,11 @@ private val maxTimeoutMillis = 5000L
* @return True if the application is running under Rosetta.
*/
fun isRosetta(): Boolean {
if (System.getProperty("os.name").toLowerCase(java.util.Locale.ROOT).startsWith("mac")) {
if (System.getProperty("os.name").lowercase(java.util.Locale.ROOT).startsWith("mac")) {
// Counterintuitive, but running under Rosetta is reported as Intel64 to the JVM
if (!System.getProperty("os.arch").toLowerCase(java.util.Locale.ROOT).contains("aarch64")) {
if (!System.getProperty("os.arch").lowercase(java.util.Locale.ROOT).contains("aarch64")) {
val outputValue = Runtime.getRuntime()
.exec("sysctl -in sysctl.proc_translated")
.exec(arrayOf("sysctl -in sysctl.proc_translated"))
.scanOutputLine()
?.toIntOrNull()

6
build.gradle.kts
View File

@ -81,7 +81,7 @@ tasks {
val unstableKeywords = listOf("alpha", "beta", "rc", "m", "ea", "build")
fun isNonStable(version: String): Boolean {
val versionLowerCase = version.toLowerCase()
val versionLowerCase = version.lowercase()
return unstableKeywords.any { versionLowerCase.contains(it) }
}
@ -89,10 +89,10 @@ fun isNonStable(version: String): Boolean {
fladle {
// Firebase Test Lab has min and max values that might differ from our project's
// These are determined by `gcloud firebase test android models list`
@Suppress("MagicNumber", "PropertyName", "VariableNaming")
@Suppress("MagicNumber", "VariableNaming")
val FIREBASE_TEST_LAB_MIN_API = 27 // Minimum for Pixel2.arm device
@Suppress("MagicNumber", "PropertyName", "VariableNaming")
@Suppress("MagicNumber", "VariableNaming")
val FIREBASE_TEST_LAB_MAX_API = 33
val minSdkVersion = run {

1
demo-app-benchmark-test/build.gradle.kts
View File

@ -32,7 +32,6 @@ android {
// We provide the extra benchmark build type for benchmarking. We still need to support debug
// variants to be compatible with debug variants in other modules, although benchmarking does not allow
// not minified build variants - benchmarking with the debug build variants will fail.
isMinifyEnabled = true
isDebuggable = true
signingConfig = signingConfigs.getByName("debug")
matchingFallbacks += listOf("release")

4
demo-app-benchmark-test/proguard-consumer.txt
View File

@ -1,4 +0,0 @@
# This is generated automatically by the Android Gradle plugin.
-dontwarn androidx.test.services.storage.internal.InternalTestStorage
-dontwarn com.google.errorprone.annotations.InlineMe
-dontwarn com.google.errorprone.annotations.MustBeClosed

5
demo-app/build.gradle.kts
View File

@ -18,6 +18,7 @@ android {
}
buildFeatures {
buildConfig = true
compose = true
viewBinding = true
}
@ -141,10 +142,10 @@ dependencies {
fladle {
// Firebase Test Lab has min and max values that might differ from our project's
// These are determined by `gcloud firebase test android models list`
@Suppress("MagicNumber", "PropertyName", "VariableNaming")
@Suppress("MagicNumber", "VariableNaming")
val FIREBASE_TEST_LAB_MIN_API = 27 // Minimum for Pixel2.arm device
@Suppress("MagicNumber", "PropertyName", "VariableNaming")
@Suppress("MagicNumber", "VariableNaming")
val FIREBASE_TEST_LAB_MAX_API = 33
val minSdkVersion = run {

10
demo-app/proguard-project.txt
View File

@ -11,3 +11,13 @@
public static *** error(...);
public static *** assertLoggingStripped();
}
# This is generated automatically by the Android Gradle plugin.
-dontwarn kotlinx.serialization.KSerializer
-dontwarn kotlinx.serialization.Serializable
-dontwarn javax.naming.NamingEnumeration
-dontwarn javax.naming.NamingException
-dontwarn javax.naming.directory.Attribute
-dontwarn javax.naming.directory.Attributes
-dontwarn javax.naming.directory.DirContext
-dontwarn javax.naming.directory.InitialDirContext

14
gradle.properties
View File

@ -83,7 +83,7 @@ ANDROID_COMPILE_SDK_VERSION=33
# When changing this, be sure to update .github/actions/setup/action.yml
ANDROID_NDK_VERSION=22.1.7171670
ANDROID_GRADLE_PLUGIN_VERSION=7.4.0
ANDROID_GRADLE_PLUGIN_VERSION=8.0.2
DETEKT_VERSION=1.23.0
DETEKT_COMPOSE_RULES_VERSION=0.1.6
DOKKA_VERSION=1.8.10
@ -95,10 +95,10 @@ FULLADLE_VERSION=0.17.4
GRADLE_VERSIONS_PLUGIN_VERSION=0.46.0
KSP_VERSION=1.8.20-1.0.10
KTLINT_VERSION=0.49.1
PROTOBUF_GRADLE_PLUGIN_VERSION=0.9.1
PROTOBUF_GRADLE_PLUGIN_VERSION=0.9.3
RUST_GRADLE_PLUGIN_VERSION=0.9.3
ANDROIDX_ACTIVITY_VERSION=1.7.1
ANDROIDX_ACTIVITY_VERSION=1.7.2
ANDROIDX_ANNOTATION_VERSION=1.6.0
ANDROIDX_APPCOMPAT_VERSION=1.6.1
ANDROIDX_COMPOSE_COMPILER_VERSION=1.4.7
@ -123,7 +123,7 @@ ANDROIDX_TEST_MACROBENCHMARK_VERSION=1.2.0-alpha14
ANDROIDX_TEST_ORCHESTRATOR_VERSION=1.4.2
ANDROIDX_TEST_CORE_VERSION=1.5.0
ANDROIDX_TEST_RUNNER_VERSION=1.5.2
ANDROIDX_TRACING_VERSION=1.2.0-beta04
ANDROIDX_TRACING_VERSION=1.2.0-rc01
ANDROIDX_UI_AUTOMATOR_VERSION=2.3.0-alpha03
BIP39_VERSION=1.0.4
CORE_LIBRARY_DESUGARING_VERSION=2.0.3
@ -134,13 +134,13 @@ GRPC_VERSION=1.55.1
GSON_VERSION=2.9.0
JACOCO_VERSION=0.8.9
JAVAX_ANNOTATION_VERSION=1.3.2
JUNIT_VERSION=5.9.2
JUNIT_VERSION=5.9.3
KOTLINX_COROUTINES_VERSION=1.7.1
KOTLINX_DATETIME_VERSION=0.4.0
KOTLIN_VERSION=1.8.21
MOCKITO_KOTLIN_VERSION=2.2.0
MOCKITO_VERSION=5.3.0
PROTOC_VERSION=3.23.1
MOCKITO_VERSION=5.3.1
PROTOC_VERSION=3.23.2
ZCASH_WALLET_PLUGINS_VERSION=1.0.1
# This shouldn't be changed, as Android doesn't support targets beyond Java 8

BIN
gradle/wrapper/gradle-wrapper.jar vendored
View File

Binary file not shown.

5
gradle/wrapper/gradle-wrapper.properties vendored
View File

@ -1,8 +1,7 @@
#Mon Sep 19 11:01:26 CEST 2022
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip
distributionSha256Sum=7ba68c54029790ab444b39d7e293d3236b2632631fb5f2e012bb28b4ff669e4b
distributionSha256Sum=e111cb9948407e26351227dabce49822fb88c37ee72f1d1582a69c68af2e702f
distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
networkTimeout=10000
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists

11
gradlew vendored
View File

@ -85,9 +85,6 @@ done
APP_BASE_NAME=${0##*/}
APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
# Use the maximum available, or set MAX_FD != -1 to use that value.
MAX_FD=maximum
@ -144,7 +141,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
case $MAX_FD in #(
max*)
# In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
# shellcheck disable=SC3045
# shellcheck disable=SC3045
MAX_FD=$( ulimit -H -n ) ||
warn "Could not query maximum file descriptor limit"
esac
@ -152,7 +149,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
'' | soft) :;; #(
*)
# In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
# shellcheck disable=SC3045
# shellcheck disable=SC3045
ulimit -n "$MAX_FD" ||
warn "Could not set maximum file descriptor limit to $MAX_FD"
esac
@ -197,6 +194,10 @@ if "$cygwin" || "$msys" ; then
done
fi
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
# Collect all arguments for the java command;
# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
# shell script including quotes and variable substitutions, so put them in

4
lightwallet-client-lib/build.gradle.kts
View File

@ -33,6 +33,10 @@ android {
consumerProguardFiles("proguard-consumer.txt")
}
buildFeatures {
buildConfig = true
}
buildTypes {
getByName("debug").apply {
isMinifyEnabled = false

5
lightwallet-client-lib/proguard-consumer.txt
View File

@ -6,6 +6,11 @@
io.grpc.okhttp.OkHttpChannelBuilder transportExecutor(java.util.concurrent.Executor);
}
# https://github.com/grpc/grpc-java/issues/9611
-keepclassmembers, allowoptimization class io.grpc.okhttp.OkHttpChannelProvider {
<init>();
}
# gRPC related - https://github.com/grpc/grpc-java/issues/6612
-keep class * extends com.google.protobuf.GeneratedMessageLite { *; }

4
sdk-lib/build.gradle.kts
View File

@ -35,6 +35,10 @@ android {
consumerProguardFiles("proguard-consumer.txt")
}
buildFeatures {
buildConfig = true
}
buildTypes {
getByName("debug").apply {
// test builds exceed the dex limit because they pull in large test libraries