fix: SentrySwiftUI Carthage build import (#3817)

tl;dr; Fixed SentrySwiftUI Carthage build import.

Since there is no modulemap for the SentrySwiftUI declaring exported submodules:

For Carthage build make @_implementationOnly import SentryInternal.
Import SentrySwiftUI xcframework Samples/Carthage-Validation/XCFramework project to check imports.

Co-authored-by: Dhiogo Brustolin <[email protected]>

Author: nekrich

.gitignore

@@ -45,6 +45,7 @@ Carthage/Build
 Carthage/Checkouts
 Carthage
 Sentry.Carthage.json
+SentrySwiftUI.Carthage.json
 Sentry.framework.zip
 Sentry.xcframework.zip
 

CHANGELOG.md

@@ -15,6 +15,7 @@ more about how to use the Metrics API.
 - Don't run onCrashedLastSession for nil Events (#3785)
 - Redistributable static libraries should never be built with module debugging enabled (#3800)
 - Fixed certain views getting loaded twice when adding a child view controller (#3753)
+- Fixed broken imports in SentrySwiftUI Carthage build (#3817)
 - Fix NSInvalidArgumentException for `NSError sentryErrorWithDomain` (#3819)
 - Again fix runtime error when including Sentry as a static lib (#3820)
 - Fix crash in hasUnfinishedChildSpansToWaitFor (#3821)

Samples/Carthage-Validation/XCFramework/Cartfile

@@ -1 +1,2 @@
 binary "../Sentry.Carthage.json" ~> 1.0
+binary "../SentrySwiftUI.Carthage.json" ~> 1.0

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

@@ -7,6 +7,9 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
+		1573CAE42BBCA5660018A2B7 /* SentrySwiftUI.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1573CAE22BBCA4820018A2B7 /* SentrySwiftUI.xcframework */; };
+		1573CAE52BBCA5660018A2B7 /* SentrySwiftUI.xcframework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 1573CAE22BBCA4820018A2B7 /* SentrySwiftUI.xcframework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
+		1573CAE72BBCA8260018A2B7 /* CheckTracedView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1573CAE62BBCA8260018A2B7 /* CheckTracedView.swift */; };
 		7BA13E32267B3F5200DEE308 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7BA13E31267B3F5200DEE308 /* AppDelegate.swift */; };
 		7BA13E34267B3F5200DEE308 /* SceneDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7BA13E33267B3F5200DEE308 /* SceneDelegate.swift */; };
 		7BA13E36267B3F5200DEE308 /* ContentView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7BA13E35267B3F5200DEE308 /* ContentView.swift */; };
@@ -24,6 +27,7 @@
 			dstPath = "";
 			dstSubfolderSpec = 10;
 			files = (
+				1573CAE52BBCA5660018A2B7 /* SentrySwiftUI.xcframework in Embed Frameworks */,
 				7BA13E48267B4A2D00DEE308 /* Sentry.xcframework in Embed Frameworks */,
 			);
 			name = "Embed Frameworks";
@@ -32,6 +36,8 @@
 /* End PBXCopyFilesBuildPhase section */
 
 /* Begin PBXFileReference section */
+		1573CAE22BBCA4820018A2B7 /* SentrySwiftUI.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = SentrySwiftUI.xcframework; path = Carthage/Build/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>"; };
 		7BA13E33267B3F5200DEE308 /* SceneDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SceneDelegate.swift; sourceTree = "<group>"; };
@@ -48,6 +54,7 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				1573CAE42BBCA5660018A2B7 /* SentrySwiftUI.xcframework in Frameworks */,
 				7BA13E47267B4A2D00DEE308 /* Sentry.xcframework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -78,6 +85,7 @@
 				7BA13E31267B3F5200DEE308 /* AppDelegate.swift */,
 				7BA13E33267B3F5200DEE308 /* SceneDelegate.swift */,
 				7BA13E35267B3F5200DEE308 /* ContentView.swift */,
+				1573CAE62BBCA8260018A2B7 /* CheckTracedView.swift */,
 				7BA13E37267B3F5400DEE308 /* Assets.xcassets */,
 				7BA13E3C267B3F5400DEE308 /* LaunchScreen.storyboard */,
 				7BA13E3F267B3F5400DEE308 /* Info.plist */,
@@ -98,6 +106,7 @@
 			isa = PBXGroup;
 			children = (
 				7BA13E46267B4A2D00DEE308 /* Sentry.xcframework */,
+				1573CAE22BBCA4820018A2B7 /* SentrySwiftUI.xcframework */,
 			);
 			name = Frameworks;
 			sourceTree = "<group>";
@@ -174,6 +183,7 @@
 			buildActionMask = 2147483647;
 			files = (
 				7BA13E32267B3F5200DEE308 /* AppDelegate.swift in Sources */,
+				1573CAE72BBCA8260018A2B7 /* CheckTracedView.swift in Sources */,
 				7BA13E34267B3F5200DEE308 /* SceneDelegate.swift in Sources */,
 				7BA13E36267B3F5200DEE308 /* ContentView.swift in Sources */,
 			);

Samples/Carthage-Validation/XCFramework/XCFramework/CheckTracedView.swift

@@ -0,0 +1,23 @@
+import Foundation
+import SentrySwiftUI
+import SwiftUI
+
+public struct CheckTracedView<Content: View>: View {
+    public let content: () -> Content
+
+    public init(content: @escaping () -> Content) {
+        self.content = content
+    }
+
+    public var body: some View {
+        SentryTracedView {
+            content()
+        }
+    }
+}
+
+extension View {
+    public func traceView(_ viewName: String? = nil) -> some View {
+        sentryTrace(viewName)
+    }
+}

Sources/SentrySwiftUI/SentryTracedView.swift

@@ -1,7 +1,7 @@
 import Foundation
 import Sentry
-#if SWIFT_PACKAGE || CARTHAGE
-import SentryInternal
+#if CARTHAGE || SWIFT_PACKAGE
+@_implementationOnly import SentryInternal
 #endif
 import SwiftUI
 

scripts/create-carthage-json.sh

@@ -2,3 +2,4 @@
 set -euo pipefail
 
 echo "{ \"1.0\": \"file:///$(pwd)/Sentry.framework.zip?alt=file:///$(pwd)/Sentry.xcframework.zip\" }" > ./Samples/Carthage-Validation/Sentry.Carthage.json
+echo "{ \"1.0\": \"file:///$(pwd)/SentrySwiftUI.framework.zip?alt=file:///$(pwd)/SentrySwiftUI.xcframework.zip\" }" > ./Samples/Carthage-Validation/SentrySwiftUI.Carthage.json