Skip to content
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -127,6 +127,9 @@ jobs:
pattern: xcframework-${{github.sha}}-sentry-swiftui
path: Carthage/
- run: ./scripts/ci-select-xcode.sh 16.4
- name: Unzip all XCFrameworks
run: |
find Carthage -name "*.xcframework.zip" -print0 | xargs -t0I @ unzip @ -d Carthage
- run: make build-xcframework-sample
- name: Run CI Diagnostics
if: failure()
Expand Down
2 changes: 0 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,6 @@ Packages
Carthage/Build
Carthage/Checkouts
Carthage
Sentry.Carthage.json
SentrySwiftUI.Carthage.json

# CocoaPods
Examples/**/Pods
Expand Down
1 change: 0 additions & 1 deletion Brewfile-ci-deploy
Original file line number Diff line number Diff line change
@@ -1 +0,0 @@
brew 'carthage'
13 changes: 4 additions & 9 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ init-local:
init-ci-build:
brew bundle --file Brewfile-ci-build

# installs the tools needed to run CI deploy tasks locally (note that carthage is preinstalled in github actions)
# installs the tools needed to run CI deploy tasks locally
.PHONY: init-ci-deploy
init-ci-deploy:
brew bundle --file Brewfile-ci-deploy
Expand Down Expand Up @@ -131,21 +131,16 @@ analyze:
exit 1; \
fi

# Since Carthage 0.38.0 we need to create separate .framework.zip and .xcframework.zip archives.
# After creating the zips we create a JSON to be able to test Carthage locally.
# For more info check out: https://github.com/Carthage/Carthage/releases/tag/0.38.0
build-xcframework:
@echo "--> Carthage: creating Sentry xcframework"
@echo "--> Creating Sentry xcframework"
./scripts/build-xcframework-local.sh | tee build-xcframework.log

build-signed-xcframework:
@echo "--> Carthage: creating Signed Sentry xcframework"
@echo "--> Creating Signed Sentry xcframework"
./scripts/build-xcframework-local.sh | tee build-xcframework.log

build-xcframework-sample:
./scripts/create-carthage-json.sh
cd Samples/Carthage-Validation/XCFramework/ && carthage update --use-xcframeworks
xcodebuild -project "Samples/Carthage-Validation/XCFramework/XCFramework.xcodeproj" -configuration Release CODE_SIGNING_ALLOWED="NO" build
xcodebuild -project "Samples/XCFramework-Validation/XCFramework.xcodeproj" -configuration Release CODE_SIGNING_ALLOWED="NO" build

# call this like `make bump-version TO=5.0.0-rc.0`
bump-version: clean-version-bump
Expand Down
19 changes: 0 additions & 19 deletions Samples/Carthage-Validation/README.md

This file was deleted.

2 changes: 0 additions & 2 deletions Samples/Carthage-Validation/XCFramework/Cartfile

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
archiveVersion = 1;
classes = {
};
objectVersion = 52;
objectVersion = 60;
objects = {

/* Begin PBXBuildFile section */
Expand Down Expand Up @@ -36,7 +36,7 @@
/* End PBXCopyFilesBuildPhase section */

/* Begin PBXFileReference section */
1573CAE22BBCA4820018A2B7 /* SentrySwiftUI.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = SentrySwiftUI.xcframework; path = Carthage/Build/SentrySwiftUI.xcframework; sourceTree = "<group>"; };
1573CAE22BBCA4820018A2B7 /* SentrySwiftUI.xcframework */ = {isa = PBXFileReference; expectedSignature = "AppleDeveloperProgram:97JCY7859U:GetSentry LLC"; lastKnownFileType = wrapper.xcframework; name = SentrySwiftUI.xcframework; path = ../../Carthage/SentrySwiftUI.xcframework; sourceTree = "<group>"; };
1573CAE62BBCA8260018A2B7 /* CheckTracedView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CheckTracedView.swift; sourceTree = "<group>"; };
7BA13E2E267B3F5200DEE308 /* XCFramework.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = XCFramework.app; sourceTree = BUILT_PRODUCTS_DIR; };
7BA13E31267B3F5200DEE308 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
Expand All @@ -46,7 +46,7 @@
7BA13E3A267B3F5400DEE308 /* Preview Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = "Preview Assets.xcassets"; sourceTree = "<group>"; };
7BA13E3D267B3F5400DEE308 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
7BA13E3F267B3F5400DEE308 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
7BA13E46267B4A2D00DEE308 /* Sentry.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = Sentry.xcframework; path = Carthage/Build/Sentry.xcframework; sourceTree = "<group>"; };
7BA13E46267B4A2D00DEE308 /* Sentry.xcframework */ = {isa = PBXFileReference; expectedSignature = "AppleDeveloperProgram:97JCY7859U:GetSentry LLC"; lastKnownFileType = wrapper.xcframework; name = Sentry.xcframework; path = ../../Carthage/Sentry.xcframework; sourceTree = "<group>"; };
/* End PBXFileReference section */

/* Begin PBXFrameworksBuildPhase section */
Expand Down
5 changes: 0 additions & 5 deletions scripts/create-carthage-json.sh

This file was deleted.

Loading