Feature : Multiple build configuration support

build.gradle

@@ -1,25 +1,25 @@
-allprojects {
-	apply plugin: 'java-gradle-plugin'
-	apply plugin: 'groovy'
+String getGitDescribeVersion() {
+	ByteArrayOutputStream output = new ByteArrayOutputStream()
 
-	def versionNumber = "0.16.0.a603076-SNAPSHOT"
+	project.exec({ ExecSpec execSpec ->
+		execSpec.args = ["describe", "--tags", "--always", "--first-parent"]
+		execSpec.executable = "git"
+		execSpec.standardOutput = output
+	})
 
-	if (project.hasProperty("versionNumber")) {
-		versionNumber = project.versionNumber
-	}
-	if (project.hasProperty("versionSuffix")) {
-		versionNumber += project.versionSuffix
-	}
-	if (project.hasProperty("buildNumber")) {
-		versionNumber += "." + project.buildNumber
-	}
+	return output.toString().trim()
+}
 
+//
+allprojects {
+	apply plugin: 'java-gradle-plugin'
+	apply plugin: 'groovy'
 
 	group = 'org.openbakery'
-	version = versionNumber
+	version = getGitDescribeVersion() + "-SNAPSHOT"
 
-	sourceCompatibility = "1.6"
-	targetCompatibility = "1.6"
+	sourceCompatibility = JavaVersion.VERSION_1_8
+	targetCompatibility = JavaVersion.VERSION_1_8
 
 	repositories {
 		mavenCentral()

example/OSX/ExampleOSX/ExampleOSX.xcodeproj/project.pbxproj

@@ -187,7 +187,7 @@
 				TargetAttributes = {
 					A7F1890E1A6FE161002D206F = {
 						CreatedOnToolsVersion = 6.1.1;
-						DevelopmentTeam = Z7L2YCUH45;
+						DevelopmentTeam = 2YFT3F89TY;
 					};
 					A7F189211A6FE161002D206F = {
 						CreatedOnToolsVersion = 6.1.1;
@@ -404,6 +404,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CODE_SIGN_IDENTITY = "Developer ID Application";
 				COMBINE_HIDPI_IMAGES = YES;
+				DEVELOPMENT_TEAM = 2YFT3F89TY;
 				INFOPLIST_FILE = ExampleOSX/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -417,6 +418,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CODE_SIGN_IDENTITY = "Developer ID Application";
 				COMBINE_HIDPI_IMAGES = YES;
+				DEVELOPMENT_TEAM = 2YFT3F89TY;
 				INFOPLIST_FILE = ExampleOSX/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
 				PRODUCT_NAME = "$(TARGET_NAME)";

gradle/wrapper/gradle-wrapper.properties

@@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.8-bin.zip

libxcode/src/main/groovy/org/openbakery/CommandRunner.groovy

@@ -23,7 +23,7 @@ import org.openbakery.output.OutputAppender
 import org.slf4j.Logger
 import org.slf4j.LoggerFactory
 
-class CommandRunner {
+class CommandRunner implements Serializable{
 
 	private static Logger logger = LoggerFactory.getLogger(CommandRunner.class)
 
@@ -34,10 +34,6 @@ class CommandRunner {
 
 	Thread readerThread
 
-	public CommandRunner() {
-
-	}
-
 	void setOutputFile(File outputFile) {
 		if (outputFile.exists()) {
 

libxcode/src/main/groovy/org/openbakery/codesign/ProvisioningProfileReader.groovy

@@ -149,6 +149,9 @@ class ProvisioningProfileReader {
 		}
 	}
 
+	List<String> getPlatforms() {
+		return config.getProperty("Platform")
+	}
 
 	String getUUID() {
 		return config.getString("UUID")

libxcode/src/main/groovy/org/openbakery/util/PlistHelper.groovy

@@ -98,10 +98,10 @@ class PlistHelper {
 
 
 	void setValueForPlist(File plist, String key, String value) {
-		commandForPlist(plist, "Set :" + key + " " + value)
+		if (value != null)
+			commandForPlist(plist, "Set :" + key + " " + value)
 	}
 
-
 	void commandForPlist(File plist, String command) {
 		if (!plist.exists()) {
 			throw new IllegalStateException("Info Plist does not exist: " + plist.absolutePath);

libxcode/src/main/groovy/org/openbakery/xcode/Xcodebuild.groovy

@@ -19,6 +19,8 @@ class Xcodebuild {
 	public static final String EXECUTABLE = "xcodebuild"
 	public static final String ACTION_ARCHIVE = "archive"
 	public static final String ACTION_EXPORT_ARCHIVE = "-exportArchive"
+	public static final String ARGUMENT_CONFIGURATION = "-configuration"
+	public static final String ARGUMENT_WORKSPACE = "-workspace"
 	public static final String ARGUMENT_SCHEME = "-scheme"
 	public static final String ARGUMENT_ARCHIVE_PATH = "-archivePath"
 	public static final String ARGUMENT_EXPORT_PATH = "-exportPath"
@@ -50,26 +52,34 @@ class Xcodebuild {
 	static void packageIpa(CommandRunner commandRunner,
 						   File archivePath,
 						   File exportPath,
-						   File exportOptionsPlist) {
+						   File exportOptionsPlist,
+						   @Nullable File xcodeApp) {
 
 		assert archivePath != null && archivePath.exists()
 		assert exportPath != null && exportPath.exists()
 		assert exportOptionsPlist != null && exportOptionsPlist.exists()
 
-		commandRunner.run(EXECUTABLE,
-				ACTION_EXPORT_ARCHIVE,
-				ARGUMENT_ARCHIVE_PATH, archivePath.absolutePath,
-				ARGUMENT_EXPORT_PATH, exportPath.absolutePath,
-				ARGUMENT_EXPORT_OPTIONS_PLIST, exportOptionsPlist.absolutePath)
+		// Env value
+		HashMap<String, String> envMap = new HashMap<>()
+		if (xcodeApp != null) {
+			envMap.put(Xcode.ENV_DEVELOPER_DIR, xcodeApp.absolutePath)
+		}
+
+		List<String> args = [EXECUTABLE,
+							 ACTION_EXPORT_ARCHIVE,
+							 ARGUMENT_ARCHIVE_PATH, archivePath.absolutePath,
+							 ARGUMENT_EXPORT_PATH, exportPath.absolutePath,
+							 ARGUMENT_EXPORT_OPTIONS_PLIST, exportOptionsPlist.absolutePath]
+
+		commandRunner.run(args, envMap)
 	}
 
 	static void archive(CommandRunner commandRunner,
 						String scheme,
 						File outputPath,
-						File xcConfig,
+						String configuration,
 						@Nullable File xcodeApp) {
 		assert scheme != null
-		assert xcConfig.exists() && !xcConfig.isDirectory()
 
 		HashMap<String, String> envMap = new HashMap<>()
 
@@ -80,8 +90,8 @@ class Xcodebuild {
 		List<String> args = [EXECUTABLE,
 							 ACTION_ARCHIVE,
 							 ARGUMENT_SCHEME, scheme,
-							 ARGUMENT_ARCHIVE_PATH, outputPath.absolutePath,
-							 ARGUMENT_XCCONFIG, xcConfig.absolutePath]
+							 "-configuration", configuration,
+							 ARGUMENT_ARCHIVE_PATH, outputPath.absolutePath]
 
 		commandRunner.run(args, envMap)
 	}

plugin/build.gradle

@@ -98,7 +98,7 @@ uploadArchives {
 		mavenDeployer {
 			configuration = configurations.deployerJars
 
-			repository(url: publishURL) {
+			repository(url: mavenLocal().url) {
 				authentication(userName: publishUser, password: publishPassword)
 			}
 

plugin/src/functionalTest/groovy/org/openbakery/FunctionalTestBase.groovy

@@ -0,0 +1,55 @@
+package org.openbakery
+
+import org.apache.commons.io.FileUtils
+import org.junit.Rule
+import org.junit.rules.TemporaryFolder
+import spock.lang.Specification
+
+class FunctionalTestBase extends Specification {
+
+	@Rule
+	final TemporaryFolder testProjectDir = new TemporaryFolder()
+
+	List<File> pluginClasspath
+
+	File buildFile
+
+	void genericSetup() {
+		extractPluginClassPathResource()
+		createMockBuildFile()
+		copyTestProject()
+	}
+
+	void extractPluginClassPathResource() {
+		URL pluginClasspathResource = getClass().classLoader
+				.findResource("plugin-classpath.txt")
+
+		if (pluginClasspathResource == null) {
+			throw new IllegalStateException("Did not find plugin classpath resource, "
+					+ "run `testClasses` build task.")
+		}
+
+		pluginClasspath = pluginClasspathResource.readLines()
+				.collect { new File(it) }
+	}
+
+	void createMockBuildFile() {
+		buildFile = testProjectDir.newFile('build.gradle')
+		buildFile << """
+            plugins {
+                id 'org.openbakery.xcode-plugin'
+            }
+        """
+	}
+
+	void copyTestProject() {
+		URL folder = getClass().classLoader
+				.findResource("TestProject")
+
+
+		File file = new File(folder.getFile())
+		assert file.exists()
+
+		FileUtils.copyDirectory(file, testProjectDir.root)
+	}
+}

plugin/src/functionalTest/groovy/org/openbakery/KeychainCreateTaskFunctionalTest.groovy

@@ -3,43 +3,23 @@ package org.openbakery
 import org.gradle.testkit.runner.BuildResult
 import org.gradle.testkit.runner.GradleRunner
 import org.gradle.testkit.runner.TaskOutcome
-import org.junit.Rule
-import org.junit.rules.TemporaryFolder
 import org.openbakery.signing.KeychainCreateTask
 import spock.lang.Shared
-import spock.lang.Specification
 
 import java.nio.file.Paths
 
-class KeychainCreateTaskFunctionalTest extends Specification {
-
-	@Rule
-	final TemporaryFolder testProjectDir = new TemporaryFolder()
-
-	List<File> pluginClasspath
+class KeychainCreateTaskFunctionalTest extends FunctionalTestBase {
 
 	@Shared
 	File certificate
 
-	File buildFile
-
 	def setup() {
-		def pluginClasspathResource = getClass().classLoader.findResource("plugin-classpath.txt")
-		if (pluginClasspathResource == null) {
-			throw new IllegalStateException("Did not find plugin classpath resource, run `testClasses` build task.")
-		}
-
-		pluginClasspath = pluginClasspathResource.readLines().collect { new File(it) }
+		extractPluginClassPathResource()
+		createMockBuildFile()
+		copyTestProject()
 
 		certificate = findResource("fake_distribution.p12")
 		assert certificate.exists()
-
-		buildFile = testProjectDir.newFile('build.gradle')
-		buildFile << """
-            plugins {
-                id 'org.openbakery.xcode-plugin'
-            }
-        """
 	}
 
 	def "The task list should contain the task"() {

plugin/src/functionalTest/groovy/org/openbakery/PackageTaskIosAndTvOSTest.groovy

@@ -1,39 +1,15 @@
 package org.openbakery
 
 import org.gradle.testkit.runner.GradleRunner
-import org.junit.Rule
-import org.junit.rules.TemporaryFolder
 import org.openbakery.packaging.PackageTaskIosAndTvOS
-import spock.lang.Specification
 
-class PackageTaskIosAndTvOSTest extends Specification {
-
-	@Rule
-	final TemporaryFolder testProjectDir = new TemporaryFolder()
-
-	List<File> pluginClasspath
-
-	File buildFile
+class PackageTaskIosAndTvOSTest extends FunctionalTestBase {
 
 	def setup() {
-		buildFile = testProjectDir.newFile('build.gradle')
-
-		def pluginClasspathResource = getClass().classLoader.findResource("plugin-classpath.txt")
-		if (pluginClasspathResource == null) {
-			throw new IllegalStateException("Did not find plugin classpath resource, run `testClasses` build task.")
-		}
-
-		pluginClasspath = pluginClasspathResource.readLines().collect { new File(it) }
+		genericSetup()
 	}
 
 	def "The task list should contain the task"() {
-		given:
-		buildFile << """
-            plugins {
-                id 'org.openbakery.xcode-plugin'
-            }
-        """
-
 		when:
 		def result = GradleRunner.create()
 				.withProjectDir(testProjectDir.root)