Fixed conflicts

.github/workflows/ios.yml

@@ -18,31 +18,42 @@ jobs:
       - name: Set Xcode Version
         run: sudo xcode-select -s /Applications/Xcode_15.0.app
 
-      - name: Install Apple Certificate
-        uses: apple-actions/import-codesign-certs@v1
-        with:
-          p12-file-base64: ${{ secrets.BUILD_CERTIFICATE_BASE64 }}
-          p12-password: ${{ secrets.P12_PASSWORD }}
-
-      - name: Install the provisioning profile
+      - name: Get App Store Connect API Key File
         env:
-          PROVISIONING_CERTIFICATE_BASE64: ${{ secrets.BUILD_PROVISION_PROFILE_BASE64 }}
+          ASCAPI_KEY: ${{ secrets.ASCAPI_KEY }}
         run: |
-          PP_PATH=$RUNNER_TEMP/build_pp.mobileprovision
+          KEY_PATH=$RUNNER_TEMP/ascapi-key.p8
+          
+          echo -n "$ASCAPI_KEY" > $KEY_PATH
 
-          echo -n "$PROVISIONING_CERTIFICATE_BASE64" | base64 --decode -o $PP_PATH
+      - name: Resolve Swift dependencies
+        run: xcodebuild -resolvePackageDependencies -scheme BAGen -configuration Debug
 
-          mkdir -p ~/Library/MobileDevice/Provisioning\ Profiles
-          cp $PP_PATH ~/Library/MobileDevice/
+      - name: Archive SwiftArchive App
+        env:
+          ASCAPI_KEY_ID: ${{ secrets.ASCAPI_KEY_ID }}
+          ASCAPI_ISSUER_ID: ${{ secrets.ASCAPI_ISSUER_ID }}
+        run: |
+          KEY_PATH=$RUNNER_TEMP/ascapi-key.p8
+          
+          xcodebuild -scheme BAGen -configuration Debug DEVELOPMENT_TEAM=B57D8PP775 -sdk 'iphoneos' -destination 'generic/platform=iOS' -archivePath BAGen_Debug.xcarchive clean archive CODE_SIGN_IDENTITY="Apple Development" -allowProvisioningUpdates -authenticationKeyPath $KEY_PATH -authenticationKeyID $ASCAPI_KEY_ID -authenticationKeyIssuerID $ASCAPI_ISSUER_ID
+          xcodebuild -scheme BAGen -configuration Release DEVELOPMENT_TEAM=B57D8PP775 -sdk 'iphoneos' -destination 'generic/platform=iOS' -archivePath BAGen_Release.xcarchive clean archive CODE_SIGN_IDENTITY="Apple Development" -allowProvisioningUpdates -authenticationKeyPath $KEY_PATH -authenticationKeyID $ASCAPI_KEY_ID -authenticationKeyIssuerID $ASCAPI_ISSUER_ID
           
-      - name: Archive
-        run: xcodebuild archive -scheme "BAGen" -archivePath ios.xcarchive
-
       - name: Export IPA
-        run: xcodebuild -exportArchive -archivePath ios.xcarchive -exportPath ./ -exportOptionsPlist ExportOptions.plist
+        run: |
+          mkdir ./Export_Debug
+          mkdir ./Export_Release
+          xcodebuild -exportArchive -archivePath BAGen_Debug.xcarchive -exportPath ./Export_Debug -exportOptionsPlist ExportOptions.plist
+          xcodebuild -exportArchive -archivePath BAGen_Release.xcarchive -exportPath ./Export_Release -exportOptionsPlist ExportOptions.plist
+
+      - name: Upload Debug IPA
+        uses: actions/upload-artifact@v3
+        with:
+          name: Debug.ipa
+          path: ./Export_Debug/BAGen.ipa
 
-      - name: Upload Artifact
-        uses: actions/upload-artifact@v2
+      - name: Upload Release IPA
+        uses: actions/upload-artifact@v3
         with:
-          name: ipa
-          path: ./*.ipa
+          name: Release.ipa
+          path: ./Export_Release/BAGen.ipa

ExportOptions.plist

@@ -8,15 +8,8 @@
 	<string>export</string>
 	<key>method</key>
 	<string>development</string>
-	<key>provisioningProfiles</key>
-	<dict>
-		<key>com.Neinnko.BAGen</key>
-		<string>SwiftArchive</string>
-	</dict>
-	<key>signingCertificate</key>
-	<string>Apple Development</string>
 	<key>signingStyle</key>
-	<string>manual</string>
+	<string>automatic</string>
 	<key>stripSwiftSymbols</key>
 	<true/>
 	<key>teamID</key>