see 11/30 log

Blankj · Blankj · commit e8f4c74cd0d9 · 2019-11-30T17:15:14.000+08:00
diff --git a/buildApp.gradle b/buildApp.gradle
@@ -13,12 +13,16 @@ apply {
 configSigning()
 configApkName()
 
-bus {
-    onlyScanLibRegex = '^([:]|(com\\.blankj)).+$'
+if (Config.depConfig.plugin_bus.isApply) {
+    bus {
+        onlyScanLibRegex = '^([:]|(com\\.blankj)).+$'
+    }
 }
 
-api {
-    onlyScanLibRegex = '^([:]|(com\\.blankj)).+$'
+if (Config.depConfig.plugin_api.isApply) {
+    api {
+        onlyScanLibRegex = '^([:]|(com\\.blankj)).+$'
+    }
 }
 
 android {
diff --git a/buildSrc/src/main/groovy/Config.groovy b/buildSrc/src/main/groovy/Config.groovy
@@ -25,8 +25,8 @@ class Config {
     static depConfig = [
             /*Never delete this line*/
             /*Generated by "config.json"*/
-            plugin_api_gradle_plugin   : new DepConfig(false, true, ":plugin:api-gradle-plugin"),
-            plugin_bus_gradle_plugin   : new DepConfig(false, true, ":plugin:bus-gradle-plugin"),
+            plugin_api_gradle_plugin   : new DepConfig(true, true, ":plugin:api-gradle-plugin"),
+            plugin_bus_gradle_plugin   : new DepConfig(true, true, ":plugin:bus-gradle-plugin"),
             feature_mock               : new DepConfig(false, true, ":feature:mock"),
             feature_launcher_app       : new DepConfig(true, true, ":feature:launcher:app"),
             feature_main_app           : new DepConfig(false, true, ":feature:main:app"),
@@ -44,17 +44,17 @@ class Config {
             lib_utildebug              : new DepConfig(true, true, ":lib:utildebug", "com.blankj:utildebug:1.25.10-alpha5"),
             lib_utildebug_no_op        : new DepConfig(true, true, ":lib:utildebug-no-op", "com.blankj:utildebug-no-op:1.25.10-alpha5"),
             /*Never delete this line*/
-            plugin_gradle              : new DepConfig(pluginPath: "com.android.tools.build:gradle:3.4.2"),
+            plugin_gradle              : new DepConfig(pluginPath: "com.android.tools.build:gradle:3.5.2"),
             plugin_kotlin              : new DepConfig(pluginPath: "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"),
             plugin_maven               : new DepConfig(pluginPath: "com.github.dcendents:android-maven-gradle-plugin:2.1", pluginId: "com.github.dcendents.android-maven"),// 上传到 maven
             plugin_bintray             : new DepConfig(pluginPath: "com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.4", pluginId: "com.jfrog.bintray"),// 上传到 bintray
             plugin_traute              : new DepConfig(pluginPath: "tech.harmonysoft:traute-gradle:1.1.10", pluginId: "tech.harmonysoft.oss.traute"),// 注解转非空判断
 
-            // 本地第一次上传插件新的版本需设置 useLocal = true, isApply = false
+            // 本地第一次上传插件新的版本需设置 isApply = false, useLocal = true
             // 本地上传成功之后 isApply = true 即可应用插件来调试，后续版本更新无需设置 isApply = false
-            // 发布版本的话把 useLocal = false, isApply = false，更新版本号，发布成功后 isApply = true 即可使用远程库版本
-            plugin_api                 : new DepConfig(isApply: true, useLocal: false, pluginPath: "com.blankj:api-gradle-plugin:1.1", pluginId: "com.blankj.api"),
-            plugin_bus                 : new DepConfig(isApply: true, useLocal: false, pluginPath: "com.blankj:bus-gradle-plugin:2.3", pluginId: "com.blankj.bus"),
+            // 发布版本的话把 isApply = false, useLocal = false，更新版本号，发布成功后 isApply = true 即可使用远程库版本
+            plugin_api                 : new DepConfig(isApply: true, useLocal: false, pluginPath: "com.blankj:api-gradle-plugin:1.2", pluginId: "com.blankj.api"),
+            plugin_bus                 : new DepConfig(isApply: false, useLocal: false, pluginPath: "com.blankj:bus-gradle-plugin:2.4", pluginId: "com.blankj.bus"),
 
             support_appcompat_v7       : new DepConfig("com.android.support:appcompat-v7:$support_version"),
             support_design             : new DepConfig("com.android.support:design:$support_version"),
diff --git a/buildSrc/src/main/groovy/ConfigUtils.groovy b/buildSrc/src/main/groovy/ConfigUtils.groovy
@@ -74,7 +74,7 @@ class ConfigUtils {
     static getApplyPlugins() {
         def plugins = [:]
         for (Map.Entry<String, DepConfig> entry : Config.depConfig.entrySet()) {
-            if (entry.value.isApply && entry.key.startsWith("plugin_")) {
+            if (entry.value.isApply && entry.value.pluginPath != null) {
                 plugins.put(entry.key, entry.value)
             }
         }
diff --git a/buildSrc/src/main/groovy/DepConfig.groovy b/buildSrc/src/main/groovy/DepConfig.groovy
@@ -50,6 +50,11 @@ class DepConfig {
         this.remotePath = remotePath
     }
 
+    void setPluginPath(String pluginPath){
+        this.pluginPath = pluginPath
+        this.remotePath = pluginPath
+    }
+
     String getPath() {
         if (pluginPath != null) return pluginPath
         return useLocal ? localPath : remotePath
diff --git a/config.json b/config.json
@@ -5,8 +5,8 @@
   "pkgConfig": [],
   "proConfigDesc": "proConfig 配置的是使用本地还是仓库，优先级低于 appConfig 和 pkgConfig",
   "proConfig": [
-    {"isApply": false, "useLocal": true, "localPath": ":plugin:api-gradle-plugin"},
-    {"isApply": false, "useLocal": true, "localPath": ":plugin:bus-gradle-plugin"},
+    {"isApply": true, "useLocal": true, "localPath": ":plugin:api-gradle-plugin"},
+    {"isApply": true, "useLocal": true, "localPath": ":plugin:bus-gradle-plugin"},
     {"isApply": true, "useLocal": true, "localPath": ":feature:mock"},
     {"isApply": true, "useLocal": true, "localPath": ":feature:launcher:app"},
     {"isApply": true, "useLocal": true, "localPath": ":feature:main:app"},
diff --git a/lib/utilcode/src/test/java/com/blankj/utilcode/util/BaseTest.java b/lib/utilcode/src/test/java/com/blankj/utilcode/util/BaseTest.java
@@ -40,4 +40,5 @@ public void execute(@NonNull Runnable command) {
     @Test
     public void test() throws Exception {
     }
+
 }
diff --git a/plugin/api-gradle-plugin/CHANGELOG.md b/plugin/api-gradle-plugin/CHANGELOG.md
@@ -1,5 +1,8 @@
 # Change Log
 
+## v1.2
+去除 gradle 版本依赖的问题
+
 ## v1.1(2019/10/30)
 新增 onlyScanLibRegex, jumpScanLibRegex 的 DSL
 
diff --git a/plugin/api-gradle-plugin/README.md b/plugin/api-gradle-plugin/README.md
@@ -28,7 +28,7 @@
 buildscript {
     dependencies {
         ...
-        classpath 'com.blankj:api-gradle-plugin:1.1'
+        classpath 'com.blankj:api-gradle-plugin:1.2'
     }
 }
 ```
diff --git a/plugin/api-gradle-plugin/build.gradle b/plugin/api-gradle-plugin/build.gradle
@@ -24,7 +24,7 @@ gradlePlugin {
 }
 
 dependencies {
-    implementation Config.depConfig.plugin_gradle.dep
+    compileOnly Config.depConfig.plugin_gradle.dep
     implementation Config.depConfig.commons_io.dep
     implementation gradleApi()
     implementation localGroovy()
diff --git a/plugin/bus-gradle-plugin/CHANGELOG.md b/plugin/bus-gradle-plugin/CHANGELOG.md
@@ -1,5 +1,8 @@
 # Change Log
 
+## v2.4
+去除 gradle 版本依赖的问题
+
 ## v2.3
 新增 onlyScanLibRegex, jumpScanLibRegex 的 DSL
 
diff --git a/plugin/bus-gradle-plugin/README.md b/plugin/bus-gradle-plugin/README.md
@@ -19,7 +19,7 @@
 buildscript {
     dependencies {
         ...
-        classpath 'com.blankj:bus-gradle-plugin:2.3'
+        classpath 'com.blankj:bus-gradle-plugin:2.4'
     }
 }
 ```
diff --git a/plugin/bus-gradle-plugin/build.gradle b/plugin/bus-gradle-plugin/build.gradle
@@ -24,7 +24,7 @@ gradlePlugin {
 }
 
 dependencies {
-    implementation Config.depConfig.plugin_gradle.dep
+    compileOnly Config.depConfig.plugin_gradle.dep
     implementation Config.depConfig.commons_io.dep
     implementation gradleApi()
     implementation localGroovy()
diff --git a/plugin/bus-gradle-plugin/src/main/java/com/blankj/bus/BusPlugin.groovy b/plugin/bus-gradle-plugin/src/main/java/com/blankj/bus/BusPlugin.groovy
@@ -12,7 +12,7 @@ class BusPlugin implements Plugin<Project> {
     void apply(Project project) {
         if (project.plugins.hasPlugin(AppPlugin)) {
             LogUtils.init(project)
-            LogUtils.l('project(' + project.toString() + ') apply api gradle plugin!')
+            LogUtils.l('project(' + project.toString() + ') apply bus gradle plugin!')
             project.extensions.create(Config.EXT_NAME, BusExtension)
             def android = project.extensions.getByType(AppExtension)
             android.registerTransform(new BusTransform(project))

Original file line number	Diff line number	Diff line change
`@@ -74,7 +74,7 @@ class ConfigUtils {`
`74`	`74`	`static getApplyPlugins() {`
`75`	`75`	`def plugins = [:]`
`76`	`76`	`for (Map.Entry<String, DepConfig> entry : Config.depConfig.entrySet()) {`
`77`		`- if (entry.value.isApply && entry.key.startsWith("plugin_")) {`
	`77`	`+ if (entry.value.isApply && entry.value.pluginPath != null) {`
`78`	`78`	`plugins.put(entry.key, entry.value)`
`79`	`79`	`}`
`80`	`80`	`}`
Original file line number	Diff line number	Diff line change
`@@ -40,4 +40,5 @@ public void execute(@NonNull Runnable command) {`
`40`	`40`	`@Test`
`41`	`41`	`public void test() throws Exception {`
`42`	`42`	`}`
	`43`	`+`
`43`	`44`	`}`
Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@`
`28`	`28`	`buildscript {`
`29`	`29`	`dependencies {`
`30`	`30`	`...`
`31`		`- classpath 'com.blankj:api-gradle-plugin:1.1'`
	`31`	`+ classpath 'com.blankj:api-gradle-plugin:1.2'`
`32`	`32`	`}`
`33`	`33`	`}`
`34`	`34`	```
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ gradlePlugin {`
`24`	`24`	`}`
`25`	`25`
`26`	`26`	`dependencies {`
`27`		`- implementation Config.depConfig.plugin_gradle.dep`
	`27`	`+ compileOnly Config.depConfig.plugin_gradle.dep`
`28`	`28`	`implementation Config.depConfig.commons_io.dep`
`29`	`29`	`implementation gradleApi()`
`30`	`30`	`implementation localGroovy()`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@`
`19`	`19`	`buildscript {`
`20`	`20`	`dependencies {`
`21`	`21`	`...`
`22`		`- classpath 'com.blankj:bus-gradle-plugin:2.3'`
	`22`	`+ classpath 'com.blankj:bus-gradle-plugin:2.4'`
`23`	`23`	`}`
`24`	`24`	`}`
`25`	`25`	```