From f475a7fdeda1ea7a5a85c6cf5dd9881991a8af55 Mon Sep 17 00:00:00 2001
From: Will Soula <william.soula@drillinginfo.com>
Date: Tue, 28 Aug 2018 14:24:48 -0600
Subject: [PATCH] Add new checkboxes for Xcode plugin

This change allows for the user to specify the following checkboxes:
* Upload Bitcode?
* Upload Symbols?
* Compile Bitcode?

The plugin defaults to these checkboxes being checked, so I kept those
defaults here.

Change-Id: I727611fd2a70f2157b05d030ec296c74a5b214a8
---
 jenkins_jobs/modules/builders.py   | 9 +++++++++
 tests/builders/fixtures/xcode.xml  | 6 ++++++
 tests/builders/fixtures/xcode.yaml | 3 +++
 3 files changed, 18 insertions(+)

diff --git a/jenkins_jobs/modules/builders.py b/jenkins_jobs/modules/builders.py
index b5b8ba860..b9d687e09 100644
--- a/jenkins_jobs/modules/builders.py
+++ b/jenkins_jobs/modules/builders.py
@@ -3157,6 +3157,12 @@ def xcode(registry, xml_parent, data):
         (default '')
     :arg str ipa-output: The output directory for the .ipa file,
         relative to the build directory. (default '')
+    :arg bool compile-bitcode: recompile from Bitcode when exporting the
+        application to IPA. (default true)
+    :arg bool upload-bitcode: include Bitcode when exporting applications to
+        IPA. (default true)
+    :arg bool upload-symbols: include symbols when exporting applications to
+        IPA. (default true)
     :arg development-team-id: The ID of the Apple development team to use to
         sign the IPA (default '')
     :arg str keychain-name: The globally configured keychain to unlock for
@@ -3236,6 +3242,9 @@ def xcode(registry, xml_parent, data):
         ('keychain-path', 'keychainPath', ''),
         ('keychain-password', 'keychainPwd', ''),
         ('keychain-unlock', 'unlockKeychain', False),
+        ('compile-bitcode', 'compileBitcode', True),
+        ('upload-bitcode', 'uploadBitcode', True),
+        ('upload-symbols', 'uploadSymbols', True)
     ]
     helpers.convert_mapping_to_xml(xcode, data, mapping, fail_required=True)
 
diff --git a/tests/builders/fixtures/xcode.xml b/tests/builders/fixtures/xcode.xml
index 2c7cedd56..e439a1e76 100644
--- a/tests/builders/fixtures/xcode.xml
+++ b/tests/builders/fixtures/xcode.xml
@@ -30,6 +30,9 @@
       <keychainPath/>
       <keychainPwd/>
       <unlockKeychain>false</unlockKeychain>
+      <compileBitcode>true</compileBitcode>
+      <uploadBitcode>true</uploadBitcode>
+      <uploadSymbols>true</uploadSymbols>
       <manualSigning>false</manualSigning>
     </au.com.rayh.XCodeBuilder>
     <au.com.rayh.DeveloperProfileLoader>
@@ -64,6 +67,9 @@
       <keychainPath>/Users/jenkins/Library/Keychains/jenkins-uasdk-ios-pre_review</keychainPath>
       <keychainPwd>testpass</keychainPwd>
       <unlockKeychain>true</unlockKeychain>
+      <compileBitcode>false</compileBitcode>
+      <uploadBitcode>false</uploadBitcode>
+      <uploadSymbols>false</uploadSymbols>
       <manualSigning>true</manualSigning>
       <provisioningProfiles>
         <au.com.rayh.ProvisioningProfile>
diff --git a/tests/builders/fixtures/xcode.yaml b/tests/builders/fixtures/xcode.yaml
index 39333ba7d..4b6f346e3 100644
--- a/tests/builders/fixtures/xcode.yaml
+++ b/tests/builders/fixtures/xcode.yaml
@@ -18,6 +18,9 @@ builders:
       ipa-export-method: ad-hoc
       ipa-version: "${VERSION}"
       ipa-output: "/output"
+      compile-bitcode: false
+      upload-bitcode: false
+      upload-symbols: false
       development-team-id: foo
       keychain-path: "/Users/jenkins/Library/Keychains/jenkins-uasdk-ios-pre_review"
       keychain-password: "testpass"