整理项目模块依赖，并上传2.0.0版本到maven

2020-09-23 17:38:59 +08:00
parent 3b5c77494f
commit cdfa224fc2
8 changed files with 32 additions and 29 deletions
--- a/app/functions/skin.gradle
+++ b/app/functions/skin.gradle
@@ -1,4 +1,5 @@
-if (Boolean.valueOf(RELEASE)) {
+project.dependencies {
+    if (Boolean.valueOf(RELEASE)) {
        bydautoImplementation rootProject.ext.dependencies.skinsupportnoop
        d82xImplementation rootProject.ext.dependencies.skinsupportnoop
        em1Implementation rootProject.ext.dependencies.skinsupportnoop
@@ -20,8 +21,8 @@ if (Boolean.valueOf(RELEASE)) {
 //        d82xImplementation rootProject.ext.dependencies.skinsupportlight
 //        em1Implementation rootProject.ext.dependencies.skinsupportlight
 //        em3Implementation rootProject.ext.dependencies.skinsupportlight
-} else {
-    project.dependencies {
+    } else {
+

        bydautoImplementation project(':skin:mogo-skin-support-noop')
        d82xImplementation project(':skin:mogo-skin-support-noop')
--- a/config.gradle
+++ b/config.gradle
@@ -109,8 +109,7 @@ targetSdkVersion               : 22,
            moduleextensions           : "com.mogo.module:module-extensions:${MOGO_MODULE_EXTENSIONS_VERSION}",
            carcall                    : "com.mogo.module.carchatting:module-carchatting:${CARCHATTING_VERSION}",
            carcallprovider            : "com.mogo.module.carchatting:module-carchatting-provider:${CARCHATTINGPROVIDER_VERSION}",
-            guideshow                  : "com.mogo.module.guideshow:module-guideshow:${MOGO_MODULE_GUIDESHOW_VERSION}",
-//            guideshowprovider        : "com.mogo.module.guideshow:module-guideshow-provider:${MOGO_MODULE_GUIDESHOW_PROVIDER_VERSION}",
+            guideshow                  : "com.mogo.module:module-guide:${MOGO_MODULE_GUIDESHOW_VERSION}",
            // V2X
            moduleV2x                  : "com.mogo.module:module-v2x:${MOGO_MODULE_V2X_VERSION}",
            modulemedia                : "com.mogo.module:module-media:${MOGO_MODULE_MEDIA_VERSION}",
@@ -198,7 +197,7 @@ targetSdkVersion               : 22,
            skinsupportnoop            : "com.mogo.skin:skin-support-noop:${MOGO_SKIN_SUPPORT_NOOP_VERSION}",
            skinsupportlight           : "com.mogo.skin:skin-light:${MOGO_SKIN_LIGHT_VERSION}",

-            crashreport                : "com.mogo.test:crashrepot:${CRASHREPORT_VERSION}",
+            crashreport                : "com.mogo.test:crashreport:${CRASHREPORT_VERSION}",
            crashreportbugly           : "com.mogo.test:crashreport-bugly:${CRASHREPORT_BUGLY_VERSION}",
            crashreportnoop            : "com.mogo.test:crashreport-noop:${CRASHREPORT_NOOP_VERSION}",

@@ -207,7 +206,7 @@ targetSdkVersion               : 22,
            skinsupportappcompat       : "com.mogo.skin:skin-support-appcompat:${SKIN_SUPPORT_APPCOMPAT_VERSION}",
            skinsupportcardview        : "com.mogo.skin:skin-support-cardview:${SKIN_SUPPORT_CARDVIEW_VERSION}",
            skinsupportconstraintlayout: "com.mogo.skin:skin-support-constraint-layout:${SKIN_SUPPORT_CONSTRAINT_LAYOUT_VERSION}",
-            skinsupportdesign          : "com.mogo.skin:skin-support-designt:${SKIN_SUPPORT_DESIGN_VERSION}",
+            skinsupportdesign          : "com.mogo.skin:skin-support-design:${SKIN_SUPPORT_DESIGN_VERSION}",
    ]

 }
--- a/libraries/tanlulib/build.gradle
+++ b/libraries/tanlulib/build.gradle
@@ -46,7 +46,9 @@ dependencies {
    implementation 'com.squareup.okhttp3:okhttp:3.10.0'
    implementation 'com.squareup.okhttp3:logging-interceptor:3.6.0'
    implementation 'com.zhidaoauto.controller:api:1.0.8'
-    implementation 'com.zhidao.cosupload:cosuploadsdk:1.1.6'
+    implementation 'com.zhidao.cosupload:cosuploadsdk:1.1.6', {
+        exclude group: 'com.zhidao.utils', module: 'utils'
+    }
    implementation 'com.zhidao.video:video-processor:1.0.2.1'
    implementation 'com.foundation.utils:common-utils:1.0.7'
    implementation rootProject.ext.dependencies.eventbus
--- a/skin/skin-support-appcompat/build.gradle
+++ b/skin/skin-support-appcompat/build.gradle
@@ -31,4 +31,6 @@ dependencies {
    } else {
        implementation project(":skin:skin-support")
    }
-}
+}
+
+apply from: new File(rootProject.rootDir, "gradle/upload.gradle").toString()
--- a/skin/skin-support-cardview/build.gradle
+++ b/skin/skin-support-cardview/build.gradle
@@ -28,3 +28,5 @@ dependencies {
        implementation project(":skin:skin-support")
    }
 }
+
+apply from: new File(rootProject.rootDir, "gradle/upload.gradle").toString()
--- a/skin/skin-support-constraint-layout/build.gradle
+++ b/skin/skin-support-constraint-layout/build.gradle
@@ -20,8 +20,6 @@ android {
 dependencies {
    implementation fileTree(dir: 'libs', include: ['*.jar'])
    implementation rootProject.ext.dependencies.androidxconstraintlayout
-    implementation project(':skin:skin-support')
-    implementation project(':skin:skin-support-appcompat')

    if( Boolean.valueOf(RELEASE) ){
        implementation rootProject.ext.dependencies.skinsupportbase
@@ -32,3 +30,4 @@ dependencies {
    }
 }

+apply from: new File(rootProject.rootDir, "gradle/upload.gradle").toString()
--- a/skin/skin-support-design/build.gradle
+++ b/skin/skin-support-design/build.gradle
@@ -30,3 +30,5 @@ dependencies {
        implementation project(":skin:skin-support-appcompat")
    }
 }
+
+apply from: new File(rootProject.rootDir, "gradle/upload.gradle").toString()
--- a/upload.sh
+++ b/upload.sh
@@ -2,18 +2,12 @@

 ./gradlew :foudations:mogo-utils:clean  :foudations:mogo-utils:uploadArchives
 if [ $? -ne 0 ];then exit; fi
+./gradlew :skin:mogo-skin-support:clean  :skin:mogo-skin-support:uploadArchives
+if [ $? -ne 0 ]; then exit; fi
 ./gradlew :foudations:mogo-commons:clean  :foudations:mogo-commons:uploadArchives
 if [ $? -ne 0 ]; then exit; fi
 ./gradlew :libraries:mogo-map-api:clean  :libraries:mogo-map-api:uploadArchives
 if [ $? -ne 0 ]; then exit; fi
-./gradlew :skin:mogo-skin-light:clean  :skin:mogo-skin-light:uploadArchives
-if [ $? -ne 0 ]; then exit; fi
-./gradlew :skin:mogo-skin-support:clean  :skin:mogo-skin-support:uploadArchives
-if [ $? -ne 0 ]; then exit; fi
-./gradlew :skin:mogo-skin-support-impl:clean  :skin:mogo-skin-support-impl:uploadArchives
-if [ $? -ne 0 ]; then exit; fi
-./gradlew :skin:mogo-skin-support-noop:clean  :skin:mogo-skin-support-noop:uploadArchives
-if [ $? -ne 0 ]; then exit; fi
 ./gradlew :skin:skin-support:clean  :skin:skin-support:uploadArchives
 if [ $? -ne 0 ]; then exit; fi
 ./gradlew :skin:skin-support-appcompat:clean  :skin:skin-support-appcompat:uploadArchives
@@ -24,12 +18,6 @@ if [ $? -ne 0 ]; then exit; fi
 if [ $? -ne 0 ]; then exit; fi
 ./gradlew :skin:skin-support-design:clean  :skin:skin-support-design:uploadArchives
 if [ $? -ne 0 ]; then exit; fi
-./gradlew :test:crashreport:clean  :test:crashreport:uploadArchives
-if [ $? -ne 0 ]; then exit; fi
-./gradlew :test:crashreport-bugly:clean  :test:crashreport-bugly:uploadArchives
-if [ $? -ne 0 ]; then exit; fi
-./gradlew :test:crashreport-noop:clean  :test:crashreport-noop:uploadArchives
-if [ $? -ne 0 ]; then exit; fi
 ./gradlew :services:mogo-service-api:clean  :services:mogo-service-api:uploadArchives
 if [ $? -ne 0 ]; then exit; fi
 ./gradlew :libraries:map-amap:clean  :libraries:map-amap:uploadArchives
@@ -40,6 +28,18 @@ if [ $? -ne 0 ]; then exit; fi
 if [ $? -ne 0 ]; then exit; fi
 ./gradlew :modules:mogo-module-common:clean  :modules:mogo-module-common:uploadArchives
 if [ $? -ne 0 ]; then exit; fi
+./gradlew :skin:mogo-skin-support-impl:clean  :skin:mogo-skin-support-impl:uploadArchives
+if [ $? -ne 0 ]; then exit; fi
+./gradlew :skin:mogo-skin-support-noop:clean  :skin:mogo-skin-support-noop:uploadArchives
+if [ $? -ne 0 ]; then exit; fi
+./gradlew :test:crashreport:clean  :test:crashreport:uploadArchives
+if [ $? -ne 0 ]; then exit; fi
+./gradlew :test:crashreport-bugly:clean  :test:crashreport-bugly:uploadArchives
+if [ $? -ne 0 ]; then exit; fi
+./gradlew :test:crashreport-noop:clean  :test:crashreport-noop:uploadArchives
+if [ $? -ne 0 ]; then exit; fi
+./gradlew :skin:mogo-skin-light:clean  :skin:mogo-skin-light:uploadArchives
+if [ $? -ne 0 ]; then exit; fi
 ./gradlew :services:mogo-service:clean  :services:mogo-service:uploadArchives
 if [ $? -ne 0 ]; then exit; fi
 ./gradlew :modules:mogo-module-obu:clean  :modules:mogo-module-obu:uploadArchives
@@ -78,10 +78,6 @@ if [ $? -ne 0 ]; then exit; fi
 if [ $? -ne 0 ]; then exit; fi
 ./gradlew :main-extensions:mogo-module-main-launcher:clean :main-extensions:mogo-module-main-launcher:uploadArchives
 if [ $? -ne 0 ]; then exit; fi
-./gradlew :modules:mogo-module-event-panel:clean  :modules:mogo-module-event-panel:uploadArchives
-if [ $? -ne 0 ]; then exit; fi
-./gradlew :modules:mogo-module-event-panel-noop:clean  :modules:mogo-module-event-panel-noop:uploadArchives
-if [ $? -ne 0 ]; then exit; fi
 ./gradlew :modules:mogo-module-left-panel:clean  :modules:mogo-module-left-panel:uploadArchives
 if [ $? -ne 0 ]; then exit; fi
 ./gradlew :modules:mogo-module-left-panel-noop:clean  :modules:mogo-module-left-panel-noop:uploadArchives