演示将公共库的依赖放在cc-settings.gradle的自定义文件中：cc-settings-demo.gradle,不需要在每个组件…

…中重复去添加依赖
luckybilly · Sep 16, 2018 · 9bb1660 · 9bb1660
1 parent 9724cb9
commit 9bb1660
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 9 deletions.
diff --git a/cc-settings-demo-b.gradle → cc-settings-demo.gradle b/cc-settings-demo-b.gradle → cc-settings-demo.gradle
@@ -11,6 +11,7 @@ apply from: rootProject.file('cc-settings.gradle')
 //apply from: 'https://raw.githubusercontent.com/luckybilly/CC/master/cc-settings.gradle'
 
 dependencies {
+    implementation project(':demo_base')
     //2018-06-03新增：这里是为了示例添加全局拦截器
     if (project.ext.has('runAsApp') && project.ext.runAsApp) {
         //说明：需要兼容的情况有3种(单独组件作为app运行、打包在主app内、组件在多个app上复用但全局拦截器不同)
@@ -44,6 +45,6 @@ ccregister.registerInfo.add([
     , 'codeInsertToMethodName'  : 'initProcessors'
     , 'registerMethodName'      : 'add'
 ])
+//也可以按照上述格式继续添加你自己的自动注册需求，俗称：搭顺风车
 
 ccregister.multiProcessEnabled = true
-//也可以按照上述格式继续添加你自己的自动注册需求，俗称：搭顺风车
diff --git a/demo/build.gradle b/demo/build.gradle
@@ -1,5 +1,5 @@
 ext.mainApp = true  //设置为true，表示此module为主app module，一直以application方式编译
-apply from: rootProject.file('cc-settings-demo-b.gradle')
+apply from: rootProject.file('cc-settings-demo.gradle')
 
 android {
     compileSdkVersion rootProject.compileVersion
@@ -48,9 +48,9 @@ dependencies {
     //      maven依赖  : 'com.billy.demo:demoB:1.1.0' //如果使用了maven私服，请使用此方式
     addComponent 'demo_component_a'
     addComponent 'demo_component_kt'
+    addComponent 'demo_component_jsbridge'
 
     //单独运行demo_component_b时，只需在local.properties中添加demo_component_b=true即可
     // 此处无需修改，再次运行demo:assembleXxx时将不会把demo_component_b打包进apk
     addComponent 'demo_component_b', project(':demo_component_b') // 这里参数2可以省略
-    implementation project(':demo_base')
 }
diff --git a/demo_base/build.gradle b/demo_base/build.gradle
@@ -1,5 +1,4 @@
-ext.alwaysLib = true //虽然apply了cc-settings.gradle，但一直作为library编译，否则别的组件依赖此module时会报错
-apply from: rootProject.file('cc-settings.gradle')
+apply plugin: 'com.android.library'
 
 android {
     compileSdkVersion rootProject.compileVersion
@@ -23,4 +22,5 @@ android {
 
 dependencies {
     implementation 'com.google.code.gson:gson:2.8.4'
+    api rootProject.ext.deps.cc
 }
diff --git a/demo_component_a/build.gradle b/demo_component_a/build.gradle
@@ -1,6 +1,6 @@
 //apply from: 'https://raw.githubusercontent.com/luckybilly/CC/master/cc-settings.gradle'
 //修改CC框架代码进行本地测试时使用下面的文件
-apply from: rootProject.file('cc-settings.gradle')
+apply from: rootProject.file('cc-settings-demo.gradle')
 
 android {
     compileSdkVersion rootProject.compileVersion

diff --git a/demo_component_b/build.gradle b/demo_component_b/build.gradle
@@ -1,5 +1,5 @@
 
-apply from: rootProject.file('cc-settings-demo-b.gradle')
+apply from: rootProject.file('cc-settings-demo.gradle')
 
 android {
     compileSdkVersion rootProject.compileVersion
@@ -29,5 +29,4 @@ android {
 
 dependencies {
     implementation "com.android.support:appcompat-v7:${rootProject.supportVersion}"
-    implementation project(':demo_base')
 }
diff --git a/demo_component_kt/build.gradle b/demo_component_kt/build.gradle
@@ -1,4 +1,4 @@
-apply from: rootProject.file('cc-settings.gradle')
+apply from: rootProject.file('cc-settings-demo.gradle')
 apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-android-extensions'
 android {