Merge remote-tracking branch 'origin/master'

chaojiong1zhang20230913 · chaojiong1zhang20230913 · commit 0278cba73614 · 2022-03-02T10:32:42.000+08:00
# Conflicts:
#	libs/rocketx-1.0.18.jar
diff --git a/README.md b/README.md
@@ -68,7 +68,7 @@ buildscript {
 
 ##
 
-######  使用点击小火箭至喷火icon （enable 状态）,点击编译器 run 按钮 :
+######  使用点击小火箭至喷火icon （开启 状态）,点击编译器 run 按钮 :
 ![assembleDebug](https://github.com/trycatchx/RocketXPlugin/blob/master/IMG/assembleDebug.jpeg)
 
 ######  如果你有多个 app module 也可选择 Assemble${flavor}${buildType} task 进行 run
diff --git a/buildSrc/src/main/kotlin/plugin/AppProjectDependencies.kt b/buildSrc/src/main/kotlin/plugin/AppProjectDependencies.kt
@@ -19,15 +19,17 @@ import java.util.*
  * copyright TCL+
  */
 open class AppProjectDependencies(
-    var project: Project,
-    var android: AppExtension,
-    val rocketXBean: RocketXBean?,
-    val mAllChangedProject: MutableMap<String, Project>? = null,
-    var listener: ((finish: Boolean) -> Unit)? = null) {
+    private val project: Project,
+    private val android: AppExtension,
+    private val rocketXBean: RocketXBean?,
+    private val mAllChangedProject: MutableMap<String, Project>? = null,
+    private val listener: ((finish: Boolean) -> Unit)? = null) {
+
     var isFirst = true
 
-    var mAllChildProjectDependenciesList = arrayListOf<ChildProjectDependencies>()
-    lateinit var mDependenciesHelper: DependenciesHelper
+    val mAllChildProjectDependenciesList = arrayListOf<ChildProjectDependencies>()
+
+    private lateinit var mDependenciesHelper: DependenciesHelper
 
     init {
         val projectsEvaluatedList = hookProjectsEvaluatedAction()
@@ -95,17 +97,17 @@ open class AppProjectDependencies(
         return removeDispatch
     }
 
-    fun resolveDenpendency() {
-        project.rootProject.allprojects.forEach {
-            //剔除 rootProject 和 有多级目录的 parent folder
-            if (it != project.rootProject && it.childProjects.size <= 0) {
-                //每一个 project 的依赖，都在 ProjectDependencies 里面解决
-                val project = ChildProjectDependencies(it, android, mAllChangedProject)
-                mAllChildProjectDependenciesList.add(project)
-            }
+    private fun resolveDenpendency() {
+        //剔除 rootProject 和 有多级目录的 parent folder
+        project.rootProject.allprojects.filter { it != project.rootProject && it.childProjects.isEmpty() }.forEach {
+            //每一个 project 的依赖，都在 ProjectDependencies 里面解决
+            val project = ChildProjectDependencies(it, android, mAllChangedProject)
+            mAllChildProjectDependenciesList.add(project)
         }
+
         //生成拥有整个依赖图的工具类（只能在此处才能生成）
         mDependenciesHelper = DependenciesHelper(rocketXBean, mAllChildProjectDependenciesList)
+
         mAllChildProjectDependenciesList.forEach {
             it.doDependencies(mDependenciesHelper)
         }
diff --git a/buildSrc/src/main/kotlin/plugin/RocketXPlugin.kt b/buildSrc/src/main/kotlin/plugin/RocketXPlugin.kt
@@ -15,6 +15,7 @@ import plugin.localmaven.mavenPublish
 import plugin.utils.*
 import plugin.utils.FileUtil.getLocalMavenCacheDir
 import java.io.File
+import java.util.*
 import kotlin.reflect.jvm.isAccessible
 
 
@@ -38,21 +39,26 @@ open class RocketXPlugin : Plugin<Project> {
     lateinit var android: AppExtension
     var mRocketXBean: RocketXBean? = null
     lateinit var mAppProjectDependencies: AppProjectDependencies
-    val mAllChangedProject by lazy {
+
+    private val mAllChangedProject by lazy {
         ChangeModuleUtils.getChangeModuleMap(appProject)
     }
 
-    val mFlavorBuildType by lazy {
+    private val mFlavorBuildType by lazy {
         getFlavorBuildType(appProject)
     }
 
     override fun apply(project: Project) {
         //应用在 主 project 上，也就是 app module
         mRocketXBean = project.extensions.create("RocketX", RocketXBean::class.java)
-        if (!isEnable(project) || hasAndroidPlugin(project) || !isCurProjectRun(project)) return
+        if (!isEnable(project) || hasAndroidPlugin(project) || !isCurProjectRun(project)){
+            return
+        }
         this.appProject = project
         //禁止 release 使用加速插件
-        if (mFlavorBuildType.toLowerCase().contains("release")) return
+        if (mFlavorBuildType.toLowerCase(Locale.ROOT).contains("release")) {
+            return
+        }
         FileUtil.attach(project)
         flatDirs()
         android = project.extensions.getByType(AppExtension::class.java)
@@ -82,10 +88,9 @@ open class RocketXPlugin : Plugin<Project> {
             }
         }
 
-        mAppProjectDependencies =
-            AppProjectDependencies(project, android, mRocketXBean, mAllChangedProject) {
-                pritlnDependencyGraph()
-            }
+        mAppProjectDependencies = AppProjectDependencies(project, android, mRocketXBean, mAllChangedProject) {
+            pritlnDependencyGraph()
+        }
 
         appProject.gradle.taskGraph.addTaskExecutionListener(object : TaskExecutionListener {
             override fun beforeExecute(p0: Task) {
@@ -114,7 +119,7 @@ open class RocketXPlugin : Plugin<Project> {
      */
     fun flatDirs() {
         val map = mutableMapOf<String, File>()
-        map.put("dirs", File(getLocalMavenCacheDir()))
+        map["dirs"] = File(getLocalMavenCacheDir())
         appProject.rootProject.allprojects {
             it.repositories.flatDir(map)
         }
@@ -126,12 +131,16 @@ open class RocketXPlugin : Plugin<Project> {
      */
     fun doAfterEvaluated() {
 
-        BeforePreBuildJob(appProject).runCleanAction()
+//        BeforePreBuildJob(appProject).runCleanAction()
 
         appProject.rootProject.allprojects.forEach {
             //剔除 app 和 rootProject
-            if (hasAppPlugin(it) || it == appProject.rootProject || it.childProjects.size > 0) return@forEach
-            if (mAllChangedProject?.contains(it.path)?.not() != false) return@forEach
+            if (hasAppPlugin(it) || it == appProject.rootProject || it.childProjects.isNotEmpty()) {
+                return@forEach
+            }
+            if (mAllChangedProject?.contains(it.path)?.not() != false) {
+                return@forEach
+            }
             var mLocalMaven: LocalMaven? = null
             val childProject = it.project
             var childAndroid: LibraryExtension? = null
@@ -141,14 +150,10 @@ open class RocketXPlugin : Plugin<Project> {
             }
             //android 子 module
             if (childAndroid != null) {
-                mLocalMaven = AarFlatLocalMaven(childProject,
-                    this@RocketXPlugin,
-                    appProject,
-                    mAllChangedProject)
+                mLocalMaven = AarFlatLocalMaven(childProject, this@RocketXPlugin, appProject, mAllChangedProject)
             } else if (hasJavaPlugin(childProject)) {
                 //java 子 module
-                mLocalMaven =
-                    JarFlatLocalMaven(childProject, this@RocketXPlugin, mAllChangedProject)
+                mLocalMaven = JarFlatLocalMaven(childProject, this@RocketXPlugin, mAllChangedProject)
             }
             //需要上传到 localMaven
             mLocalMaven?.uploadLocalMaven()
@@ -184,29 +189,23 @@ open class RocketXPlugin : Plugin<Project> {
             }
         }
         //并行运行task
-        appProject.gradle.startParameter.setParallelProjectExecutionEnabled(true)
+        appProject.gradle.startParameter.isParallelProjectExecutionEnabled = true
         appProject.gradle.startParameter.maxWorkerCount += 4
     }
 
 
     //打印处理完的整个依赖图
-    fun pritlnDependencyGraph() {
-        mAppProjectDependencies.mAllChildProjectDependenciesList.forEach {
-            LogUtil.d("======project name: ${it.project.name}==========")
-            it.allConfigList.forEach {
-                if (it.dependencies.size > 0) {
-                    LogUtil.d("=====Config name:${it.name} ===== ")
-                    it.dependencies.forEach {
-                        LogUtil.d("dependency:" + it.hashCode())
-                        LogUtil.d("dependency:$it")
-                    }
+    private fun pritlnDependencyGraph() {
+        mAppProjectDependencies.mAllChildProjectDependenciesList.forEach { it ->
+            LogUtil.d("======project name: ${it.project.name}========== start")
+            it.allConfigList.filter { it.dependencies.isNotEmpty() }.forEach { configuration ->
+                LogUtil.d("======Config name:${configuration.name}")
+                configuration.dependencies.forEach {
+                    LogUtil.d("dependency:   $it    ${it.hashCode()}")
                 }
             }
-
-            LogUtil.d("======project name: ========== end")
+            LogUtil.d("======project name: ${it.project.name}========== end \n")
         }
     }
 
-}
-
-
+}
diff --git a/buildSrc/src/main/kotlin/plugin/utils/PluginUtil.kt b/buildSrc/src/main/kotlin/plugin/utils/PluginUtil.kt
@@ -3,6 +3,7 @@ package plugin.utils
 import org.gradle.api.Project
 import plugin.RocketXPlugin
 import java.io.File
+import java.util.*
 
 /**
  * description:
@@ -42,15 +43,15 @@ fun isEnable(curProject: Project): Boolean {
 //通过 startParameter 获取  FlavorBuildType
 fun getFlavorBuildType(appProject: Project): String {
     var flavorBuildType = ""
-    val arg = appProject.gradle.startParameter?.taskRequests?.getOrNull(0)?.args?.getOrNull(0)
+    val arg = appProject.gradle.startParameter.taskRequests.getOrNull(0)?.args?.getOrNull(0)
     if (!arg.isNullOrEmpty()) {
         var index = arg.indexOf(RocketXPlugin.ASSEMBLE)
         index = if (index > -1) index + RocketXPlugin.ASSEMBLE.length else 0
         flavorBuildType = arg.substring(index, arg.length)
     }
-    if (flavorBuildType.length > 0) {
+    if (flavorBuildType.isNotEmpty()) {
         flavorBuildType =
-            flavorBuildType.substring(0, 1).toLowerCase() + flavorBuildType.substring(1)
+            flavorBuildType.substring(0, 1).toLowerCase(Locale.ROOT) + flavorBuildType.substring(1)
     }
     return flavorBuildType
 }
@@ -63,18 +64,18 @@ fun getFlatAarName(project: Project): String {
 fun isCurProjectRun(appProject: Project): Boolean {
     var ret = false
     var projectPath = ""
-    val arg = appProject.gradle.startParameter?.taskRequests?.getOrNull(0)?.args?.getOrNull(0)
+    val arg = appProject.gradle.startParameter.taskRequests.getOrNull(0)?.args?.getOrNull(0)
     if (!arg.isNullOrEmpty()) {
         var index = arg.indexOf(RocketXPlugin.ASSEMBLE)
         index = if (index > 0) index - 1 else 0
         projectPath = arg.substring(0, index)
     }
-    if (projectPath.length > 0) {
+    if (projectPath.isNotEmpty()) {
         //使用 app 直接 run，currentDir 为项目目录没法使用，只能通过 截取 arg
         ret = appProject.path.equals(projectPath)
     }
     // 使用 assembledebug 命令需要这么区分
-    if (appProject.gradle.startParameter?.currentDir?.absolutePath.equals(appProject.projectDir.absolutePath)) {
+    if (appProject.gradle.startParameter.currentDir.absolutePath.equals(appProject.projectDir.absolutePath)) {
         ret = true
     }
 
diff --git a/libs/rocketx-1.0.18.jar b/libs/rocketx-1.0.18.jar
diff --git a/maven-publish.gradle b/maven-publish.gradle
@@ -7,7 +7,7 @@ apply plugin: 'signing'
 def artifact = 'rocketx'
 def libraryName = 'videoprogressview-sdk'
 def libraryDescription = 'speed build plugin'
-def libraryVersion = '1.0.17'
+def libraryVersion = '1.0.18'
 
 def publishedGroupId='io.github.trycatchx'
 def siteUrl='https://github.com/trycatchx/RocketXPlugin'
