Skip to content

Commit ba37f61

Browse files
committed
CORE-1316 merge iOS and tvOS xcframeworks, no need to have them separate
1 parent c40a56d commit ba37f61

File tree

2 files changed

+1
-27
lines changed

2 files changed

+1
-27
lines changed

carthage-files/Branch-static/Info.plist

Lines changed: 0 additions & 26 deletions
This file was deleted.

carthage-files/BranchSDK.xcodeproj/project.pbxproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1266,7 +1266,7 @@
12661266
);
12671267
runOnlyForDeploymentPostprocessing = 0;
12681268
shellPath = /bin/sh;
1269-
shellScript = "# config\nIOS_PATH=\"./build/ios/ios.xcarchive\"\nIOS_SIM_PATH=\"./build/ios/ios_sim.xcarchive\"\nIOS_XCFRAMEWORK_PATH=\"./build/ios/Branch.xcframework\"\nTVOS_PATH=\"./build/tvos/tvos.xcarchive\"\nTVOS_SIM_PATH=\"./build/tvos/tvos_sim.xcarchive\"\nTVOS_XCFRAMEWORK_PATH=\"./build/tvos/Branch.xcframework\"\n\n# delete previous build\nrm -rf \"./build\" \n\n# build iOS framework\nxcodebuild archive \\\n -scheme Branch \\\n -archivePath \"${IOS_PATH}\" \\\n -sdk iphoneos \\\n SKIP_INSTALL=NO\n\n# build iOS simulator framework\nxcodebuild archive \\\n -scheme Branch \\\n -archivePath \"${IOS_SIM_PATH}\" \\\n -sdk iphonesimulator \\\n SKIP_INSTALL=NO\n\n# package iOS frameworks\nxcodebuild -create-xcframework \\\n -framework \"${IOS_PATH}/Products/Library/Frameworks/Branch.framework\" \\\n -framework \"${IOS_SIM_PATH}/Products/Library/Frameworks/Branch.framework\" \\\n -output \"${IOS_XCFRAMEWORK_PATH}\"\n\n# build tvOS framework\nxcodebuild archive \\\n -scheme Branch-tvOS \\\n -archivePath \"${TVOS_PATH}\" \\\n -sdk appletvos \\\n SKIP_INSTALL=NO\n\n# build tvOS simulator framework\nxcodebuild archive \\\n -scheme Branch-tvOS \\\n -archivePath \"${TVOS_SIM_PATH}\" \\\n -sdk appletvsimulator \\\n SKIP_INSTALL=NO\n\n# package tvOS frameworks\nxcodebuild -create-xcframework \\\n -framework \"${TVOS_PATH}/Products/Library/Frameworks/Branch.framework\" \\\n -framework \"${TVOS_SIM_PATH}/Products/Library/Frameworks/Branch.framework\" \\\n -output \"${TVOS_XCFRAMEWORK_PATH}\"\n \n";
1269+
shellScript = "# config\nIOS_PATH=\"./build/ios/ios.xcarchive\"\nIOS_SIM_PATH=\"./build/ios/ios_sim.xcarchive\"\nTVOS_PATH=\"./build/tvos/tvos.xcarchive\"\nTVOS_SIM_PATH=\"./build/tvos/tvos_sim.xcarchive\"\nXCFRAMEWORK_PATH=\"./build/Branch.xcframework\"\n\n# delete previous build\nrm -rf \"./build\" \n\n# build iOS framework\nxcodebuild archive \\\n -scheme Branch \\\n -archivePath \"${IOS_PATH}\" \\\n -sdk iphoneos \\\n SKIP_INSTALL=NO\n\n# build iOS simulator framework\nxcodebuild archive \\\n -scheme Branch \\\n -archivePath \"${IOS_SIM_PATH}\" \\\n -sdk iphonesimulator \\\n SKIP_INSTALL=NO\n\n# build tvOS framework\nxcodebuild archive \\\n -scheme Branch-tvOS \\\n -archivePath \"${TVOS_PATH}\" \\\n -sdk appletvos \\\n SKIP_INSTALL=NO\n\n# build tvOS simulator framework\nxcodebuild archive \\\n -scheme Branch-tvOS \\\n -archivePath \"${TVOS_SIM_PATH}\" \\\n -sdk appletvsimulator \\\n SKIP_INSTALL=NO\n\n# package frameworks\nxcodebuild -create-xcframework \\\n -framework \"${IOS_PATH}/Products/Library/Frameworks/Branch.framework\" \\\n -framework \"${IOS_SIM_PATH}/Products/Library/Frameworks/Branch.framework\" \\\n -framework \"${TVOS_PATH}/Products/Library/Frameworks/Branch.framework\" \\\n -framework \"${TVOS_SIM_PATH}/Products/Library/Frameworks/Branch.framework\" \\\n -output \"${XCFRAMEWORK_PATH}\"\n \n";
12701270
};
12711271
/* End PBXShellScriptBuildPhase section */
12721272

0 commit comments

Comments
 (0)