From 45d90b7706b5e5eb1c2154bec5b7d465883d9bac Mon Sep 17 00:00:00 2001 From: Carter Jernigan Date: Mon, 19 Sep 2022 08:24:19 -0400 Subject: [PATCH] [#586] AGP 7.3 --- app/build.gradle.kts | 2 + app/src/androidTest/AndroidManifest.xml | 2 +- app/src/main/AndroidManifest.xml | 3 +- build-conventions-secant/gradle.lockfile | 145 ++++++++---------- ...ecant.android-build-conventions.gradle.kts | 45 +++++- buildscript-gradle.lockfile | 145 ++++++++---------- crash-android-lib/build.gradle.kts | 3 + .../src/androidTest/AndroidManifest.xml | 3 +- .../src/main/AndroidManifest.xml | 3 +- docs/Setup.md | 2 + gradle.properties | 2 +- preference-impl-android-lib/build.gradle.kts | 2 + .../src/androidTest/AndroidManifest.xml | 3 +- .../src/main/AndroidManifest.xml | 3 +- sdk-ext-lib/build.gradle.kts | 1 + .../src/androidTest/AndroidManifest.xml | 3 +- sdk-ext-lib/src/main/AndroidManifest.xml | 2 +- sdk-ext-ui-lib/build.gradle.kts | 2 + .../src/androidTest/AndroidManifest.xml | 3 +- sdk-ext-ui-lib/src/main/AndroidManifest.xml | 2 +- spackle-android-lib/build.gradle.kts | 2 + .../src/androidTest/AndroidManifest.xml | 3 +- .../src/main/AndroidManifest.xml | 3 +- test-lib/build.gradle.kts | 1 + test-lib/src/main/AndroidManifest.xml | 3 +- ui-design-lib/build.gradle.kts | 2 + .../src/androidTest/AndroidManifest.xml | 3 +- ui-design-lib/src/main/AndroidManifest.xml | 3 +- ui-integration-test-lib/build.gradle.kts | 2 + .../src/androidTest/AndroidManifest.xml | 3 +- .../src/main/AndroidManifest.xml | 2 +- ui-lib/build.gradle.kts | 2 + ui-lib/src/androidTest/AndroidManifest.xml | 3 +- ui-lib/src/main/AndroidManifest.xml | 3 +- 34 files changed, 214 insertions(+), 197 deletions(-) diff --git a/app/build.gradle.kts b/app/build.gradle.kts index a3e75c38..280067ea 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -16,6 +16,8 @@ val isOrchestratorEnabled = true val testnetNetworkName = "Testnet" android { + namespace = "co.electriccoin.zcash.app" + defaultConfig { applicationId = packageName diff --git a/app/src/androidTest/AndroidManifest.xml b/app/src/androidTest/AndroidManifest.xml index 0b472d7c..e1000761 100644 --- a/app/src/androidTest/AndroidManifest.xml +++ b/app/src/androidTest/AndroidManifest.xml @@ -1,4 +1,4 @@ - + diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 21c5beab..45d389a0 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -1,6 +1,5 @@ - + ().apply { - configureBaseExtension() + configureBaseExtension(isLibrary = false) defaultConfig { minSdk = project.property("ANDROID_APP_MIN_SDK_VERSION").toString().toInt() @@ -26,7 +27,7 @@ pluginManager.withPlugin("com.android.application") { pluginManager.withPlugin("com.android.library") { project.the().apply { - configureBaseExtension() + configureBaseExtension(isLibrary = true) defaultConfig { minSdk = project.property("ANDROID_LIB_MIN_SDK_VERSION").toString().toInt() @@ -51,7 +52,8 @@ pluginManager.withPlugin("com.android.library") { } } -fun com.android.build.gradle.BaseExtension.configureBaseExtension() { +@Suppress("LongMethod") +fun com.android.build.gradle.BaseExtension.configureBaseExtension(isLibrary: Boolean) { compileSdkVersion(project.property("ANDROID_COMPILE_SDK_VERSION").toString().toInt()) ndkVersion = project.property("ANDROID_NDK_VERSION").toString() @@ -85,6 +87,41 @@ fun com.android.build.gradle.BaseExtension.configureBaseExtension() { if (project.property("IS_USE_TEST_ORCHESTRATOR").toString().toBoolean()) { execution = "ANDROIDX_TEST_ORCHESTRATOR" } + + @Suppress("UnstableApiUsage") + managedDevices { + @Suppress("MagicNumber", "PropertyName", "VariableNaming") + val MANAGED_DEVICES_MIN_SDK = 27 + + val testDeviceMinSdkVersion = run { + val buildMinSdk = if (isLibrary) { + project.properties["ANDROID_LIB_MIN_SDK_VERSION"].toString().toInt() + } else { + project.properties["ANDROID_APP_MIN_SDK_VERSION"].toString().toInt() + } + buildMinSdk.coerceAtLeast(MANAGED_DEVICES_MIN_SDK) + } + val testDeviceMaxSdkVersion = project.properties["ANDROID_TARGET_SDK_VERSION"].toString().toInt() + + devices { + create("pixel2Min") { + device = "Pixel 2" + apiLevel = testDeviceMinSdkVersion + systemImageSource = "google" + } + create("pixel2Target") { + device = "Pixel 2" + apiLevel = testDeviceMaxSdkVersion + systemImageSource = "google" + } + } + + groups { + create("defaultDevices") { + targetDevices.addAll(devices.toList()) + } + } + } } packagingOptions { @@ -117,4 +154,4 @@ fun com.android.build.gradle.BaseExtension.configureBaseExtension() { fun CommonExtension<*, *, *, *>.kotlinOptions(block: KotlinJvmOptions.() -> Unit) { (this as ExtensionAware).extensions.configure("kotlinOptions", block) -} \ No newline at end of file +} diff --git a/buildscript-gradle.lockfile b/buildscript-gradle.lockfile index 5db8cca2..e0b9e066 100644 --- a/buildscript-gradle.lockfile +++ b/buildscript-gradle.lockfile @@ -1,71 +1,64 @@ # 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.2.2=classpath -androidx.databinding:databinding-compiler-common:7.2.2=classpath -com.android.databinding:baseLibrary:7.2.2=classpath -com.android.tools.analytics-library:crash:30.2.2=classpath -com.android.tools.analytics-library:protos:30.2.2=classpath -com.android.tools.analytics-library:shared:30.2.2=classpath -com.android.tools.analytics-library:tracker:30.2.2=classpath -com.android.tools.build.jetifier:jetifier-core:1.0.0-beta09=classpath -com.android.tools.build.jetifier:jetifier-processor:1.0.0-beta09=classpath -com.android.tools.build:aapt2-proto:7.2.2-7984345=classpath -com.android.tools.build:aaptcompiler:7.2.2=classpath -com.android.tools.build:apksig:7.2.2=classpath -com.android.tools.build:apkzlib:7.2.2=classpath -com.android.tools.build:builder-model:7.2.2=classpath -com.android.tools.build:builder-test-api:7.2.2=classpath -com.android.tools.build:builder:7.2.2=classpath -com.android.tools.build:bundletool:1.8.2=classpath -com.android.tools.build:gradle-api:7.2.2=classpath -com.android.tools.build:gradle:7.2.2=classpath -com.android.tools.build:manifest-merger:30.2.2=classpath +androidx.databinding:databinding-common:7.3.0=classpath +androidx.databinding:databinding-compiler-common:7.3.0=classpath +com.android.databinding:baseLibrary:7.3.0=classpath +com.android.tools.analytics-library:crash:30.3.0=classpath +com.android.tools.analytics-library:protos:30.3.0=classpath +com.android.tools.analytics-library:shared:30.3.0=classpath +com.android.tools.analytics-library:tracker:30.3.0=classpath +com.android.tools.build.jetifier:jetifier-core:1.0.0-beta10=classpath +com.android.tools.build.jetifier:jetifier-processor:1.0.0-beta10=classpath +com.android.tools.build:aapt2-proto:7.3.0-8691043=classpath +com.android.tools.build:aaptcompiler:7.3.0=classpath +com.android.tools.build:apksig:7.3.0=classpath +com.android.tools.build:apkzlib:7.3.0=classpath +com.android.tools.build:builder-model:7.3.0=classpath +com.android.tools.build:builder-test-api:7.3.0=classpath +com.android.tools.build:builder:7.3.0=classpath +com.android.tools.build:bundletool:1.9.0=classpath +com.android.tools.build:gradle-api:7.3.0=classpath +com.android.tools.build:gradle:7.3.0=classpath +com.android.tools.build:manifest-merger:30.3.0=classpath com.android.tools.build:transform-api:2.0.0-deprecated-use-gradle-api=classpath -com.android.tools.ddms:ddmlib:30.2.2=classpath -com.android.tools.layoutlib:layoutlib-api:30.2.2=classpath -com.android.tools.lint:lint-model:30.2.2=classpath -com.android.tools.lint:lint-typedef-remover:30.2.2=classpath -com.android.tools.utp:android-device-provider-ddmlib-proto:30.2.2=classpath -com.android.tools.utp:android-device-provider-gradle-proto:30.2.2=classpath -com.android.tools.utp:android-test-plugin-host-additional-test-output-proto:30.2.2=classpath -com.android.tools.utp:android-test-plugin-host-coverage-proto:30.2.2=classpath -com.android.tools.utp:android-test-plugin-host-retention-proto:30.2.2=classpath -com.android.tools.utp:android-test-plugin-result-listener-gradle-proto:30.2.2=classpath -com.android.tools:annotations:30.2.2=classpath -com.android.tools:common:30.2.2=classpath -com.android.tools:dvlib:30.2.2=classpath -com.android.tools:repository:30.2.2=classpath -com.android.tools:sdk-common:30.2.2=classpath -com.android.tools:sdklib:30.2.2=classpath -com.android:signflinger:7.2.2=classpath -com.android:zipflinger:7.2.2=classpath -com.fasterxml.jackson.core:jackson-annotations:2.11.1=classpath -com.fasterxml.jackson.core:jackson-core:2.11.1=classpath -com.fasterxml.jackson.core:jackson-databind:2.11.1=classpath -com.fasterxml.jackson.dataformat:jackson-dataformat-xml:2.11.1=classpath -com.fasterxml.jackson.module:jackson-module-jaxb-annotations:2.11.1=classpath -com.fasterxml.jackson.module:jackson-module-kotlin:2.11.1=classpath -com.fasterxml.woodstox:woodstox-core:6.2.1=classpath +com.android.tools.ddms:ddmlib:30.3.0=classpath +com.android.tools.layoutlib:layoutlib-api:30.3.0=classpath +com.android.tools.lint:lint-model:30.3.0=classpath +com.android.tools.lint:lint-typedef-remover:30.3.0=classpath +com.android.tools.utp:android-device-provider-ddmlib-proto:30.3.0=classpath +com.android.tools.utp:android-device-provider-gradle-proto:30.3.0=classpath +com.android.tools.utp:android-test-plugin-host-additional-test-output-proto:30.3.0=classpath +com.android.tools.utp:android-test-plugin-host-coverage-proto:30.3.0=classpath +com.android.tools.utp:android-test-plugin-host-retention-proto:30.3.0=classpath +com.android.tools.utp:android-test-plugin-result-listener-gradle-proto:30.3.0=classpath +com.android.tools:annotations:30.3.0=classpath +com.android.tools:common:30.3.0=classpath +com.android.tools:dvlib:30.3.0=classpath +com.android.tools:repository:30.3.0=classpath +com.android.tools:sdk-common:30.3.0=classpath +com.android.tools:sdklib:30.3.0=classpath +com.android:signflinger:7.3.0=classpath +com.android:zipflinger:7.3.0=classpath com.github.ben-manes.versions:com.github.ben-manes.versions.gradle.plugin:0.42.0=classpath,classpathCopy,classpathCopy2 com.github.ben-manes:gradle-versions-plugin:0.42.0=classpath com.github.gundy:semver4j:0.16.4=classpath com.google.android:annotations:4.1.1.4=classpath -com.google.api.grpc:proto-google-common-protos:1.12.0=classpath +com.google.api.grpc:proto-google-common-protos:2.0.1=classpath com.google.auto.value:auto-value-annotations:1.6.2=classpath com.google.code.findbugs:jsr305:3.0.2=classpath com.google.code.gson:gson:2.8.9=classpath com.google.crypto.tink:tink:1.3.0-rc2=classpath com.google.dagger:dagger:2.28.3=classpath -com.google.errorprone:error_prone_annotations:2.3.4=classpath +com.google.errorprone:error_prone_annotations:2.4.0=classpath com.google.flatbuffers:flatbuffers-java:1.12.0=classpath com.google.guava:failureaccess:1.0.1=classpath com.google.guava:guava:30.1-jre=classpath com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=classpath com.google.j2objc:j2objc-annotations:1.3=classpath com.google.jimfs:jimfs:1.1=classpath -com.google.protobuf:protobuf-java-util:3.10.0=classpath -com.google.protobuf:protobuf-java:3.10.0=classpath +com.google.protobuf:protobuf-java-util:3.17.2=classpath +com.google.protobuf:protobuf-java:3.17.2=classpath com.google.testing.platform:core-proto:0.0.8-alpha07=classpath com.googlecode.json-simple:json-simple:1.1=classpath com.googlecode.juniversalchardet:juniversalchardet:1.0.3=classpath @@ -89,47 +82,45 @@ io.gitlab.arturbosch.detekt:detekt-gradle-plugin:1.21.0=classpath io.gitlab.arturbosch.detekt:io.gitlab.arturbosch.detekt.gradle.plugin:1.19.0=classpathCopy io.gitlab.arturbosch.detekt:io.gitlab.arturbosch.detekt.gradle.plugin:1.20.0=classpathCopy2 io.gitlab.arturbosch.detekt:io.gitlab.arturbosch.detekt.gradle.plugin:1.21.0=classpath -io.grpc:grpc-api:1.21.1=classpath -io.grpc:grpc-context:1.21.1=classpath -io.grpc:grpc-core:1.21.1=classpath -io.grpc:grpc-netty:1.21.1=classpath -io.grpc:grpc-protobuf-lite:1.21.1=classpath -io.grpc:grpc-protobuf:1.21.1=classpath -io.grpc:grpc-stub:1.21.1=classpath -io.netty:netty-buffer:4.1.34.Final=classpath -io.netty:netty-codec-http2:4.1.34.Final=classpath -io.netty:netty-codec-http:4.1.34.Final=classpath -io.netty:netty-codec-socks:4.1.34.Final=classpath -io.netty:netty-codec:4.1.34.Final=classpath -io.netty:netty-common:4.1.34.Final=classpath -io.netty:netty-handler-proxy:4.1.34.Final=classpath -io.netty:netty-handler:4.1.34.Final=classpath -io.netty:netty-resolver:4.1.34.Final=classpath -io.netty:netty-transport:4.1.34.Final=classpath -io.opencensus:opencensus-api:0.21.0=classpath -io.opencensus:opencensus-contrib-grpc-metrics:0.21.0=classpath +io.grpc:grpc-api:1.39.0=classpath +io.grpc:grpc-context:1.39.0=classpath +io.grpc:grpc-core:1.39.0=classpath +io.grpc:grpc-netty:1.39.0=classpath +io.grpc:grpc-protobuf-lite:1.39.0=classpath +io.grpc:grpc-protobuf:1.39.0=classpath +io.grpc:grpc-stub:1.39.0=classpath +io.netty:netty-buffer:4.1.52.Final=classpath +io.netty:netty-codec-http2:4.1.52.Final=classpath +io.netty:netty-codec-http:4.1.52.Final=classpath +io.netty:netty-codec-socks:4.1.52.Final=classpath +io.netty:netty-codec:4.1.52.Final=classpath +io.netty:netty-common:4.1.52.Final=classpath +io.netty:netty-handler-proxy:4.1.52.Final=classpath +io.netty:netty-handler:4.1.52.Final=classpath +io.netty:netty-resolver:4.1.52.Final=classpath +io.netty:netty-transport:4.1.52.Final=classpath +io.perfmark:perfmark-api:0.23.0=classpath it.unimi.dsi:fastutil:8.4.0=classpath jakarta.activation:jakarta.activation-api:1.2.1=classpath jakarta.xml.bind:jakarta.xml.bind-api:2.3.2=classpath +javax.annotation:javax.annotation-api:1.3.2=classpath javax.inject:javax.inject:1=classpath net.java.dev.jna:jna-platform:5.6.0=classpath net.java.dev.jna:jna:5.6.0=classpath net.sf.jopt-simple:jopt-simple:4.9=classpath net.sf.kxml:kxml2:2.3.0=classpath org.apache.commons:commons-compress:1.20=classpath -org.apache.httpcomponents:httpclient:4.5.9=classpath -org.apache.httpcomponents:httpcore:4.4.11=classpath +org.apache.httpcomponents:httpclient:4.5.13=classpath +org.apache.httpcomponents:httpcore:4.4.13=classpath org.apache.httpcomponents:httpmime:4.5.6=classpath org.bitbucket.b_c:jose4j:0.7.0=classpath -org.bouncycastle:bcpkix-jdk15on:1.56=classpath -org.bouncycastle:bcprov-jdk15on:1.56=classpath +org.bouncycastle:bcpkix-jdk15on:1.67=classpath +org.bouncycastle:bcprov-jdk15on:1.67=classpath org.checkerframework:checker-qual:3.5.0=classpath -org.codehaus.mojo:animal-sniffer-annotations:1.17=classpath -org.codehaus.woodstox:stax2-api:4.2.1=classpath +org.codehaus.mojo:animal-sniffer-annotations:1.19=classpath org.glassfish.jaxb:jaxb-runtime:2.3.2=classpath org.glassfish.jaxb:txw2:2.3.2=classpath org.jdom:jdom2:2.0.6=classpath -org.jetbrains.dokka:dokka-core:1.4.32=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 @@ -160,17 +151,13 @@ org.jetbrains.kotlin:kotlin-util-io:1.7.10=classpath org.jetbrains.kotlin:kotlin-util-klib:1.7.10=classpath org.jetbrains.kotlinx.kover:org.jetbrains.kotlinx.kover.gradle.plugin:0.5.1=classpath org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.5.0=classpath -org.jetbrains.kotlinx:kotlinx-coroutines-core:1.4.1=classpath org.jetbrains.kotlinx:kotlinx-serialization-core-jvm:1.1.0=classpath org.jetbrains.kotlinx:kotlinx-serialization-core:1.1.0=classpath org.jetbrains.kotlinx:kotlinx-serialization-json-jvm:1.1.0=classpath org.jetbrains.kotlinx:kotlinx-serialization-json:1.1.0=classpath org.jetbrains.kotlinx:kover:0.5.1=classpath org.jetbrains:annotations:13.0=classpath -org.jetbrains:markdown-jvm:0.2.1=classpath -org.jetbrains:markdown:0.2.1=classpath org.json:json:20180813=classpath -org.jsoup:jsoup:1.13.1=classpath org.jvnet.staxex:stax-ex:1.8.1=classpath org.ow2.asm:asm-analysis:9.1=classpath org.ow2.asm:asm-commons:9.1=classpath diff --git a/crash-android-lib/build.gradle.kts b/crash-android-lib/build.gradle.kts index 878f9d04..eaff161b 100644 --- a/crash-android-lib/build.gradle.kts +++ b/crash-android-lib/build.gradle.kts @@ -10,6 +10,9 @@ plugins { // Specifically this is needed due to checks on the UncaughtExceptionHandler tests android { + namespace = "co.electriccoin.zcash.crash.android" + testNamespace = "co.electriccoin.zcash.crash.test" + defaultConfig { testInstrumentationRunnerArguments["clearPackageData"] = "true" } diff --git a/crash-android-lib/src/androidTest/AndroidManifest.xml b/crash-android-lib/src/androidTest/AndroidManifest.xml index 9d7692df..b03c811c 100644 --- a/crash-android-lib/src/androidTest/AndroidManifest.xml +++ b/crash-android-lib/src/androidTest/AndroidManifest.xml @@ -1,6 +1,5 @@ - + diff --git a/crash-android-lib/src/main/AndroidManifest.xml b/crash-android-lib/src/main/AndroidManifest.xml index d5fbd0b1..2a0a6885 100644 --- a/crash-android-lib/src/main/AndroidManifest.xml +++ b/crash-android-lib/src/main/AndroidManifest.xml @@ -1,6 +1,5 @@ - + diff --git a/docs/Setup.md b/docs/Setup.md index a68054fe..8b5ba26a 100644 --- a/docs/Setup.md +++ b/docs/Setup.md @@ -86,6 +86,8 @@ A few notes on running instrumentation tests on the app module: - Screenshots are generated automatically and copied to (/app/build/reports/androidTests/connected/zcash_screenshots)[../app/build/reports/androidTests/connected/zcash_screenshots] - Running the Android tests on the app module will erase the data stored by the app. This is because Test Orchestrator is required to reset app state to successfully perform integration tests. +Gradle Managed Devices are also configured with our build scripts. We have found best results running tests one module at a time, rather than trying to run them all at once. For example: `./gradlew :ui-lib:pixel2TargetDebugAndroidTest` will run the UI tests on a Pixel 2 sized device using our target API version. + ## Gradle Properties A variety of Gradle properties can be used to configure the build. Most of these properties are optional and help with advanced configuration. If you're just doing local development or making a small pull request contribution, you likely do not need to worry about these. diff --git a/gradle.properties b/gradle.properties index fcc0687e..0b5bdc19 100644 --- a/gradle.properties +++ b/gradle.properties @@ -94,7 +94,7 @@ ANDROID_COMPILE_SDK_VERSION=33 ANDROID_NDK_VERSION=23.0.7599858 -ANDROID_GRADLE_PLUGIN_VERSION=7.2.2 +ANDROID_GRADLE_PLUGIN_VERSION=7.3.0 DETEKT_VERSION=1.21.0 EMULATOR_WTF_GRADLE_PLUGIN_VERSION=0.0.10 FLANK_VERSION=21.09.0 diff --git a/preference-impl-android-lib/build.gradle.kts b/preference-impl-android-lib/build.gradle.kts index 981f15ba..528eeb4e 100644 --- a/preference-impl-android-lib/build.gradle.kts +++ b/preference-impl-android-lib/build.gradle.kts @@ -11,6 +11,8 @@ plugins { val isOrchestratorEnabled = true android { + namespace = "co.electriccoin.zcash.preference" + if (isOrchestratorEnabled) { defaultConfig { testInstrumentationRunnerArguments["clearPackageData"] = "true" diff --git a/preference-impl-android-lib/src/androidTest/AndroidManifest.xml b/preference-impl-android-lib/src/androidTest/AndroidManifest.xml index 4a380a92..171f4494 100644 --- a/preference-impl-android-lib/src/androidTest/AndroidManifest.xml +++ b/preference-impl-android-lib/src/androidTest/AndroidManifest.xml @@ -1,6 +1,5 @@ - + diff --git a/preference-impl-android-lib/src/main/AndroidManifest.xml b/preference-impl-android-lib/src/main/AndroidManifest.xml index dcc16bc1..bff082ba 100644 --- a/preference-impl-android-lib/src/main/AndroidManifest.xml +++ b/preference-impl-android-lib/src/main/AndroidManifest.xml @@ -1,7 +1,6 @@ + xmlns:android="http://schemas.android.com/apk/res/android"> diff --git a/sdk-ext-lib/build.gradle.kts b/sdk-ext-lib/build.gradle.kts index 357ba63b..7136807c 100644 --- a/sdk-ext-lib/build.gradle.kts +++ b/sdk-ext-lib/build.gradle.kts @@ -7,6 +7,7 @@ plugins { } android { + namespace = "cash.z.ecc.sdk.ext" } dependencies { diff --git a/sdk-ext-lib/src/androidTest/AndroidManifest.xml b/sdk-ext-lib/src/androidTest/AndroidManifest.xml index 4e0fc870..39329493 100644 --- a/sdk-ext-lib/src/androidTest/AndroidManifest.xml +++ b/sdk-ext-lib/src/androidTest/AndroidManifest.xml @@ -1,6 +1,5 @@ - + diff --git a/sdk-ext-lib/src/main/AndroidManifest.xml b/sdk-ext-lib/src/main/AndroidManifest.xml index ff3deaec..b85da638 100644 --- a/sdk-ext-lib/src/main/AndroidManifest.xml +++ b/sdk-ext-lib/src/main/AndroidManifest.xml @@ -1,5 +1,5 @@ - + diff --git a/sdk-ext-ui-lib/build.gradle.kts b/sdk-ext-ui-lib/build.gradle.kts index 399d0b60..c96c7b94 100644 --- a/sdk-ext-ui-lib/build.gradle.kts +++ b/sdk-ext-ui-lib/build.gradle.kts @@ -7,6 +7,8 @@ plugins { } android { + namespace = "cash.z.ecc.sdk.ext.ui" + testNamespace = "cash.z.ecc.sdk.ext.ui.test" resourcePrefix = "co_electriccoin_zcash_" compileOptions { diff --git a/sdk-ext-ui-lib/src/androidTest/AndroidManifest.xml b/sdk-ext-ui-lib/src/androidTest/AndroidManifest.xml index 24c91180..9e98bd6f 100644 --- a/sdk-ext-ui-lib/src/androidTest/AndroidManifest.xml +++ b/sdk-ext-ui-lib/src/androidTest/AndroidManifest.xml @@ -1,6 +1,5 @@ - + diff --git a/sdk-ext-ui-lib/src/main/AndroidManifest.xml b/sdk-ext-ui-lib/src/main/AndroidManifest.xml index cd620146..b85da638 100644 --- a/sdk-ext-ui-lib/src/main/AndroidManifest.xml +++ b/sdk-ext-ui-lib/src/main/AndroidManifest.xml @@ -1,5 +1,5 @@ - + diff --git a/spackle-android-lib/build.gradle.kts b/spackle-android-lib/build.gradle.kts index 6e30eed2..c4b0a75e 100644 --- a/spackle-android-lib/build.gradle.kts +++ b/spackle-android-lib/build.gradle.kts @@ -7,6 +7,8 @@ plugins { } android { + namespace = "co.electriccoin.zcash.spackle" + testNamespace = "co.electriccoin.zcash.spackle.test" // Force orchestrator to be used for this module, because we need the process name to be purged between tests defaultConfig { testInstrumentationRunnerArguments["clearPackageData"] = "true" diff --git a/spackle-android-lib/src/androidTest/AndroidManifest.xml b/spackle-android-lib/src/androidTest/AndroidManifest.xml index 4a380a92..171f4494 100644 --- a/spackle-android-lib/src/androidTest/AndroidManifest.xml +++ b/spackle-android-lib/src/androidTest/AndroidManifest.xml @@ -1,6 +1,5 @@ - + diff --git a/spackle-android-lib/src/main/AndroidManifest.xml b/spackle-android-lib/src/main/AndroidManifest.xml index dc5c07fe..10740ca6 100644 --- a/spackle-android-lib/src/main/AndroidManifest.xml +++ b/spackle-android-lib/src/main/AndroidManifest.xml @@ -1,6 +1,5 @@ - + + xmlns:android="http://schemas.android.com/apk/res/android"> diff --git a/ui-design-lib/build.gradle.kts b/ui-design-lib/build.gradle.kts index 77f653aa..99066d53 100644 --- a/ui-design-lib/build.gradle.kts +++ b/ui-design-lib/build.gradle.kts @@ -5,6 +5,8 @@ plugins { } android { + namespace = "co.electriccoin.zcash.ui.design" + buildFeatures { compose = true } diff --git a/ui-design-lib/src/androidTest/AndroidManifest.xml b/ui-design-lib/src/androidTest/AndroidManifest.xml index ef9759d9..dacfb778 100644 --- a/ui-design-lib/src/androidTest/AndroidManifest.xml +++ b/ui-design-lib/src/androidTest/AndroidManifest.xml @@ -1,7 +1,6 @@ + xmlns:android="http://schemas.android.com/apk/res/android"> diff --git a/ui-design-lib/src/main/AndroidManifest.xml b/ui-design-lib/src/main/AndroidManifest.xml index 7be28eda..00285f03 100644 --- a/ui-design-lib/src/main/AndroidManifest.xml +++ b/ui-design-lib/src/main/AndroidManifest.xml @@ -1,6 +1,5 @@ - + diff --git a/ui-integration-test-lib/build.gradle.kts b/ui-integration-test-lib/build.gradle.kts index 97f2d969..d67133bf 100644 --- a/ui-integration-test-lib/build.gradle.kts +++ b/ui-integration-test-lib/build.gradle.kts @@ -10,6 +10,8 @@ plugins { val isOrchestratorEnabled = true android { + namespace = "co.electriccoin.zcash.ui.integration" + defaultConfig { if (isOrchestratorEnabled) { testInstrumentationRunnerArguments["clearPackageData"] = "true" diff --git a/ui-integration-test-lib/src/androidTest/AndroidManifest.xml b/ui-integration-test-lib/src/androidTest/AndroidManifest.xml index 4b646e3c..9645cd6b 100644 --- a/ui-integration-test-lib/src/androidTest/AndroidManifest.xml +++ b/ui-integration-test-lib/src/androidTest/AndroidManifest.xml @@ -1,7 +1,6 @@ + xmlns:android="http://schemas.android.com/apk/res/android"> diff --git a/ui-integration-test-lib/src/main/AndroidManifest.xml b/ui-integration-test-lib/src/main/AndroidManifest.xml index 0eb87692..2d100298 100644 --- a/ui-integration-test-lib/src/main/AndroidManifest.xml +++ b/ui-integration-test-lib/src/main/AndroidManifest.xml @@ -1,3 +1,3 @@ - + diff --git a/ui-lib/build.gradle.kts b/ui-lib/build.gradle.kts index b32af8b1..6659ffc9 100644 --- a/ui-lib/build.gradle.kts +++ b/ui-lib/build.gradle.kts @@ -7,6 +7,8 @@ plugins { } android { + namespace = "co.electriccoin.zcash.ui" + defaultConfig { testInstrumentationRunner = "co.electriccoin.zcash.test.ZcashUiTestRunner" } diff --git a/ui-lib/src/androidTest/AndroidManifest.xml b/ui-lib/src/androidTest/AndroidManifest.xml index f9a4adfb..4e1cd806 100644 --- a/ui-lib/src/androidTest/AndroidManifest.xml +++ b/ui-lib/src/androidTest/AndroidManifest.xml @@ -1,7 +1,6 @@ + xmlns:android="http://schemas.android.com/apk/res/android"> diff --git a/ui-lib/src/main/AndroidManifest.xml b/ui-lib/src/main/AndroidManifest.xml index 54e37503..28885cf7 100644 --- a/ui-lib/src/main/AndroidManifest.xml +++ b/ui-lib/src/main/AndroidManifest.xml @@ -1,6 +1,5 @@ - +