Skip to content

Commit 3279e2d

Browse files
feat: add dexMergeIncremental 开关
1 parent 9979fc3 commit 3279e2d

3 files changed

Lines changed: 10 additions & 5 deletions

File tree

buildSrc/src/main/kotlin/plugin/RocketXPlugin.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ open class RocketXPlugin : Plugin<Project> {
8383
// }
8484
}
8585

86-
mProject.gradle.addBuildListener(RocketXBuildListener(this, mProject, mAllChangedProject))
86+
mProject.gradle.addBuildListener(RocketXBuildListener(this, mProject, mAllChangedProject,mRocketXBean?.dexMergeIncremental?:true))
8787

8888
//开启一些加速的编译项
8989
speedBuildByOption(mProject, mAppExtension)
Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
package plugin.bean
22

3+
34
/**
45
* description:
56
* author chaojiong.zhang
67
* data: 2021/11/10
78
* copyright TCL+
89
*/
9-
open class RocketXBean(var localMaven:Boolean = false, var openLog:Boolean = false, var excludeModule:Set<String> = HashSet())
10+
open class RocketXBean(var localMaven:Boolean = false, var openLog:Boolean = false, var excludeModule:Set<String> = HashSet(),var dexMergeIncremental: Boolean = true)

buildSrc/src/main/kotlin/plugin/listener/RocketXBuildListener.kt

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,8 @@ import java.util.*
2222
class RocketXBuildListener(
2323
private val rocketXPlugin: RocketXPlugin,
2424
private val appProject: Project,
25-
private val mAllChangedProject: MutableMap<String, Project>?
25+
private val mAllChangedProject: MutableMap<String, Project>?,
26+
private val dexMergeIncremental: Boolean
2627
) : BuildListener, TaskExecutionListener {
2728

2829
private var taskStartTime: Long = 0
@@ -50,7 +51,9 @@ class RocketXBuildListener(
5051
}
5152

5253
override fun projectsEvaluated(gradle: Gradle) {
53-
// BeforePreBuildJob(appProject).runCleanAction()
54+
if (!dexMergeIncremental) {
55+
BeforePreBuildJob(appProject).runCleanAction()
56+
}
5457
appProject.rootProject.allprojects.forEach {
5558
//剔除 app 和 rootProject
5659
if (hasAppPlugin(it) || it == appProject.rootProject || it.childProjects.isNotEmpty()) {
@@ -68,7 +71,8 @@ class RocketXBuildListener(
6871
}
6972
//android 子 module
7073
if (childAndroid != null) {
71-
mLocalMaven = AarFlatLocalMaven(childProject, rocketXPlugin, appProject, mAllChangedProject)
74+
mLocalMaven =
75+
AarFlatLocalMaven(childProject, rocketXPlugin, appProject, mAllChangedProject)
7276
} else if (hasJavaPlugin(childProject)) {
7377
//java 子 module
7478
mLocalMaven = JarFlatLocalMaven(childProject, rocketXPlugin, mAllChangedProject)

0 commit comments

Comments
 (0)