From 6540cd6bd35600c9723df463c0030b44a17ef56b Mon Sep 17 00:00:00 2001 From: Carter Jernigan Date: Mon, 13 Jun 2022 14:06:23 -0400 Subject: [PATCH] [#482] Rename build-convention to build-conventions-secant This prevents naming conflicts with included builds across multiple projects with build conventions. --- app/build.gradle.kts | 5 ++--- .../build.gradle.kts | 0 .../buildscript-gradle.lockfile | 0 .../gradle.lockfile | 0 .../settings.gradle.kts | 0 .../src/main/kotlin/.editorconfig | 0 .../main/kotlin/secant.android-build-conventions.gradle.kts | 0 .../main/kotlin/secant.dependency-conventions.gradle.kts | 0 .../main/kotlin/secant.emulator-wtf-conventions.gradle.kts | 0 ...secant.kotlin-multiplatform-build-conventions.gradle.kts | 0 .../src/main/kotlin/secant.ktlint-conventions.gradle.kts | 0 build-info-lib/build.gradle.kts | 4 ++-- build.gradle.kts | 2 +- crash-android-lib/build.gradle.kts | 4 ++-- crash-lib/build.gradle.kts | 6 +++--- preference-api-lib/build.gradle.kts | 4 ++-- preference-impl-android-lib/build.gradle.kts | 5 ++--- sdk-ext-lib/build.gradle.kts | 4 ++-- sdk-ext-ui-lib/build.gradle.kts | 4 ++-- settings.gradle.kts | 2 +- spackle-android-lib/build.gradle.kts | 5 ++--- spackle-lib/build.gradle.kts | 4 ++-- test-lib/build.gradle.kts | 2 +- ui-design-lib/build.gradle.kts | 3 +-- ui-integration-test-lib/build.gradle.kts | 4 ++-- ui-lib/build.gradle.kts | 5 ++--- 26 files changed, 29 insertions(+), 34 deletions(-) rename {build-convention => build-conventions-secant}/build.gradle.kts (100%) rename {build-convention => build-conventions-secant}/buildscript-gradle.lockfile (100%) rename {build-convention => build-conventions-secant}/gradle.lockfile (100%) rename {build-convention => build-conventions-secant}/settings.gradle.kts (100%) rename {build-convention => build-conventions-secant}/src/main/kotlin/.editorconfig (100%) rename build-convention/src/main/kotlin/zcash.android-build-conventions.gradle.kts => build-conventions-secant/src/main/kotlin/secant.android-build-conventions.gradle.kts (100%) rename build-convention/src/main/kotlin/zcash.dependency-conventions.gradle.kts => build-conventions-secant/src/main/kotlin/secant.dependency-conventions.gradle.kts (100%) rename build-convention/src/main/kotlin/zcash.emulator-wtf-conventions.gradle.kts => build-conventions-secant/src/main/kotlin/secant.emulator-wtf-conventions.gradle.kts (100%) rename build-convention/src/main/kotlin/zcash.kotlin-multiplatform-build-conventions.gradle.kts => build-conventions-secant/src/main/kotlin/secant.kotlin-multiplatform-build-conventions.gradle.kts (100%) rename build-convention/src/main/kotlin/zcash.ktlint-conventions.gradle.kts => build-conventions-secant/src/main/kotlin/secant.ktlint-conventions.gradle.kts (100%) diff --git a/app/build.gradle.kts b/app/build.gradle.kts index e8563c58..8306fe16 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -1,12 +1,11 @@ plugins { id("com.android.application") kotlin("android") - id("kotlin-parcelize") - id("zcash.android-build-conventions") + id("secant.android-build-conventions") id("com.github.triplet.play") id("com.osacky.fladle") id("wtf.emulator.gradle") - id("zcash.emulator-wtf-conventions") + id("secant.emulator-wtf-conventions") } val packageName = "co.electriccoin.zcash" diff --git a/build-convention/build.gradle.kts b/build-conventions-secant/build.gradle.kts similarity index 100% rename from build-convention/build.gradle.kts rename to build-conventions-secant/build.gradle.kts diff --git a/build-convention/buildscript-gradle.lockfile b/build-conventions-secant/buildscript-gradle.lockfile similarity index 100% rename from build-convention/buildscript-gradle.lockfile rename to build-conventions-secant/buildscript-gradle.lockfile diff --git a/build-convention/gradle.lockfile b/build-conventions-secant/gradle.lockfile similarity index 100% rename from build-convention/gradle.lockfile rename to build-conventions-secant/gradle.lockfile diff --git a/build-convention/settings.gradle.kts b/build-conventions-secant/settings.gradle.kts similarity index 100% rename from build-convention/settings.gradle.kts rename to build-conventions-secant/settings.gradle.kts diff --git a/build-convention/src/main/kotlin/.editorconfig b/build-conventions-secant/src/main/kotlin/.editorconfig similarity index 100% rename from build-convention/src/main/kotlin/.editorconfig rename to build-conventions-secant/src/main/kotlin/.editorconfig diff --git a/build-convention/src/main/kotlin/zcash.android-build-conventions.gradle.kts b/build-conventions-secant/src/main/kotlin/secant.android-build-conventions.gradle.kts similarity index 100% rename from build-convention/src/main/kotlin/zcash.android-build-conventions.gradle.kts rename to build-conventions-secant/src/main/kotlin/secant.android-build-conventions.gradle.kts diff --git a/build-convention/src/main/kotlin/zcash.dependency-conventions.gradle.kts b/build-conventions-secant/src/main/kotlin/secant.dependency-conventions.gradle.kts similarity index 100% rename from build-convention/src/main/kotlin/zcash.dependency-conventions.gradle.kts rename to build-conventions-secant/src/main/kotlin/secant.dependency-conventions.gradle.kts diff --git a/build-convention/src/main/kotlin/zcash.emulator-wtf-conventions.gradle.kts b/build-conventions-secant/src/main/kotlin/secant.emulator-wtf-conventions.gradle.kts similarity index 100% rename from build-convention/src/main/kotlin/zcash.emulator-wtf-conventions.gradle.kts rename to build-conventions-secant/src/main/kotlin/secant.emulator-wtf-conventions.gradle.kts diff --git a/build-convention/src/main/kotlin/zcash.kotlin-multiplatform-build-conventions.gradle.kts b/build-conventions-secant/src/main/kotlin/secant.kotlin-multiplatform-build-conventions.gradle.kts similarity index 100% rename from build-convention/src/main/kotlin/zcash.kotlin-multiplatform-build-conventions.gradle.kts rename to build-conventions-secant/src/main/kotlin/secant.kotlin-multiplatform-build-conventions.gradle.kts diff --git a/build-convention/src/main/kotlin/zcash.ktlint-conventions.gradle.kts b/build-conventions-secant/src/main/kotlin/secant.ktlint-conventions.gradle.kts similarity index 100% rename from build-convention/src/main/kotlin/zcash.ktlint-conventions.gradle.kts rename to build-conventions-secant/src/main/kotlin/secant.ktlint-conventions.gradle.kts diff --git a/build-info-lib/build.gradle.kts b/build-info-lib/build.gradle.kts index 14b67eb9..5c01a728 100644 --- a/build-info-lib/build.gradle.kts +++ b/build-info-lib/build.gradle.kts @@ -3,8 +3,8 @@ import java.util.* plugins { kotlin("multiplatform") - id("zcash.kotlin-multiplatform-build-conventions") - id("zcash.dependency-conventions") + id("secant.kotlin-multiplatform-build-conventions") + id("secant.dependency-conventions") } // Injects build information diff --git a/build.gradle.kts b/build.gradle.kts index f6b0224f..e266d615 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -10,7 +10,7 @@ plugins { id("com.osacky.fulladle") id("io.gitlab.arturbosch.detekt") id("org.jetbrains.kotlinx.kover") - id("zcash.ktlint-conventions") + id("secant.ktlint-conventions") } tasks { diff --git a/crash-android-lib/build.gradle.kts b/crash-android-lib/build.gradle.kts index 78123791..878f9d04 100644 --- a/crash-android-lib/build.gradle.kts +++ b/crash-android-lib/build.gradle.kts @@ -1,9 +1,9 @@ plugins { id("com.android.library") kotlin("android") - id("zcash.android-build-conventions") + id("secant.android-build-conventions") id("wtf.emulator.gradle") - id("zcash.emulator-wtf-conventions") + id("secant.emulator-wtf-conventions") } // Note that we force enable test orchestrator for this module, because some of the test cases require it. diff --git a/crash-lib/build.gradle.kts b/crash-lib/build.gradle.kts index d337dac1..98969886 100644 --- a/crash-lib/build.gradle.kts +++ b/crash-lib/build.gradle.kts @@ -1,8 +1,8 @@ plugins { kotlin("multiplatform") - id("zcash.kotlin-multiplatform-build-conventions") - id("zcash.dependency-conventions") - id("zcash.android-build-conventions") + id("secant.kotlin-multiplatform-build-conventions") + id("secant.dependency-conventions") + id("secant.android-build-conventions") } kotlin { diff --git a/preference-api-lib/build.gradle.kts b/preference-api-lib/build.gradle.kts index 7e20dba2..310206b0 100644 --- a/preference-api-lib/build.gradle.kts +++ b/preference-api-lib/build.gradle.kts @@ -1,7 +1,7 @@ plugins { kotlin("multiplatform") - id("zcash.kotlin-multiplatform-build-conventions") - id("zcash.dependency-conventions") + id("secant.kotlin-multiplatform-build-conventions") + id("secant.dependency-conventions") } kotlin { diff --git a/preference-impl-android-lib/build.gradle.kts b/preference-impl-android-lib/build.gradle.kts index d0a82b47..981f15ba 100644 --- a/preference-impl-android-lib/build.gradle.kts +++ b/preference-impl-android-lib/build.gradle.kts @@ -1,10 +1,9 @@ plugins { id("com.android.library") kotlin("android") - id("kotlin-parcelize") - id("zcash.android-build-conventions") + id("secant.android-build-conventions") id("wtf.emulator.gradle") - id("zcash.emulator-wtf-conventions") + id("secant.emulator-wtf-conventions") } // Force orchestrator to be used for this module, because we need the preference files diff --git a/sdk-ext-lib/build.gradle.kts b/sdk-ext-lib/build.gradle.kts index 636785cd..72735e93 100644 --- a/sdk-ext-lib/build.gradle.kts +++ b/sdk-ext-lib/build.gradle.kts @@ -1,9 +1,9 @@ plugins { id("com.android.library") kotlin("android") - id("zcash.android-build-conventions") + id("secant.android-build-conventions") id("wtf.emulator.gradle") - id("zcash.emulator-wtf-conventions") + id("secant.emulator-wtf-conventions") } android { diff --git a/sdk-ext-ui-lib/build.gradle.kts b/sdk-ext-ui-lib/build.gradle.kts index 68568423..1e4856d1 100644 --- a/sdk-ext-ui-lib/build.gradle.kts +++ b/sdk-ext-ui-lib/build.gradle.kts @@ -1,9 +1,9 @@ plugins { id("com.android.library") kotlin("android") - id("zcash.android-build-conventions") + id("secant.android-build-conventions") id("wtf.emulator.gradle") - id("zcash.emulator-wtf-conventions") + id("secant.emulator-wtf-conventions") } android { diff --git a/settings.gradle.kts b/settings.gradle.kts index 988cd178..4b904857 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -256,7 +256,7 @@ dependencyResolutionManagement { rootProject.name = "zcash-android-app" -includeBuild("build-convention") +includeBuild("build-conventions-secant") include("app") include("build-info-lib") diff --git a/spackle-android-lib/build.gradle.kts b/spackle-android-lib/build.gradle.kts index 15393e23..6e30eed2 100644 --- a/spackle-android-lib/build.gradle.kts +++ b/spackle-android-lib/build.gradle.kts @@ -1,10 +1,9 @@ plugins { id("com.android.library") kotlin("android") - id("kotlin-parcelize") - id("zcash.android-build-conventions") + id("secant.android-build-conventions") id("wtf.emulator.gradle") - id("zcash.emulator-wtf-conventions") + id("secant.emulator-wtf-conventions") } android { diff --git a/spackle-lib/build.gradle.kts b/spackle-lib/build.gradle.kts index be071bda..52e624c2 100644 --- a/spackle-lib/build.gradle.kts +++ b/spackle-lib/build.gradle.kts @@ -1,7 +1,7 @@ plugins { kotlin("multiplatform") - id("zcash.kotlin-multiplatform-build-conventions") - id("zcash.dependency-conventions") + id("secant.kotlin-multiplatform-build-conventions") + id("secant.dependency-conventions") } kotlin { diff --git a/test-lib/build.gradle.kts b/test-lib/build.gradle.kts index e2334879..1b8f617f 100644 --- a/test-lib/build.gradle.kts +++ b/test-lib/build.gradle.kts @@ -1,7 +1,7 @@ plugins { id("com.android.library") kotlin("android") - id("zcash.android-build-conventions") + id("secant.android-build-conventions") } android { diff --git a/ui-design-lib/build.gradle.kts b/ui-design-lib/build.gradle.kts index 5b8b898c..77f653aa 100644 --- a/ui-design-lib/build.gradle.kts +++ b/ui-design-lib/build.gradle.kts @@ -1,8 +1,7 @@ plugins { id("com.android.library") kotlin("android") - id("kotlin-parcelize") - id("zcash.android-build-conventions") + id("secant.android-build-conventions") } android { diff --git a/ui-integration-test-lib/build.gradle.kts b/ui-integration-test-lib/build.gradle.kts index 10b5dc85..5b67a702 100644 --- a/ui-integration-test-lib/build.gradle.kts +++ b/ui-integration-test-lib/build.gradle.kts @@ -1,9 +1,9 @@ plugins { id("com.android.library") kotlin("android") - id("zcash.android-build-conventions") + id("secant.android-build-conventions") id("wtf.emulator.gradle") - id("zcash.emulator-wtf-conventions") + id("secant.emulator-wtf-conventions") } // Force orchestrator to be used for this module, because we need cleared state to generate screenshots diff --git a/ui-lib/build.gradle.kts b/ui-lib/build.gradle.kts index 308d5a60..b32af8b1 100644 --- a/ui-lib/build.gradle.kts +++ b/ui-lib/build.gradle.kts @@ -1,10 +1,9 @@ plugins { id("com.android.library") kotlin("android") - id("kotlin-parcelize") - id("zcash.android-build-conventions") + id("secant.android-build-conventions") id("wtf.emulator.gradle") - id("zcash.emulator-wtf-conventions") + id("secant.emulator-wtf-conventions") } android {