From 9bdd1a7ddb79ca8684297a7f82c77650d512b7b2 Mon Sep 17 00:00:00 2001
From: lixiaopeng <lixiaopeng@zhidaoauto.com>
Date: Wed, 25 Mar 2020 14:14:34 +0800
Subject: [PATCH] fixed conflict

---
 app/build.gradle  | 2 ++
 config.gradle     | 7 ++++---
 gradle.properties | 5 ++++-
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index fdd5d4df4c..769c6b8fee 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -117,6 +117,8 @@ dependencies {
         exclude group:'com.mogo.module',module:'module-share'
     }
 
+    implementation rootProject.ext.dependencies.mogomoduleauth
+
     if (Boolean.valueOf(RELEASE)) {
         api rootProject.ext.dependencies.modulemain
         api rootProject.ext.dependencies.mogocommons
diff --git a/config.gradle b/config.gradle
index f9bf8a5958..720ff3a467 100644
--- a/config.gradle
+++ b/config.gradle
@@ -109,8 +109,6 @@ ext {
             modulefreshnews          : "com.mogo.module:module-freshnews:${MOGO_MODULE_FRESH_NEWS_VERSION}",
             //统一返回键
             mogomoduleback           : "com.mogo.module:module-back:${MOGO_MODULE_BACK_VERSION}",
-            mogomoduleauth           : "com.mogo.module:module-authorize:${MOGO_MODULE_AUTHORIZE_VERSION}",
-            mogomoduleguide          : "com.mogo.module:module-guide:${MOGO_MODULE_GUIDE_VERSION}",
             // 长链
             socketsdk                : 'com.zhidao.socketsdk:socketsdk:2.1.1',
             socketsdkconnsvrprotoco  : 'com.zhidao.ptech:connsvr-protoco:0.1.23',
@@ -132,6 +130,9 @@ ext {
             eventbus                 : "org.greenrobot:eventbus:3.1.1",
 
             coroutinescore           : "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.1.1",
-            coroutinesandroid        : "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.1.1"
+            coroutinesandroid        : "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.1.1",
+
+            //授权
+            mogomoduleauth           : "com.mogo.module:module-authorize:${MOGO_MODULE_AUTHORIZE}",
     ]
 }
\ No newline at end of file
diff --git a/gradle.properties b/gradle.properties
index 4298f080fe..f02764bd44 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -66,4 +66,7 @@ MOGO_MODULE_PUSH_VERSION=1.0.0-SNAPSHOT
 # 广告资源位
 MOGO_MODULE_AD_CARD_VERSION=1.0.0-SNAPSHOT
 # 新鲜事
-MOGO_MODULE_FRESH_NEWS_VERSION=1.0.2-SNAPSHOT
\ No newline at end of file
+MOGO_MODULE_FRESH_NEWS_VERSION=1.0.2-SNAPSHOT
+# 授权模块
+MOGO_MODULE_AUTHORIZE=1.0.0-SNAPSHOT
+