Skip to content

Commit 6ee402e

Browse files
JeasonWonglomanyong
authored andcommitted
simplify hook multidex task
1 parent d530a18 commit 6ee402e

File tree

2 files changed

+3
-46
lines changed

2 files changed

+3
-46
lines changed

freeline-gradle-plugin/src/main/groovy/com/antfortune/freeline/Constants.groovy

Lines changed: 0 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -9,45 +9,4 @@ class Constants {
99

1010
public static final String FREELINE_PRO_DESC_FILE_NAME = "freeline_project_description.json"
1111

12-
public static final List<String> FREELINE_CLASSES = new ArrayList<>()
13-
14-
static {
15-
FREELINE_CLASSES.add('com/antfortune/freeline/BuildConfig.class')
16-
FREELINE_CLASSES.add('com/antfortune/freeline/FreelineApplication.class')
17-
FREELINE_CLASSES.add('com/antfortune/freeline/FreelineCore.class')
18-
FREELINE_CLASSES.add('com/antfortune/freeline/FreelineReceiver.class')
19-
FREELINE_CLASSES.add('com/antfortune/freeline/FreelineService$InnerService.class')
20-
FREELINE_CLASSES.add('com/antfortune/freeline/FreelineService.class')
21-
FREELINE_CLASSES.add('com/antfortune/freeline/IDynamic.class')
22-
FREELINE_CLASSES.add('com/antfortune/freeline/MiddlewareActivity$1.class')
23-
FREELINE_CLASSES.add('com/antfortune/freeline/MiddlewareActivity.class')
24-
FREELINE_CLASSES.add('com/antfortune/freeline/gradle/GradleDynamic.class')
25-
FREELINE_CLASSES.add('com/antfortune/freeline/resources/MonkeyPatcher.class')
26-
FREELINE_CLASSES.add('com/antfortune/freeline/router/ISchemaAction.class')
27-
FREELINE_CLASSES.add('com/antfortune/freeline/router/Router.class')
28-
FREELINE_CLASSES.add('com/antfortune/freeline/router/schema/CheckResourceSchema.class')
29-
FREELINE_CLASSES.add('com/antfortune/freeline/router/schema/CheckSyncSchema.class')
30-
FREELINE_CLASSES.add('com/antfortune/freeline/router/schema/CloseLonglinkSchema.class')
31-
FREELINE_CLASSES.add('com/antfortune/freeline/router/schema/PushDexSchema.class')
32-
FREELINE_CLASSES.add('com/antfortune/freeline/router/schema/PushFullResourcePackSchema.class')
33-
FREELINE_CLASSES.add('com/antfortune/freeline/router/schema/PushNativeSchema.class')
34-
FREELINE_CLASSES.add('com/antfortune/freeline/router/schema/PushResourceSchema.class')
35-
FREELINE_CLASSES.add('com/antfortune/freeline/router/schema/RestartSchema.class')
36-
FREELINE_CLASSES.add('com/antfortune/freeline/server/EmbedHttpServer$BodyInputStream.class')
37-
FREELINE_CLASSES.add('com/antfortune/freeline/server/EmbedHttpServer$ResponseOutputStream.class')
38-
FREELINE_CLASSES.add('com/antfortune/freeline/server/EmbedHttpServer.class')
39-
FREELINE_CLASSES.add('com/antfortune/freeline/server/LongLinkServer.class')
40-
FREELINE_CLASSES.add('com/antfortune/freeline/util/ActivityManager$1.class')
41-
FREELINE_CLASSES.add('com/antfortune/freeline/util/ActivityManager$2.class')
42-
FREELINE_CLASSES.add('com/antfortune/freeline/util/ActivityManager$3.class')
43-
FREELINE_CLASSES.add('com/antfortune/freeline/util/ActivityManager$4.class')
44-
FREELINE_CLASSES.add('com/antfortune/freeline/util/ActivityManager.class')
45-
FREELINE_CLASSES.add('com/antfortune/freeline/util/AppUtils.class')
46-
FREELINE_CLASSES.add('com/antfortune/freeline/util/DexUtils.class')
47-
FREELINE_CLASSES.add('com/antfortune/freeline/util/FileUtils.class')
48-
FREELINE_CLASSES.add('com/antfortune/freeline/util/NativeUtils.class')
49-
FREELINE_CLASSES.add('com/antfortune/freeline/util/ReflectUtil.class')
50-
FREELINE_CLASSES.add('com/antfortune/freeline/FreelineConfig.class')
51-
}
52-
5312
}

freeline-gradle-plugin/src/main/groovy/com/antfortune/freeline/FreelinePlugin.groovy

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -395,13 +395,11 @@ class FreelinePlugin implements Plugin<Project> {
395395
}
396396

397397
if (multiDexEnabled && applicationProxy) {
398-
def mainDexListFile = new File("${project.buildDir}/intermediates/multi-dex/${variant.dirName}/maindexlist.txt")
398+
def manifestKeepFile = new File("${project.buildDir}/intermediates/multi-dex/${variant.dirName}/manifest_keep.txt")
399399
if (multiDexListTask) {
400400
multiDexListTask.outputs.upToDateWhen { false }
401-
multiDexListTask.doLast {
402-
Constants.FREELINE_CLASSES.each { clazz ->
403-
mainDexListFile << "\n${clazz}"
404-
}
401+
multiDexListTask.doFirst {
402+
manifestKeepFile << "-keep class com.antfortune.freeline.** { *; }"
405403
}
406404
}
407405
}

0 commit comments

Comments
 (0)