From 337714434703b922b8c34b8df6e25ea4e5153517 Mon Sep 17 00:00:00 2001 From: zhongchao Date: Wed, 22 Mar 2023 21:16:56 +0800 Subject: [PATCH] [2.15.0] remove release gradle --- .../mogo-core-function-chat/build.gradle | 14 ++++-------- .../mogo-core-function-devatools/build.gradle | 14 ++++-------- .../mogo-core-function-map/build.gradle | 22 +++++-------------- .../mogo-core-function-patch/build.gradle | 21 ++++++------------ .../mogo-core-function-startup/build.gradle | 11 +++------- core/mogo-core-data/build.gradle | 10 +++------ 6 files changed, 27 insertions(+), 65 deletions(-) diff --git a/core/function-impl/mogo-core-function-chat/build.gradle b/core/function-impl/mogo-core-function-chat/build.gradle index af1385fc7d..cbba149f6d 100644 --- a/core/function-impl/mogo-core-function-chat/build.gradle +++ b/core/function-impl/mogo-core-function-chat/build.gradle @@ -60,16 +60,10 @@ dependencies { implementation rootProject.ext.dependencies.androidxconstraintlayout implementation rootProject.ext.dependencies.androidxrecyclerview - if (Boolean.valueOf(USE_MAVEN_PACKAGE)) { - implementation rootProject.ext.dependencies.mogo_core_utils - implementation rootProject.ext.dependencies.mogo_core_function_call - implementation rootProject.ext.dependencies.mogo_core_res - } else { - implementation project(':foudations:mogo-commons') - implementation project(':core:mogo-core-utils') - implementation project(':core:mogo-core-function-call') - implementation project(':core:mogo-core-res') - } + implementation project(':foudations:mogo-commons') + implementation project(':core:mogo-core-utils') + implementation project(':core:mogo-core-function-call') + implementation project(':core:mogo-core-res') } apply from: new File(rootProject.rootDir, "gradle/upload.gradle").toString() diff --git a/core/function-impl/mogo-core-function-devatools/build.gradle b/core/function-impl/mogo-core-function-devatools/build.gradle index 61321d4b6b..b00c326519 100644 --- a/core/function-impl/mogo-core-function-devatools/build.gradle +++ b/core/function-impl/mogo-core-function-devatools/build.gradle @@ -87,16 +87,10 @@ dependencies { implementation rootProject.ext.dependencies.koomnative implementation rootProject.ext.dependencies.koomxhook - if (Boolean.valueOf(USE_MAVEN_PACKAGE)) { - implementation rootProject.ext.dependencies.mogo_core_utils - implementation rootProject.ext.dependencies.mogo_core_function_call - implementation rootProject.ext.dependencies.mogo_core_res - }else { - implementation project(':foudations:mogo-commons') - implementation project(':core:mogo-core-utils') - implementation project(':core:mogo-core-function-call') - implementation project(':core:mogo-core-res') - } + implementation project(':foudations:mogo-commons') + implementation project(':core:mogo-core-utils') + implementation project(':core:mogo-core-function-call') + implementation project(':core:mogo-core-res') } apply from: new File(rootProject.rootDir, "gradle/upload.gradle").toString() \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-map/build.gradle b/core/function-impl/mogo-core-function-map/build.gradle index 87b0a3c14a..53bea84269 100644 --- a/core/function-impl/mogo-core-function-map/build.gradle +++ b/core/function-impl/mogo-core-function-map/build.gradle @@ -53,11 +53,10 @@ dependencies { implementation rootProject.ext.dependencies.rxandroid kapt rootProject.ext.dependencies.aroutercompiler - implementation (rootProject.ext.dependencies.mogocustommapoperational) { + implementation(rootProject.ext.dependencies.mogocustommapoperational) { exclude group: 'com.zhidaoauto.machine', module: 'map' } - implementation rootProject.ext.dependencies.mogocustommap implementation rootProject.ext.dependencies.amapnavi3dmap @@ -67,20 +66,11 @@ dependencies { implementation rootProject.ext.dependencies.view_model_scope implementation rootProject.ext.dependencies.lifecycle_extension - if (Boolean.valueOf(USE_MAVEN_PACKAGE)) { - implementation rootProject.ext.dependencies.mogo_core_res - implementation rootProject.ext.dependencies.mogo_core_data - implementation rootProject.ext.dependencies.mogo_core_utils - implementation rootProject.ext.dependencies.mogo_core_function_call - - implementation rootProject.ext.dependencies.mogomap - } else { - implementation project(':foudations:mogo-commons') - implementation project(':core:mogo-core-res') - implementation project(':core:mogo-core-utils') - implementation project(':core:mogo-core-function-call') - implementation project(":libraries:mogo-map") - } + implementation project(':foudations:mogo-commons') + implementation project(':core:mogo-core-res') + implementation project(':core:mogo-core-utils') + implementation project(':core:mogo-core-function-call') + implementation project(":libraries:mogo-map") } apply from: new File(rootProject.rootDir, "gradle/upload.gradle").toString() diff --git a/core/function-impl/mogo-core-function-patch/build.gradle b/core/function-impl/mogo-core-function-patch/build.gradle index ab82536996..3a797b75a6 100644 --- a/core/function-impl/mogo-core-function-patch/build.gradle +++ b/core/function-impl/mogo-core-function-patch/build.gradle @@ -60,18 +60,11 @@ dependencies { implementation rootProject.ext.dependencies.lancetx_runtime implementation rootProject.ext.dependencies.arouter kapt rootProject.ext.dependencies.aroutercompiler - if (Boolean.valueOf(USE_MAVEN_PACKAGE)) { - implementation rootProject.ext.dependencies.moduleservice - implementation rootProject.ext.dependencies.mogo_core_data - implementation rootProject.ext.dependencies.mogo_core_utils - implementation rootProject.ext.dependencies.mogo_core_function_api - implementation rootProject.ext.dependencies.mogo_core_res - } else { - implementation project(':core:mogo-core-data') - implementation project(':core:mogo-core-utils') - implementation project(':core:mogo-core-function-api') - implementation project(':core:mogo-core-res') - } + + implementation project(':core:mogo-core-data') + implementation project(':core:mogo-core-utils') + implementation project(':core:mogo-core-function-api') + implementation project(':core:mogo-core-res') } rootProject.gradle.taskGraph.whenReady { TaskExecutionGraph graph -> @@ -82,7 +75,7 @@ rootProject.gradle.taskGraph.whenReady { TaskExecutionGraph graph -> it.plugins.hasPlugin("com.android.application") } if (app != null) { - def android = (AppExtension)app.extensions.findByName("android") + def android = (AppExtension) app.extensions.findByName("android") def signConfig = android.signingConfigs.getByName("release") if (signConfig != null && isOnlineReleaseBuild(gradle)) { if (tasks != null) { @@ -156,7 +149,7 @@ rootProject.gradle.taskGraph.whenReady { TaskExecutionGraph graph -> } } -static boolean isWindows() { +static boolean isWindows() { return System.getProperty("os.name").toLowerCase().contains('windows') } diff --git a/core/function-impl/mogo-core-function-startup/build.gradle b/core/function-impl/mogo-core-function-startup/build.gradle index 5c5e15f374..150dbbf83d 100644 --- a/core/function-impl/mogo-core-function-startup/build.gradle +++ b/core/function-impl/mogo-core-function-startup/build.gradle @@ -45,14 +45,9 @@ dependencies { implementation rootProject.ext.dependencies.android_start_up implementation rootProject.ext.dependencies.thread_opt - - if (Boolean.valueOf(USE_MAVEN_PACKAGE)) { - implementation rootProject.ext.dependencies.mogo_core_function_call - implementation rootProject.ext.dependencies.crashreport - } else { - implementation project(':core:mogo-core-function-call') - implementation project(":test:crashreport") - } + + implementation project(':core:mogo-core-function-call') + implementation project(":test:crashreport") implementation project(':foudations:mogo-commons') } diff --git a/core/mogo-core-data/build.gradle b/core/mogo-core-data/build.gradle index 6bbadbc935..9697e80ee9 100644 --- a/core/mogo-core-data/build.gradle +++ b/core/mogo-core-data/build.gradle @@ -78,13 +78,9 @@ dependencies { implementation rootProject.ext.dependencies.protobuf_java implementation rootProject.ext.dependencies.protobuf_java_util - if (Boolean.valueOf(USE_MAVEN_PACKAGE)) { - implementation rootProject.ext.dependencies.mogo_core_res - } else { - implementation project(':core:mogo-core-res') - api project(":libraries:mogo-adas-data") - api project(':core:mogo-core-utils') - } + implementation project(':core:mogo-core-res') + api project(":libraries:mogo-adas-data") + api project(':core:mogo-core-utils') } apply from: new File(rootProject.rootDir, "gradle/upload.gradle").toString()