Skip to content

Commit 42a6220

Browse files
author
berstanio
committed
Enable predexing and other proguard levels than all again.
This is achieved with L8
1 parent 7b7e619 commit 42a6220

File tree

5 files changed

+136
-26
lines changed

5 files changed

+136
-26
lines changed

‎src/main/java/org/moe/gradle/MoeExtension.java‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -150,4 +150,9 @@ public File getPlatformJar() {
150150
return plugin.getSDK().getPlatformJar(platform);
151151
}
152152

153+
@Nullable
154+
public File getPlatformDex() {
155+
return plugin.getSDK().getPlatformDex(platform);
156+
}
157+
153158
}

‎src/main/java/org/moe/gradle/MoeSDK.java‎

Lines changed: 48 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -349,14 +349,19 @@ private void validateSDK(@NotNull Path path, boolean isLocalSDK) {
349349

350350
try {
351351
validate(DIR, path, "");
352+
validate(FIL, path, "sdk/moe-desugared-dex.jar");
353+
validate(FIL, path, "sdk/moe-desugared-lib.json");
354+
validate(FIL, path, "sdk/moe-core-dex.jar");
352355
validate(FIL, path, "sdk/moe-core.jar");
353356
validate(FIL, path, "sdk/moe-core-javadoc.jar");
354357
validate(FIL, path, "sdk/moe-core-sources.jar");
355358

359+
validate(FIL, path, "sdk/moe-ios-junit-dex.jar");
356360
validate(FIL, path, "sdk/moe-ios-junit.jar");
357361
validate(FIL, path, "sdk/moe-ios-junit-javadoc.jar");
358362
validate(FIL, path, "sdk/moe-ios-junit-sources.jar");
359363

364+
validate(FIL, path, "sdk/moe-ios-dex.jar");
360365
validate(FIL, path, "sdk/moe-ios.jar");
361366
validate(FIL, path, "sdk/moe-ios-javadoc.jar");
362367
validate(FIL, path, "sdk/moe-ios-sources.jar");
@@ -367,7 +372,6 @@ private void validateSDK(@NotNull Path path, boolean isLocalSDK) {
367372
}
368373

369374
validate(FIL | EXE, path, "tools/dex2oat");
370-
validate(FIL, path, "tools/dx.jar");
371375
validate(FIL, path, "tools/ios-device.jar");
372376
validate(FIL, path, "tools/java8support.jar");
373377
validate(DIR, path, "tools/macosx");
@@ -407,14 +411,20 @@ private void validate(int type, @NotNull Path path, @NotNull String sub) throws
407411
private @Nullable File MOE_SDK_ROOT;
408412
private @Nullable File MOE_SDK_SDK_DIR;
409413
private @Nullable File MOE_SDK_TOOLS_DIR;
414+
415+
private @Nullable File MOE_SDK_DESUGARED_LIB_JSON;
416+
private @Nullable File MOE_SDK_DESUGARED_DEX;
410417
private @Nullable File MOE_SDK_CORE_JAR;
418+
private @Nullable File MOE_SDK_CORE_DEX;
411419
private @Nullable File MOE_SDK_CORE_SOURCES_JAR;
412420
private @Nullable File MOE_SDK_CORE_JAVADOC_JAR;
413421
private @Nullable File MOE_SDK_IOS_JAVADOC_JAR;
414422
private @Nullable File MOE_SDK_IOS_JUNIT_JAR;
423+
private @Nullable File MOE_SDK_IOS_JUNIT_DEX;
415424
private @Nullable File MOE_SDK_IOS_JUNIT_SOURCES_JAR;
416425
private @Nullable File MOE_SDK_IOS_JUNIT_JAVADOC_JAR;
417426
private @Nullable File MOE_SDK_IOS_JAR;
427+
private @Nullable File MOE_SDK_IOS_DEX;
418428
private @Nullable File MOE_SDK_IOS_SOURCES_JAR;
419429
private @Nullable File MOE_SDK_DEX2OAT_EXEC;
420430
private @Nullable File MOE_SDK_DX_JAR;
@@ -433,13 +443,18 @@ private void bakeSDKPaths(@NotNull Path path) {
433443
MOE_SDK_ROOT = path.toFile();
434444
MOE_SDK_SDK_DIR = path.resolve("sdk").toFile();
435445
MOE_SDK_TOOLS_DIR = path.resolve("tools").toFile();
446+
MOE_SDK_DESUGARED_LIB_JSON = path.resolve("sdk/moe-desugared-lib.json").toFile();
447+
MOE_SDK_DESUGARED_DEX = path.resolve("sdk/moe-desugared-dex.jar").toFile();
436448
MOE_SDK_CORE_JAR = path.resolve("sdk/moe-core.jar").toFile();
449+
MOE_SDK_CORE_DEX = path.resolve("sdk/moe-core-dex.jar").toFile();
437450
MOE_SDK_CORE_SOURCES_JAR = path.resolve("sdk/moe-core-sources.jar").toFile();
438451
MOE_SDK_CORE_JAVADOC_JAR = path.resolve("sdk/moe-core-javadoc.jar").toFile();
439452
MOE_SDK_IOS_JAR = path.resolve("sdk/moe-ios.jar").toFile();
453+
MOE_SDK_IOS_DEX = path.resolve("sdk/moe-ios-dex.jar").toFile();
440454
MOE_SDK_IOS_SOURCES_JAR = path.resolve("sdk/moe-ios-sources.jar").toFile();
441455
MOE_SDK_IOS_JAVADOC_JAR = path.resolve("sdk/moe-ios-javadoc.jar").toFile();
442456
MOE_SDK_IOS_JUNIT_JAR = path.resolve("sdk/moe-ios-junit.jar").toFile();
457+
MOE_SDK_IOS_JUNIT_DEX = path.resolve("sdk/moe-ios-junit-dex.jar").toFile();
443458
MOE_SDK_IOS_JUNIT_SOURCES_JAR = path.resolve("sdk/moe-ios-junit-sources.jar").toFile();
444459
MOE_SDK_IOS_JUNIT_JAVADOC_JAR = path.resolve("sdk/moe-ios-junit-javadoc.jar").toFile();
445460
MOE_SDK_DEX2OAT_EXEC = path.resolve("tools/dex2oat").toFile();
@@ -472,6 +487,15 @@ public File getToolsDir() {
472487
return safeVariable(MOE_SDK_TOOLS_DIR, "MOE_SDK_TOOLS_DIR");
473488
}
474489

490+
@NotNull
491+
public File getDesugaredLibJson() {
492+
return safeVariable(MOE_SDK_DESUGARED_LIB_JSON, "MOE_SDK_DESUGARED_LIB_JSON");
493+
}
494+
@NotNull
495+
public File getDesugaredLibDex() {
496+
return safeVariable(MOE_SDK_DESUGARED_DEX, "MOE_SDK_DESUGARED_DEX");
497+
}
498+
475499
@NotNull
476500
public File getCoreJar() {
477501
return safeVariable(MOE_SDK_CORE_JAR, "MOE_SDK_CORE_JAR");
@@ -489,6 +513,11 @@ public File getCoreSourcesJar() {
489513
return safeVariable(MOE_SDK_CORE_SOURCES_JAR, "MOE_SDK_CORE_SOURCES_JAR");
490514
}
491515

516+
@NotNull
517+
public File getCoreDex() {
518+
return safeVariable(MOE_SDK_CORE_DEX, "MOE_SDK_CORE_DEX");
519+
}
520+
492521
@NotNull
493522
@IgnoreUnused
494523
public File getiOSJavadocJar() {
@@ -518,11 +547,22 @@ public File getiOSJUnitSourcesJar() {
518547
return safeVariable(MOE_SDK_IOS_JUNIT_SOURCES_JAR, "MOE_SDK_IOS_JUNIT_SOURCES_JAR");
519548
}
520549

550+
@NotNull
551+
@IgnoreUnused
552+
public File getiOSJUnitDex() {
553+
return safeVariable(MOE_SDK_IOS_JUNIT_DEX, "MOE_SDK_IOS_JUNIT_DEX");
554+
}
555+
521556
@NotNull
522557
private File getiOSJar() {
523558
return safeVariable(MOE_SDK_IOS_JAR, "MOE_SDK_IOS_JAR");
524559
}
525560

561+
@NotNull
562+
private File getiOSDex() {
563+
return safeVariable(MOE_SDK_IOS_DEX, "MOE_SDK_IOS_DEX");
564+
}
565+
526566
@NotNull
527567
public File getDex2OatExec() {
528568
return safeVariable(MOE_SDK_DEX2OAT_EXEC, "MOE_SDK_DEX2OAT_EXEC");
@@ -594,6 +634,13 @@ public File getPlatformJar(final @NotNull MoePlatform platform) {
594634
throw new GradleException("platform jar is unsupported for " + platform.displayName);
595635
}
596636

637+
@NotNull
638+
public File getPlatformDex(final @NotNull MoePlatform platform) {
639+
if (platform == MoePlatform.IOS) {
640+
return getiOSDex();
641+
}
642+
throw new GradleException("platform dex is unsupported for " + platform.displayName);
643+
}
597644
@NotNull
598645
private static <T> T safeVariable(@Nullable T variable, @NotNull String name) {
599646
return Require.nonNull(variable, "Unable to access MOE SDK variable '" + name + "'");

‎src/main/java/org/moe/gradle/tasks/Dex2Oat.java‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,13 @@
2525
import org.gradle.api.tasks.OutputFile;
2626
import org.gradle.api.tasks.SourceSet;
2727
import org.moe.common.utils.NativeUtil;
28+
import org.moe.gradle.MoeExtension;
2829
import org.moe.gradle.MoePlugin;
2930
import org.moe.gradle.MoeSDK;
3031
import org.moe.gradle.anns.IgnoreUnused;
3132
import org.moe.gradle.anns.NotNull;
3233
import org.moe.gradle.anns.Nullable;
34+
import org.moe.gradle.options.ProGuardOptions;
3335
import org.moe.gradle.remote.Server;
3436
import org.moe.gradle.remote.file.FileList;
3537
import org.moe.gradle.utils.Arch;
@@ -326,6 +328,7 @@ protected final void setupMoeTask(@NotNull SourceSet sourceSet, @NotNull Mode mo
326328

327329
setSupportsRemoteBuild(true);
328330

331+
final MoeExtension ext = getMoeExtension();
329332
final MoeSDK sdk = getMoeSDK();
330333

331334
// Construct default output path
@@ -360,6 +363,23 @@ protected final void setupMoeTask(@NotNull SourceSet sourceSet, @NotNull Mode mo
360363
addConvention(CONVENTION_INPUT_FILES, () -> {
361364
final Set<File> files = new HashSet<>();
362365
files.add(r8Task.getOutJar());
366+
switch (ext.proguard.getLevelRaw()) {
367+
case ProGuardOptions.LEVEL_APP:
368+
files.add(sdk.getCoreDex());
369+
if (ext.getPlatformDex() != null) {
370+
files.add(ext.getPlatformDex());
371+
}
372+
files.add(sdk.getDesugaredLibDex());
373+
break;
374+
case ProGuardOptions.LEVEL_PLATFORM:
375+
files.add(sdk.getCoreDex());
376+
files.add(sdk.getDesugaredLibDex());
377+
break;
378+
case ProGuardOptions.LEVEL_ALL:
379+
break;
380+
default:
381+
throw new IllegalStateException();
382+
}
363383
return files;
364384
});
365385
addConvention(CONVENTION_COMPILER_BACKEND, () -> BACKEND_QUICK);

‎src/main/java/org/moe/gradle/tasks/R8.java‎

Lines changed: 61 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,7 @@ public class R8 extends AbstractBaseTask {
7474
private static final String CONVENTION_OBFUSCATION_ENABLED = "obfuscationEnabled";
7575
private static final String CONVENTION_COLLECTOR_ENABLED = "collectorEnabled";
7676
private static final String CONVENTION_DEBUG_ENABLED = "debugEnabled";
77+
private static final String CONVENTION_DESUGAR_CONFIG = "desugarConfig";
7778

7879
@Nullable
7980
private Object r8Jar;
@@ -255,6 +256,22 @@ public boolean isDebugEnabled() {
255256
return getOrConvention(debugEnabled, CONVENTION_DEBUG_ENABLED);
256257
}
257258

259+
@Nullable
260+
private File desugarConfig;
261+
262+
@IgnoreUnused
263+
public void setDesugarConfig(@Nullable File desugarConfig) {
264+
this.desugarConfig = desugarConfig;
265+
}
266+
267+
@InputFile
268+
@Nullable
269+
@Optional
270+
public File getDesugarConfig() {
271+
Object f = nullableGetOrConvention(desugarConfig, CONVENTION_DESUGAR_CONFIG);
272+
return f == null ? null : getProject().file(f);
273+
}
274+
258275
@Nullable
259276
private Object mappingFile;
260277

@@ -290,6 +307,9 @@ protected void run() {
290307

291308
composeConfigurationFile();
292309
ArrayList<Object> args = new ArrayList<>(Arrays.asList(getR8Jar().getAbsolutePath(), "--min-api", "21", "--output", getOutJar().getAbsolutePath()));
310+
if (getDesugarConfig() != null) {
311+
args.addAll(Arrays.asList("--desugared-lib", getDesugarConfig().getAbsolutePath()));
312+
}
293313
args.addAll(Arrays.asList("--pg-compat", "--pg-conf", getComposedCfgFile().getAbsolutePath()));
294314
if (isDebugEnabled()) {
295315
args.add("--debug");
@@ -484,7 +504,7 @@ protected final void setupMoeTask(final @NotNull SourceSet sourceSet, final @Not
484504
switch (ext.proguard.getLevelRaw()) {
485505
case ProGuardOptions.LEVEL_APP:
486506
case ProGuardOptions.LEVEL_PLATFORM:
487-
return sdk.getProguardFullCfg();
507+
return sdk.getProguardCfg();
488508
case ProGuardOptions.LEVEL_ALL:
489509
return sdk.getProguardFullCfg();
490510
default:
@@ -503,24 +523,45 @@ protected final void setupMoeTask(final @NotNull SourceSet sourceSet, final @Not
503523
return null; // This is an optional convention.
504524
});
505525
addConvention(CONVENTION_IN_JARS, () -> {
506-
final HashSet<Object> jars = new LinkedHashSet<>();
507-
jars.addAll(classValidateTask.getOutputJars().getFiles());
508-
jars.add(getMoeSDK().getCoreJar());
509-
jars.add(getMoeExtension().getPlatformJar());
510-
511-
jars.add(sdk.getJava8SupportJar());
526+
final HashSet<Object> jars = new LinkedHashSet<>(classValidateTask.getOutputJars().getFiles());
512527

528+
switch (ext.proguard.getLevelRaw()) {
529+
case ProGuardOptions.LEVEL_APP:
530+
break;
531+
case ProGuardOptions.LEVEL_PLATFORM:
532+
if (ext.getPlatformJar() != null) {
533+
jars.add(ext.getPlatformJar());
534+
}
535+
break;
536+
case ProGuardOptions.LEVEL_ALL:
537+
jars.add(sdk.getCoreJar());
538+
if (ext.getPlatformJar() != null) {
539+
jars.add(ext.getPlatformJar());
540+
}
541+
break;
542+
default:
543+
throw new IllegalStateException();
544+
}
513545
return jars;
514546
});
515547
addConvention(CONVENTION_EXCLUDE_FILES, ext.proguard::getExcludeFiles);
516548
addConvention(CONVENTION_LIBRARY_JARS, () -> {
517-
final HashSet<Object> jars = new LinkedHashSet<>(
518-
// Make JDK runtime libraries available for ProGuard
519-
// because we no longer have all basic runtime classes in core jar.
520-
);
521-
//jars.add(getMoeSDK().getCoreJar());
522-
//jars.add(getMoeExtension().getPlatformJar());
523-
//jars.add(sdk.getJava8SupportJar());
549+
final HashSet<Object> jars = new LinkedHashSet<>();
550+
switch (ext.proguard.getLevelRaw()) {
551+
case ProGuardOptions.LEVEL_APP:
552+
jars.add(sdk.getCoreJar());
553+
if (ext.getPlatformJar() != null) {
554+
jars.add(ext.getPlatformJar());
555+
}
556+
break;
557+
case ProGuardOptions.LEVEL_PLATFORM:
558+
jars.add(sdk.getCoreJar());
559+
break;
560+
case ProGuardOptions.LEVEL_ALL:
561+
break;
562+
default:
563+
throw new IllegalStateException();
564+
}
524565
return jars;
525566
});
526567
addConvention(CONVENTION_OUT_JAR, () -> resolvePathInBuildDir(out, "output.jar"));
@@ -531,5 +572,11 @@ protected final void setupMoeTask(final @NotNull SourceSet sourceSet, final @Not
531572
addConvention(CONVENTION_OBFUSCATION_ENABLED, ext.proguard::isObfuscationEnabled);
532573
addConvention(CONVENTION_COLLECTOR_ENABLED, ext.proguard::isProguardCollectorEnabled);
533574
addConvention(CONVENTION_DEBUG_ENABLED, () -> mode.equals(Mode.DEBUG));
575+
addConvention(CONVENTION_DESUGAR_CONFIG, () -> {
576+
if (ext.proguard.getLevelRaw() == ProGuardOptions.LEVEL_ALL) {
577+
return null;
578+
}
579+
return sdk.getDesugaredLibJson();
580+
});
534581
}
535582
}

‎src/main/kotlin/org/moe/gradle/tasks/ClassValidate.kt‎

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -151,17 +151,8 @@ open class ClassValidate : AbstractBaseTask() {
151151
}
152152
addConvention(CONVENTION_CLASSPATH_FILES) {
153153
mutableSetOf<Any>().also { jars ->
154-
when (moeExtension.proguard.levelRaw) {
155-
ProGuardOptions.LEVEL_APP -> {
156-
jars.add(moeSDK.coreJar)
157-
moeExtension.platformJar?.let(jars::add)
158-
}
159-
ProGuardOptions.LEVEL_PLATFORM -> {
160-
jars.add(moeSDK.coreJar)
161-
}
162-
ProGuardOptions.LEVEL_ALL -> {}
163-
else -> throw IllegalStateException()
164-
}
154+
jars.add(moeSDK.coreJar)
155+
moeExtension.platformJar?.let(jars::add)
165156
}
166157
}
167158
addConvention(CONVENTION_OUTPUT_DIR) { resolvePathInBuildDir(out, "output") }

0 commit comments

Comments
 (0)