Skip to content

Commit 1f419fa

Browse files
committed
chore: Rename Carthage validation project to XCFramework validation project
1 parent 532f33c commit 1f419fa

File tree

18 files changed

+10
-35
lines changed

18 files changed

+10
-35
lines changed

.github/workflows/release.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -127,6 +127,9 @@ jobs:
127127
pattern: xcframework-${{github.sha}}-sentry-swiftui
128128
path: Carthage/
129129
- run: ./scripts/ci-select-xcode.sh 16.4
130+
- name: Unzip all XCFrameworks
131+
run: |
132+
find Carthage -name "*.xcframework.zip" -print0 | xargs -t0I @ unzip @ -d Carthage
130133
- run: make build-xcframework-sample
131134
- name: Run CI Diagnostics
132135
if: failure()

.gitignore

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,6 @@ Packages
4444
Carthage/Build
4545
Carthage/Checkouts
4646
Carthage
47-
Sentry.Carthage.json
48-
SentrySwiftUI.Carthage.json
4947

5048
# CocoaPods
5149
Examples/**/Pods

Makefile

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ init-local:
1818
init-ci-build:
1919
brew bundle --file Brewfile-ci-build
2020

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

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

141138
build-signed-xcframework:
142-
@echo "--> Carthage: creating Signed Sentry xcframework"
139+
@echo "--> Creating Signed Sentry xcframework"
143140
./scripts/build-xcframework-local.sh | tee build-xcframework.log
144141

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

150145
# call this like `make bump-version TO=5.0.0-rc.0`
151146
bump-version: clean-version-bump

Samples/Carthage-Validation/README.md

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

Samples/Carthage-Validation/XCFramework/Cartfile

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

Samples/Carthage-Validation/XCFramework/XCFramework.xcodeproj/project.pbxproj renamed to Samples/XCFramework-Validation/XCFramework.xcodeproj/project.pbxproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
archiveVersion = 1;
44
classes = {
55
};
6-
objectVersion = 52;
6+
objectVersion = 60;
77
objects = {
88

99
/* Begin PBXBuildFile section */
@@ -36,7 +36,7 @@
3636
/* End PBXCopyFilesBuildPhase section */
3737

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

5252
/* Begin PBXFrameworksBuildPhase section */

0 commit comments

Comments
 (0)