Merge pull request #17592 from iterate-ch/feature/GH-17587-testflight

Allow publishing builds in TestFlight

Author: dkocher

codesign.xml

@@ -36,12 +36,16 @@
     <!-- Designated requirement -->
     <property name="codesign.requirement.source" value="${setup}/app/codesign-requirement.txt"/>
     <property name="codesign.requirement" value="${setup}/app/codesign-requirement.bin"/>
+    <property name="codesign.provisionprofile" value="${setup}/app/${codesign.provisionprofile.name}"/>
     <!-- Enable hardened runtime -->
     <property name="codesign.options" value="--force --options runtime"/>
     <property name="codesign.arg"
               value="--entitlements ${setup}/app/default.entitlements --requirements ${codesign.requirement}"/>
 
     <target name="codesign" depends="dotclean,compile-codesign-requirement">
+        <copy tofile="${bundle}/${bundle.contents}/embedded.provisionprofile" overwrite="true" failonerror="false">
+            <file file="${codesign.provisionprofile}"/>
+        </copy>
         <echo
             message="Code signing ${bundle} with certificate ${codesign.certificate} and entitlements ${codesign.arg} from ${codesign.keychain}"/>
         <apply executable="/usr/bin/xcrun" failonerror="true"

osx/pom.xml

@@ -229,18 +229,15 @@
                     <version>${project.version}</version>
                 </dependency>
             </dependencies>
+            <properties>
+                <xcode.configuration>Release</xcode.configuration>
+                <codesign.arg>--entitlements ../setup/app/default.entitlements --requirements ../setup/app/codesign-requirement.bin</codesign.arg>
+                <codesign.provisionprofile.name>default.provisionprofile</codesign.provisionprofile.name>
+            </properties>
         </profile>
         <profile>
-            <id>sparkle</id>
-            <!-- activate profile for non-Jenkins builds -->
-            <activation>
-                <property>
-                    <name>!env.JENKINS_HOME</name>
-                </property>
-            </activation>
+            <id>debug</id>
             <properties>
-                <xcode.configuration>Release</xcode.configuration>
-                <sparkle.feed>local</sparkle.feed>
                 <codesign.certificate>Apple Development: David Kocher (DF448WW9PY)</codesign.certificate>
                 <installer.certificate>Apple Development: David Kocher (DF448WW9PY)</installer.certificate>
                 <codesign.arg>--entitlements ../setup/app/default.entitlements</codesign.arg>
@@ -252,6 +249,14 @@
                 <codesign.arg>--entitlements ../setup/app/sandbox.entitlements</codesign.arg>
             </properties>
         </profile>
+        <profile>
+            <id>appstore</id>
+            <properties>
+                <xcode.configuration>Mac App Store</xcode.configuration>
+                <codesign.provisionprofile.name>appstore.provisionprofile</codesign.provisionprofile.name>
+                <skipNotarize>true</skipNotarize>
+            </properties>
+        </profile>
         <profile>
             <id>installer</id>
             <activation>

setup/app/appstore.provisionprofile

@@ -2,6 +2,10 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
     <dict>
+        <key>com.apple.application-identifier</key>
+        <string>G69SCX94XU.ch.sudo.cyberduck</string>
+        <key>com.apple.developer.team-identifier</key>
+        <string>G69SCX94XU</string>
         <key>com.apple.security.app-sandbox</key>
         <true/>
         <key>com.apple.security.files.bookmarks.app-scope</key>