From 856120c3b291a7d38b46702a56c7413f7768f80b Mon Sep 17 00:00:00 2001 From: yangyakun Date: Tue, 21 Mar 2023 14:50:26 +0800 Subject: [PATCH] =?UTF-8?q?[gradle]=20[=E6=96=87=E4=BB=B6=E6=94=B6?= =?UTF-8?q?=E9=9B=86]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/build.gradle | 32 ++-- app/productFlavors/flavorsFilterConfig.gradle | 167 ------------------ app/{ => script}/flavorfilter/flavors.json | 0 .../flavorfilter/flavorsFilterConfig.gradle | 2 +- app/{ => script}/functions/README.md | 0 app/{ => script}/functions/och.gradle | 0 app/{ => script}/productFlavors/README.md | 0 .../productFlavors/fMultiDisplayOchBus.gradle | 0 .../fMultiDisplayOchTaxi.gradle | 0 .../fMultiDisplaySweeper.gradle | 0 .../productFlavors/fOchBus.gradle | 0 .../productFlavors/fOchBusPassenger.gradle | 0 .../productFlavors/fOchBusPassengerM2.gradle | 0 .../productFlavors/fOchShuttle.gradle | 0 .../fOchShuttlePassenger.gradle | 0 .../productFlavors/fOchSweeper.gradle | 0 .../productFlavors/fOchTaxi.gradle | 0 .../productFlavors/fOchTaxiPassenger.gradle | 0 .../productFlavors/fPadLenovo.gradle | 0 .../productFlavors/ochDriverM1.gradle | 0 .../productFlavors/ochPassengerM1.gradle | 0 21 files changed, 17 insertions(+), 184 deletions(-) delete mode 100644 app/productFlavors/flavorsFilterConfig.gradle rename app/{ => script}/flavorfilter/flavors.json (100%) rename app/{ => script}/flavorfilter/flavorsFilterConfig.gradle (94%) rename app/{ => script}/functions/README.md (100%) rename app/{ => script}/functions/och.gradle (100%) rename app/{ => script}/productFlavors/README.md (100%) rename app/{ => script}/productFlavors/fMultiDisplayOchBus.gradle (100%) rename app/{ => script}/productFlavors/fMultiDisplayOchTaxi.gradle (100%) rename app/{ => script}/productFlavors/fMultiDisplaySweeper.gradle (100%) rename app/{ => script}/productFlavors/fOchBus.gradle (100%) rename app/{ => script}/productFlavors/fOchBusPassenger.gradle (100%) rename app/{ => script}/productFlavors/fOchBusPassengerM2.gradle (100%) rename app/{ => script}/productFlavors/fOchShuttle.gradle (100%) rename app/{ => script}/productFlavors/fOchShuttlePassenger.gradle (100%) rename app/{ => script}/productFlavors/fOchSweeper.gradle (100%) rename app/{ => script}/productFlavors/fOchTaxi.gradle (100%) rename app/{ => script}/productFlavors/fOchTaxiPassenger.gradle (100%) rename app/{ => script}/productFlavors/fPadLenovo.gradle (100%) rename app/{ => script}/productFlavors/ochDriverM1.gradle (100%) rename app/{ => script}/productFlavors/ochPassengerM1.gradle (100%) diff --git a/app/build.gradle b/app/build.gradle index 5a97fdd955..518f0d787f 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -280,22 +280,22 @@ android { } // 配置不同渠道参数，直接影响功能完整度 - apply from: "./productFlavors/fPadLenovo.gradle" - apply from: "./productFlavors/fOchBus.gradle" - apply from: "./productFlavors/fOchShuttle.gradle" - apply from: "./productFlavors/fOchTaxi.gradle" - apply from: "./productFlavors/fOchBusPassenger.gradle" - apply from: "./productFlavors/fOchBusPassengerM2.gradle" - apply from: "./productFlavors/fOchShuttlePassenger.gradle" - apply from: "./productFlavors/fOchTaxiPassenger.gradle" - apply from: "./productFlavors/fOchSweeper.gradle" - apply from: "./productFlavors/fMultiDisplayOchBus.gradle" - apply from: "./productFlavors/fMultiDisplayOchTaxi.gradle" + apply from: "./script/productFlavors/fPadLenovo.gradle" + apply from: "./script/productFlavors/fOchBus.gradle" + apply from: "./script/productFlavors/fOchShuttle.gradle" + apply from: "./script/productFlavors/fOchTaxi.gradle" + apply from: "./script/productFlavors/fOchBusPassenger.gradle" + apply from: "./script/productFlavors/fOchBusPassengerM2.gradle" + apply from: "./script/productFlavors/fOchShuttlePassenger.gradle" + apply from: "./script/productFlavors/fOchTaxiPassenger.gradle" + apply from: "./script/productFlavors/fOchSweeper.gradle" + apply from: "./script/productFlavors/fMultiDisplayOchBus.gradle" + apply from: "./script/productFlavors/fMultiDisplayOchTaxi.gradle" //包车 - apply from: "./productFlavors/ochDriverM1.gradle" - apply from: "./productFlavors/ochPassengerM1.gradle" - apply from: "./productFlavors/fMultiDisplaySweeper.gradle" - apply from: "./flavorfilter/flavorsFilterConfig.gradle" + apply from: "./script/productFlavors/ochDriverM1.gradle" + apply from: "./script/productFlavors/ochPassengerM1.gradle" + apply from: "./script/productFlavors/fMultiDisplaySweeper.gradle" + apply from: "./script/flavorfilter/flavorsFilterConfig.gradle" packagingOptions { exclude 'META-INF/io.netty.versions.properties' @@ -346,7 +346,7 @@ dependencies { androidTestImplementation project(':core:mogo-core-res') - apply from: "./functions/och.gradle" + apply from: "./script/functions/och.gradle" androidTestImplementation rootProject.ext.dependencies.androidx_test_core androidTestImplementation rootProject.ext.dependencies.androidx_test_core_ktx diff --git a/app/productFlavors/flavorsFilterConfig.gradle b/app/productFlavors/flavorsFilterConfig.gradle deleted file mode 100644 index e4955fa1a0..0000000000 --- a/app/productFlavors/flavorsFilterConfig.gradle +++ /dev/null @@ -1,167 +0,0 @@ - -project.android.variantFilter { variant -> - def names = variant.flavors*.name - //要检查特定的构建类型，请使用variant.buildType.name ==“ ” - if(names.contains("mogo")) { - // region 过滤noop 的flavors 不带och业务的 - if (names.contains("noop")&&!names.contains("fPadLenovo")) { - //Gradle会忽略满足上述条件的所有变体 - setIgnore(true) - } - // endregion - // region 过滤sweper 的flavors - if (names.contains("sweeper") && !names.contains("fOchSweeper")) { - //Gradle会忽略满足上述条件的所有变体 - setIgnore(true) - } - // endregion - // region 过滤shuttle 的flavors - if (names.contains("shuttle")) { - //Gradle会忽略满足上述条件的所有变体 - if (names.contains("fOchShuttle")) { - } else if (names.contains("fOchShuttlePassenger")) { - } else { - setIgnore(true) - } - } - // endregion - // region 过滤taxi 的flavors - if (names.contains("taxi")) { - //Gradle会忽略满足上述条件的所有变体 - if (names.contains("fOchTaxi")) { - } else if (names.contains("fOchTaxiPassenger")) { - } else if (names.contains("fPadLenovo")) { - } else if (names.contains("fMultiDisplayOchTaxi")) { - } else { - setIgnore(true) - } - } - // endregion - // region 过滤bus 的flavors - if (names.contains("bus")) { - //Gradle会忽略满足上述条件的所有变体 - if (names.contains("fOchBus")) { - } else if (names.contains("fOchBusPassenger")) { - } else if (names.contains("fMultiDisplayOchBus")) { - } else if (names.contains("fOchBusPassengerM2")) { - } else { - setIgnore(true) - } - } - // endregion - // region 过滤charter 包车 的flavors - if (names.contains("charter")) { - //Gradle会忽略满足上述条件的所有变体 - if (names.contains("ochDriverM1")) { - } else if (names.contains("ochPassengerM1")) { - } else if (names.contains("fMultiDisplaySweeper")) { - } else { - setIgnore(true) - } - } - // endregion - } - else if(names.contains("dali")){ - // region 过滤noop 的flavors 不带och业务的 - if (names.contains("noop")&&!names.contains("fPadLenovo")) { - //Gradle会忽略满足上述条件的所有变体 - setIgnore(true) - } - // endregion - // region 过滤sweper 的flavors - if (names.contains("sweeper")) { - //Gradle会忽略满足上述条件的所有变体 - setIgnore(true) - } - // endregion - // region 过滤taxi 的flavors - if (names.contains("taxi")) { - setIgnore(true) - } - // endregion - // region 过滤shuttle 的flavors - if (names.contains("shuttle")) { - //Gradle会忽略满足上述条件的所有变体 - if (names.contains("fOchShuttle")) { - } else if (names.contains("fOchShuttlePassenger")) { - } else { - setIgnore(true) - } - } - // endregion - // region 过滤bus 的flavors - if (names.contains("bus")) { - //Gradle会忽略满足上述条件的所有变体 - if (names.contains("fOchBus")) { - } else if (names.contains("fOchBusPassenger")) { - } else if (names.contains("fMultiDisplayOchBus")) { - } else if (names.contains("fOchBusPassengerM2")) { - } else { - setIgnore(true) - } - } - // endregion - // region 过滤charter 包车 的flavors - if (names.contains("charter")) { - //Gradle会忽略满足上述条件的所有变体 - if (names.contains("ochDriverM1")) { - } else if (names.contains("ochPassengerM1")) { - } else { - setIgnore(true) - } - } - // endregion - } - else if(names.contains("yantai")){// - // region 过滤noop 的flavors 不带och业务的 - if (names.contains("noop")&&!names.contains("fPadLenovo")) { - //Gradle会忽略满足上述条件的所有变体 - setIgnore(true) - } - // endregion - // region 过滤sweper 的flavors - if (names.contains("sweeper") && !names.contains("fOchSweeper")) { - //Gradle会忽略满足上述条件的所有变体 - setIgnore(true) - } - // endregion - // region 过滤shuttle 的flavors - if (names.contains("shuttle")) { - //Gradle会忽略满足上述条件的所有变体 - if (names.contains("fOchShuttle")) { - } else if (names.contains("fOchShuttlePassenger")) { - } else { - setIgnore(true) - } - } - // endregion - // region 过滤taxi 的flavors - if (names.contains("taxi")) { - //Gradle会忽略满足上述条件的所有变体 - setIgnore(true) - } - // endregion - // region 过滤bus 的flavors - if (names.contains("bus")) { - //Gradle会忽略满足上述条件的所有变体 - setIgnore(true) - } - // endregion - // region 过滤charter 包车 的flavors - if (names.contains("charter")) { - //Gradle会忽略满足上述条件的所有变体 - if (names.contains("ochDriverM1")) { - } else if (names.contains("ochPassengerM1")) { - } else { - setIgnore(true) - } - } - // endregion - } - else { - setIgnore(true) - } -} - - - diff --git a/app/flavorfilter/flavors.json b/app/script/flavorfilter/flavors.json similarity index 100% rename from app/flavorfilter/flavors.json rename to app/script/flavorfilter/flavors.json diff --git a/app/flavorfilter/flavorsFilterConfig.gradle b/app/script/flavorfilter/flavorsFilterConfig.gradle similarity index 94% rename from app/flavorfilter/flavorsFilterConfig.gradle rename to app/script/flavorfilter/flavorsFilterConfig.gradle index 508cac8b70..83539d1a0f 100644 --- a/app/flavorfilter/flavorsFilterConfig.gradle +++ b/app/script/flavorfilter/flavorsFilterConfig.gradle @@ -1,7 +1,7 @@ import groovy.json.JsonSlurper -File file = new File("${rootDir}/app/flavorfilter/flavors.json") +File file = new File("${rootDir}/app/script/flavorfilter/flavors.json") def jsonSlurper = new JsonSlurper() // 解析json def config = jsonSlurper.parse(file) diff --git a/app/functions/README.md b/app/script/functions/README.md similarity index 100% rename from app/functions/README.md rename to app/script/functions/README.md diff --git a/app/functions/och.gradle b/app/script/functions/och.gradle similarity index 100% rename from app/functions/och.gradle rename to app/script/functions/och.gradle diff --git a/app/productFlavors/README.md b/app/script/productFlavors/README.md similarity index 100% rename from app/productFlavors/README.md rename to app/script/productFlavors/README.md diff --git a/app/productFlavors/fMultiDisplayOchBus.gradle b/app/script/productFlavors/fMultiDisplayOchBus.gradle similarity index 100% rename from app/productFlavors/fMultiDisplayOchBus.gradle rename to app/script/productFlavors/fMultiDisplayOchBus.gradle diff --git a/app/productFlavors/fMultiDisplayOchTaxi.gradle b/app/script/productFlavors/fMultiDisplayOchTaxi.gradle similarity index 100% rename from app/productFlavors/fMultiDisplayOchTaxi.gradle rename to app/script/productFlavors/fMultiDisplayOchTaxi.gradle diff --git a/app/productFlavors/fMultiDisplaySweeper.gradle b/app/script/productFlavors/fMultiDisplaySweeper.gradle similarity index 100% rename from app/productFlavors/fMultiDisplaySweeper.gradle rename to app/script/productFlavors/fMultiDisplaySweeper.gradle diff --git a/app/productFlavors/fOchBus.gradle b/app/script/productFlavors/fOchBus.gradle similarity index 100% rename from app/productFlavors/fOchBus.gradle rename to app/script/productFlavors/fOchBus.gradle diff --git a/app/productFlavors/fOchBusPassenger.gradle b/app/script/productFlavors/fOchBusPassenger.gradle similarity index 100% rename from app/productFlavors/fOchBusPassenger.gradle rename to app/script/productFlavors/fOchBusPassenger.gradle diff --git a/app/productFlavors/fOchBusPassengerM2.gradle b/app/script/productFlavors/fOchBusPassengerM2.gradle similarity index 100% rename from app/productFlavors/fOchBusPassengerM2.gradle rename to app/script/productFlavors/fOchBusPassengerM2.gradle diff --git a/app/productFlavors/fOchShuttle.gradle b/app/script/productFlavors/fOchShuttle.gradle similarity index 100% rename from app/productFlavors/fOchShuttle.gradle rename to app/script/productFlavors/fOchShuttle.gradle diff --git a/app/productFlavors/fOchShuttlePassenger.gradle b/app/script/productFlavors/fOchShuttlePassenger.gradle similarity index 100% rename from app/productFlavors/fOchShuttlePassenger.gradle rename to app/script/productFlavors/fOchShuttlePassenger.gradle diff --git a/app/productFlavors/fOchSweeper.gradle b/app/script/productFlavors/fOchSweeper.gradle similarity index 100% rename from app/productFlavors/fOchSweeper.gradle rename to app/script/productFlavors/fOchSweeper.gradle diff --git a/app/productFlavors/fOchTaxi.gradle b/app/script/productFlavors/fOchTaxi.gradle similarity index 100% rename from app/productFlavors/fOchTaxi.gradle rename to app/script/productFlavors/fOchTaxi.gradle diff --git a/app/productFlavors/fOchTaxiPassenger.gradle b/app/script/productFlavors/fOchTaxiPassenger.gradle similarity index 100% rename from app/productFlavors/fOchTaxiPassenger.gradle rename to app/script/productFlavors/fOchTaxiPassenger.gradle diff --git a/app/productFlavors/fPadLenovo.gradle b/app/script/productFlavors/fPadLenovo.gradle similarity index 100% rename from app/productFlavors/fPadLenovo.gradle rename to app/script/productFlavors/fPadLenovo.gradle diff --git a/app/productFlavors/ochDriverM1.gradle b/app/script/productFlavors/ochDriverM1.gradle similarity index 100% rename from app/productFlavors/ochDriverM1.gradle rename to app/script/productFlavors/ochDriverM1.gradle diff --git a/app/productFlavors/ochPassengerM1.gradle b/app/script/productFlavors/ochPassengerM1.gradle similarity index 100% rename from app/productFlavors/ochPassengerM1.gradle rename to app/script/productFlavors/ochPassengerM1.gradle