diff --git a/.azure-pipelines/azure-pipelines.yml b/.azure-pipelines/azure-pipelines.yml index 63f5935..3530da9 100644 --- a/.azure-pipelines/azure-pipelines.yml +++ b/.azure-pipelines/azure-pipelines.yml @@ -128,8 +128,8 @@ jobs: for framework in Release-xcframework/CrashReporter-static.xcframework/*/CrashReporter.framework; do xcframeworks+=( -framework "$framework") done - xcodebuild -create-xcframework "${xcframeworks[@]}" -output "Release/CrashReporter-static.xcframework" - ls "Release/CrashReporter-static.xcframework" + xcodebuild -create-xcframework "${xcframeworks[@]}" -output "Release/PLCrashReporterStatic/CrashReporter.xcframework" + ls "Release/PLCrashReporterStatic/CrashReporter.xcframework" displayName: 'Combine Static Binaries' workingDirectory: '$(Build.BinariesDirectory)' @@ -140,7 +140,7 @@ jobs: "$BUILD_SOURCESDIRECTORY/Scripts/create-archive.sh" "PLCrashReporter-$VERSION.carthage.framework" "iOS Framework" "tvOS Framework" "Mac OS X Framework" "Tools" "$BUILD_SOURCESDIRECTORY/Scripts/create-archive.sh" "PLCrashReporter-Static-$VERSION" Static/* "$BUILD_SOURCESDIRECTORY/Scripts/create-archive.sh" "PLCrashReporter-XCFramework-$VERSION" "CrashReporter.xcframework" - "$BUILD_SOURCESDIRECTORY/Scripts/create-archive.sh" "PLCrashReporter-Static-XCFramework-$VERSION" "CrashReporter-static.xcframework" + "$BUILD_SOURCESDIRECTORY/Scripts/create-archive.sh" "PLCrashReporter-Static-XCFramework-$VERSION" "PLCrashReporterStatic/CrashReporter.xcframework" displayName: 'Create Archives' workingDirectory: '$(Build.BinariesDirectory)/Release' diff --git a/CrashReporter.xcodeproj/project.pbxproj b/CrashReporter.xcodeproj/project.pbxproj index 3a99a28..689f2b3 100644 --- a/CrashReporter.xcodeproj/project.pbxproj +++ b/CrashReporter.xcodeproj/project.pbxproj @@ -15,8 +15,8 @@ 058812D310405908009128FB /* Create Archive With Universal Frameworks */, C25664E62357487D0088513E /* Create Archive With Static Libraries */, F8CF2BD2246C139400904633 /* Create Archive With XCFramework */, - D5A991BC2670C84D000A0F97 /* Create Archive Carthage */, 061DB46526E0B73500913209 /* Create Archive With Static XCFramework */, + D5A991BC2670C84D000A0F97 /* Create Archive Carthage */, ); dependencies = ( C2C74E1D25385F5B00313817 /* PBXTargetDependency */, @@ -3055,7 +3055,7 @@ ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "cd \"$BUILT_PRODUCTS_DIR\"\n\"$SRCROOT/Scripts/create-archive.sh\" \"$PRODUCT_NAME-Static-XCFramework-$CURRENT_PROJECT_VERSION\" \"$PROJECT_NAME-static.xcframework\" \"Tools\"\n"; + shellScript = "cd \"$BUILT_PRODUCTS_DIR\"\n\"$SRCROOT/Scripts/create-archive.sh\" \"$PRODUCT_NAME-Static-XCFramework-$CURRENT_PROJECT_VERSION\" \"XCFrameworkStatic/$PROJECT_NAME.xcframework\" \"Tools\"\n"; }; C25664D023571BC60088513E /* Verify Modifications */ = { isa = PBXShellScriptBuildPhase; diff --git a/PLCrashReporter.podspec b/PLCrashReporter.podspec index d0622c0..4f6ca34 100644 --- a/PLCrashReporter.podspec +++ b/PLCrashReporter.podspec @@ -14,5 +14,5 @@ Pod::Spec.new do |spec| spec.ios.deployment_target = '9.0' spec.osx.deployment_target = '10.9' spec.tvos.deployment_target = '9.0' - spec.vendored_frameworks = "CrashReporter-static.xcframework" + spec.vendored_frameworks = "CrashReporter.xcframework" end diff --git a/Scripts/copy-products.sh b/Scripts/copy-products.sh index 51aeb73..7b453c2 100755 --- a/Scripts/copy-products.sh +++ b/Scripts/copy-products.sh @@ -25,7 +25,8 @@ cp -R "$BUILD_DIR/$CONFIGURATION-macosx/$PROJECT_NAME.framework.dSYM" "$BUILT_PR cp -R "$BUILD_DIR/$CONFIGURATION-xcframework/$PROJECT_NAME.xcframework" "$BUILT_PRODUCTS_DIR" # Static XCFrameowork -cp -R "$BUILD_DIR/$CONFIGURATION-xcframework/$PROJECT_NAME-static.xcframework" "$BUILT_PRODUCTS_DIR" +mkdir -p "$BUILT_PRODUCTS_DIR/XCFrameworkStatic" +cp -R "$BUILD_DIR/$CONFIGURATION-xcframework/$PROJECT_NAME-static.xcframework" "$BUILT_PRODUCTS_DIR/XCFrameworkStatic/$PROJECT_NAME.xcframework" # Static libraries mkdir -p "$BUILT_PRODUCTS_DIR/Static/include"