From 68ce7a4e402c013d78cf298b6cf467e0349c9b4e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= Date: Mon, 25 Jan 2021 16:10:06 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=BA=86Maven=E4=BE=9D?= =?UTF-8?q?=E8=B5=96=E5=85=B3=E7=B3=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/build.gradle | 16 +++++++++++----- .../java/com/mogo/cloud/MoGoApplication.java | 4 +++- foudations/mogo-commons/build.gradle | 12 ++++++------ foudations/mogo-commons/gradle.properties | 2 +- foudations/mogo-passport/build.gradle | 4 ++-- foudations/mogo-passport/gradle.properties | 2 +- foudations/mogo-socket/build.gradle | 6 ++++-- foudations/mogo-socket/gradle.properties | 2 +- modules/mogo-realtime/build.gradle | 8 ++++++-- modules/mogo-realtime/gradle.properties | 4 ++++ modules/mogo-tanlu/build.gradle | 8 ++++++-- modules/mogo-tanlu/gradle.properties | 2 +- 12 files changed, 46 insertions(+), 24 deletions(-) create mode 100644 modules/mogo-realtime/gradle.properties diff --git a/app/build.gradle b/app/build.gradle index 50cb338..15001c0 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -11,7 +11,7 @@ android { versionName "1.0" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" - + multiDexEnabled true packagingOptions { //解决编译时com.android.builder.merge.DuplicateRelativeFileException: More than one file was found with OS independent path 'META-INF/rxjava.properties'这个错误 exclude 'META-INF/rxjava.properties' @@ -32,13 +32,19 @@ android { dependencies { implementation fileTree(dir: "libs", include: ["*.jar"]) + implementation 'com.android.support:multidex:1.0.3' + implementation rootProject.ext.dependencies.androidxappcompat implementation rootProject.ext.dependencies.androidxconstraintlayout - implementation project(path: ':foudations:mogo-passport') - implementation project(path: ':foudations:mogo-commons') - implementation project(path: ':modules:mogo-tanlu') +// implementation project(path: ':foudations:mogo-passport') + implementation 'com.mogo.cloud:passport:1.0.2-SNAPSHOT' + +// implementation project(path: ':foudations:mogo-commons') + implementation 'com.mogo.cloud:commons:1.0.2-SNAPSHOT' + +// implementation project(path: ':modules:mogo-tanlu') + implementation 'com.mogo.cloud:tanlu:1.0.1-SNAPSHOT' -// implementation 'com.mogo.cloud:passport:1.0.0' implementation rootProject.ext.dependencies.rxjava implementation rootProject.ext.dependencies.rxandroid } \ No newline at end of file diff --git a/app/src/main/java/com/mogo/cloud/MoGoApplication.java b/app/src/main/java/com/mogo/cloud/MoGoApplication.java index 56f6ed5..b87e639 100644 --- a/app/src/main/java/com/mogo/cloud/MoGoApplication.java +++ b/app/src/main/java/com/mogo/cloud/MoGoApplication.java @@ -2,6 +2,8 @@ package com.mogo.cloud; import android.app.Application; +import androidx.multidex.MultiDexApplication; + import com.mogo.cloud.httpdns.MogoHttpDnsConfig; import com.mogo.cloud.httpdns.bean.HttpDnsSimpleLocation; import com.mogo.cloud.httpdns.listener.IHttpDnsCurrentLocation; @@ -15,7 +17,7 @@ import java.util.Random; /** * */ -public class MoGoApplication extends Application { +public class MoGoApplication extends MultiDexApplication { @Override public void onCreate() { super.onCreate(); diff --git a/foudations/mogo-commons/build.gradle b/foudations/mogo-commons/build.gradle index 206caa2..67e6d0a 100644 --- a/foudations/mogo-commons/build.gradle +++ b/foudations/mogo-commons/build.gradle @@ -54,12 +54,12 @@ dependencies { implementation rootProject.ext.dependencies.androidxccorektx implementation rootProject.ext.dependencies.androidxappcompat implementation rootProject.ext.dependencies.okhttpinterceptor - api rootProject.ext.dependencies.retrofit - api rootProject.ext.dependencies.retrofitadapter - api rootProject.ext.dependencies.retrofitconvertergson - api rootProject.ext.dependencies.retrofitconverterscalars - api project(path: ':foudations:mogo-httpdns') - api project(path: ':foudations:mogo-passport') + implementation rootProject.ext.dependencies.retrofit + implementation rootProject.ext.dependencies.retrofitadapter + implementation rootProject.ext.dependencies.retrofitconvertergson + implementation rootProject.ext.dependencies.retrofitconverterscalars +// api project(path: ':foudations:mogo-passport') + api 'com.mogo.cloud:passport:1.0.2-SNAPSHOT' } \ No newline at end of file diff --git a/foudations/mogo-commons/gradle.properties b/foudations/mogo-commons/gradle.properties index ac8dffd..6fc76aa 100644 --- a/foudations/mogo-commons/gradle.properties +++ b/foudations/mogo-commons/gradle.properties @@ -1,4 +1,4 @@ GROUP=com.mogo.cloud POM_ARTIFACT_ID=commons VERSION_CODE=1 -VERSION_NAME=1.0.1-SNAPSHOT \ No newline at end of file +VERSION_NAME=1.0.2-SNAPSHOT \ No newline at end of file diff --git a/foudations/mogo-passport/build.gradle b/foudations/mogo-passport/build.gradle index 86a3073..052799b 100644 --- a/foudations/mogo-passport/build.gradle +++ b/foudations/mogo-passport/build.gradle @@ -33,9 +33,9 @@ dependencies { // passport implementation 'com.zhidao.thirdlogin:third-login:1.0.1' implementation 'com.zhidao.account:accountsdk:1.0.16.1' - api project(path: ':foudations:mogo-httpdns') -// api 'com.mogo.cloud:httpdns:1.0.0' +// api project(path: ':foudations:mogo-httpdns') + api 'com.mogo.cloud:httpdns:1.0.0' } apply from: new File(rootProject.rootDir, "gradle/upload.gradle").toString() \ No newline at end of file diff --git a/foudations/mogo-passport/gradle.properties b/foudations/mogo-passport/gradle.properties index 81fbcd5..237b8d3 100644 --- a/foudations/mogo-passport/gradle.properties +++ b/foudations/mogo-passport/gradle.properties @@ -1,4 +1,4 @@ GROUP=com.mogo.cloud POM_ARTIFACT_ID=passport VERSION_CODE=1 -VERSION_NAME=1.0.0-SNAPSHOT \ No newline at end of file +VERSION_NAME=1.0.2-SNAPSHOT \ No newline at end of file diff --git a/foudations/mogo-socket/build.gradle b/foudations/mogo-socket/build.gradle index 894668f..3aa48c4 100644 --- a/foudations/mogo-socket/build.gradle +++ b/foudations/mogo-socket/build.gradle @@ -30,8 +30,10 @@ dependencies { api 'com.zhidao.socket:built-in-socket:1.0.17' // 上报位置 implementation 'com.zhidao.locupload:loc-upload-sdk:1.1.7' - implementation project(path: ':foudations:mogo-passport') - api rootProject.ext.dependencies.mogoutils + +// implementation project(path: ':foudations:mogo-passport') + implementation 'com.mogo.cloud:passport:1.0.2-SNAPSHOT' + } apply from: new File(rootProject.rootDir, "gradle/upload.gradle").toString() \ No newline at end of file diff --git a/foudations/mogo-socket/gradle.properties b/foudations/mogo-socket/gradle.properties index 59ae673..a3f647d 100644 --- a/foudations/mogo-socket/gradle.properties +++ b/foudations/mogo-socket/gradle.properties @@ -1,4 +1,4 @@ GROUP=com.mogo.cloud POM_ARTIFACT_ID=socket VERSION_CODE=1 -VERSION_NAME=1.0.0 \ No newline at end of file +VERSION_NAME=1.0.2-SNAPSHOT \ No newline at end of file diff --git a/modules/mogo-realtime/build.gradle b/modules/mogo-realtime/build.gradle index e4d20e9..3301054 100644 --- a/modules/mogo-realtime/build.gradle +++ b/modules/mogo-realtime/build.gradle @@ -28,6 +28,10 @@ android { dependencies { implementation fileTree(dir: "libs", include: ["*.jar"]) implementation project(path: ':foudations:mogo-passport') - implementation project(":foudations:mogo-commons") - implementation project(":foudations:mogo-socket") + +// implementation project(":foudations:mogo-commons") + implementation 'com.mogo.cloud:commons:1.0.2-SNAPSHOT' +// implementation project(":foudations:mogo-socket") + implementation 'com.mogo.cloud:socket:1.0.2-SNAPSHOT' + } \ No newline at end of file diff --git a/modules/mogo-realtime/gradle.properties b/modules/mogo-realtime/gradle.properties new file mode 100644 index 0000000..25abd37 --- /dev/null +++ b/modules/mogo-realtime/gradle.properties @@ -0,0 +1,4 @@ +GROUP=com.mogo.cloud +POM_ARTIFACT_ID=realtime +VERSION_CODE=1 +VERSION_NAME=1.0.1-SNAPSHOT \ No newline at end of file diff --git a/modules/mogo-tanlu/build.gradle b/modules/mogo-tanlu/build.gradle index 9f280b6..0bf8d65 100644 --- a/modules/mogo-tanlu/build.gradle +++ b/modules/mogo-tanlu/build.gradle @@ -37,6 +37,10 @@ dependencies { implementation rootProject.ext.dependencies.rxjava implementation rootProject.ext.dependencies.rxandroid - implementation project(path: ':foudations:mogo-commons') -} \ No newline at end of file +// implementation project(path: ':foudations:mogo-commons') + implementation 'com.mogo.cloud:commons:1.0.2-SNAPSHOT' + +} + +apply from: new File(rootProject.rootDir, "gradle/upload.gradle").toString() \ No newline at end of file diff --git a/modules/mogo-tanlu/gradle.properties b/modules/mogo-tanlu/gradle.properties index 7aa6551..55fd76b 100644 --- a/modules/mogo-tanlu/gradle.properties +++ b/modules/mogo-tanlu/gradle.properties @@ -1,4 +1,4 @@ GROUP=com.mogo.cloud POM_ARTIFACT_ID=tanlu VERSION_CODE=1 -VERSION_NAME=1.0.0 \ No newline at end of file +VERSION_NAME=1.0.1-SNAPSHOT \ No newline at end of file