(multi-os-engine/multi-os-engine#161) Allow specify archs to build

Author: Noisyfox

src/main/java/org/moe/gradle/MoePlugin.java

@@ -43,12 +43,15 @@
 import org.moe.gradle.tasks.XcodeBuild;
 import org.moe.gradle.tasks.XcodeInternal;
 import org.moe.gradle.tasks.XcodeProvider;
+import org.moe.gradle.utils.Arch;
+import org.moe.gradle.utils.PropertiesUtil;
 import org.moe.gradle.utils.Require;
 
 import javax.inject.Inject;
 import java.io.File;
 import java.util.Arrays;
 import java.util.Optional;
+import java.util.Set;
 import java.util.stream.Collectors;
 
 import static java.util.Arrays.asList;
@@ -67,6 +70,8 @@ public class MoePlugin extends AbstractMoePlugin {
 
     private static final Logger LOG = Logging.getLogger(MoePlugin.class);
 
+    private static final String MOE_ARCHS_PROPERTY = "moe.archs";
+
     @NotNull
     private MoeExtension extension;
 
@@ -84,6 +89,14 @@ public Server getRemoteServer() {
         return remoteServer;
     }
 
+    @Nullable
+    private Set<Arch> archs = null;
+
+    @Nullable
+    public Set<Arch> getArchs() {
+        return archs;
+    }
+
     @Inject
     public MoePlugin(Instantiator instantiator, ToolingModelBuilderRegistry registry) {
         super(instantiator, registry, false);
@@ -93,6 +106,21 @@ public MoePlugin(Instantiator instantiator, ToolingModelBuilderRegistry registry
     public void apply(Project project) {
         super.apply(project);
 
+        // Setup explicit archs
+        String archsProp = PropertiesUtil.tryGetProperty(project, MOE_ARCHS_PROPERTY);
+        if (archsProp != null) {
+            archsProp = archsProp.trim();
+            archs = Arrays.stream(archsProp.split(","))
+                .map(String::trim)
+                .filter(it -> !it.isEmpty())
+                .map(Arch::getForName)
+                .collect(Collectors.toSet());
+
+            if (archs.isEmpty()) {
+                archs = null;
+            }
+        }
+
         // Setup remote build
         remoteServer = Server.setup(this);
         if (remoteServer != null) {

src/main/java/org/moe/gradle/tasks/IpaBuild.java

@@ -36,6 +36,7 @@
 import org.moe.gradle.anns.Nullable;
 import org.moe.gradle.remote.Server;
 import org.moe.gradle.remote.file.FileList;
+import org.moe.gradle.utils.Arch;
 import org.moe.gradle.utils.ExportOptionsPlistManager;
 import org.moe.gradle.utils.Mode;
 import org.moe.gradle.utils.Require;
@@ -751,6 +752,11 @@ private List<String> calculateArchiveArgs() {
 
         args.addAll(getAdditionalParameters());
 
+        Set<Arch> archs = getXcodeBuildTaskDep().getArchs();
+        if (archs != null) {
+            args.add("ARCHS=" + archs.stream().map(it -> it.name).collect(Collectors.joining(" ")));
+        }
+
         args.add("DEVELOPMENT_TEAM=" + getDevelopmentTeam());
 
         args.add("-configuration");

src/main/java/org/moe/gradle/tasks/XcodeBuild.java

@@ -50,6 +50,7 @@
 import org.moe.gradle.remote.Server;
 import org.moe.gradle.remote.ServerChannelException;
 import org.moe.gradle.remote.file.FileList;
+import org.moe.gradle.utils.Arch;
 import org.moe.gradle.utils.Mode;
 import org.moe.gradle.utils.Require;
 
@@ -122,6 +123,16 @@ public MoePlatform getPlatform() {
         return Require.nonNull(platform);
     }
 
+    @Nullable
+    private Set<Arch> archs;
+
+    @Nullable
+    @Internal
+    @IgnoreUnused
+    public Set<Arch> getArchs() {
+        return archs;
+    }
+
     @NotNull
     private final String xcodeBuildTaskDate = new Date().toString();
 
@@ -668,6 +679,11 @@ private List<String> calculateArgs() {
 
         args.addAll(getAdditionalParameters());
 
+        Set<Arch> archs = getArchs();
+        if (archs != null) {
+            args.add("ARCHS=" + archs.stream().map(it -> it.name).collect(Collectors.joining(" ")));
+        }
+
         // DO NOT set CONFIGURATION_BUILD_DIR here! This is conflicted with CocoaPods!
         // Instead, set SYMROOT to the build root, since the BUILD_DIR is equals to SYMROOT
         // and CONFIGURATION_BUILD_DIR is derived from it.
@@ -722,7 +738,12 @@ protected final void setupMoeTask(@NotNull SourceSet sourceSet, @NotNull Mode mo
 
         // Add dependencies
         final ArrayList<XcodeProvider> xcodeProviderTasks = new ArrayList<>();
-        platform.archs.forEach(arch -> {
+        Set<Arch> buildArchs = new HashSet<>(platform.archs);
+        if (getMoePlugin().getArchs() != null) {
+            buildArchs.retainAll(getMoePlugin().getArchs());
+            archs = buildArchs;
+        }
+        buildArchs.forEach(arch -> {
             final XcodeProvider xcodeProvider = getMoePlugin().getTaskBy(XcodeProvider.class, sourceSet, mode, arch, platform);
             xcodeProviderTasks.add(xcodeProvider);
             dependsOn(xcodeProvider);