Skip to content

Commit e324230

Browse files
authored
fix: paths to infoplist and modulemap (#3315)
1 parent d8eb419 commit e324230

2 files changed

Lines changed: 4 additions & 12 deletions

File tree

Sentry.xcodeproj/project.pbxproj

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1027,7 +1027,7 @@
10271027
63AA75951EB8AEDB00D153DE /* SentryTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SentryTests.m; sourceTree = "<group>"; };
10281028
63AA759B1EB8AEF500D153DE /* Sentry.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Sentry.framework; sourceTree = BUILT_PRODUCTS_DIR; };
10291029
63AA75C51EB8B00100D153DE /* Sentry.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Sentry.xcconfig; sourceTree = "<group>"; };
1030-
63AA75C71EB8B06100D153DE /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
1030+
63AA75C71EB8B06100D153DE /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; name = Info.plist; path = ../Resources/Info.plist; sourceTree = "<group>"; };
10311031
63AA75ED1EB8B3C400D153DE /* SentryClient.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SentryClient.m; sourceTree = "<group>"; };
10321032
63AA76651EB8CB2F00D153DE /* SentryTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = SentryTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
10331033
63AA76781EB8D20500D153DE /* SentryLog.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SentryLog.m; sourceTree = "<group>"; };
@@ -1518,7 +1518,7 @@
15181518
7D9B079F23D1E89800C5FC8E /* SentryMeta.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SentryMeta.h; path = include/SentryMeta.h; sourceTree = "<group>"; };
15191519
7DAC588E23D8B2E0001CF26B /* SentryGlobalEventProcessor.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SentryGlobalEventProcessor.m; sourceTree = "<group>"; };
15201520
7DB3A684238EA75E00A2D442 /* SentryHttpTransport.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SentryHttpTransport.m; sourceTree = "<group>"; };
1521-
7DC27E9823995F97006998B5 /* Sentry.modulemap */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.module-map"; path = Sentry.modulemap; sourceTree = "<group>"; };
1521+
7DC27E9823995F97006998B5 /* Sentry.modulemap */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.module-map"; name = Sentry.modulemap; path = ../Resources/Sentry.modulemap; sourceTree = "<group>"; };
15221522
7DC27EC323997EB7006998B5 /* SentryAutoBreadcrumbTrackingIntegration.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = SentryAutoBreadcrumbTrackingIntegration.h; path = include/SentryAutoBreadcrumbTrackingIntegration.h; sourceTree = "<group>"; };
15231523
7DC27EC423997EB7006998B5 /* SentryAutoBreadcrumbTrackingIntegration.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SentryAutoBreadcrumbTrackingIntegration.m; sourceTree = "<group>"; };
15241524
7DC830FF239826280043DD9A /* SentryIntegrationProtocol.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = SentryIntegrationProtocol.h; path = Public/SentryIntegrationProtocol.h; sourceTree = "<group>"; };
@@ -4695,11 +4695,9 @@
46954695
"$(inherited)",
46964696
);
46974697
GCC_WARN_SHADOW = YES;
4698-
INFOPLIST_FILE = Sources/Resources/Info.plist;
46994698
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
47004699
LD_DYLIB_INSTALL_NAME = "$(DYLIB_INSTALL_NAME_BASE:standardizepath)/$(EXECUTABLE_PATH)";
47014700
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
4702-
MODULEMAP_FILE = "$(SRCROOT)/Sources/Resources/Sentry.modulemap";
47034701
ONLY_ACTIVE_ARCH = YES;
47044702
OTHER_CFLAGS = "-DCARTHAGE_$(CARTHAGE)";
47054703
PRODUCT_BUNDLE_IDENTIFIER = io.sentry.Sentry;
@@ -4734,11 +4732,9 @@
47344732
GCC_C_LANGUAGE_STANDARD = "compiler-default";
47354733
GCC_OPTIMIZATION_LEVEL = s;
47364734
GCC_WARN_SHADOW = YES;
4737-
INFOPLIST_FILE = Sources/Resources/Info.plist;
47384735
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
47394736
LD_DYLIB_INSTALL_NAME = "$(DYLIB_INSTALL_NAME_BASE:standardizepath)/$(EXECUTABLE_PATH)";
47404737
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
4741-
MODULEMAP_FILE = "$(SRCROOT)/Sources/Resources/Sentry.modulemap";
47424738
ONLY_ACTIVE_ARCH = NO;
47434739
OTHER_CFLAGS = "-DCARTHAGE_$(CARTHAGE)";
47444740
PRODUCT_BUNDLE_IDENTIFIER = io.sentry.Sentry;
@@ -4889,11 +4885,9 @@
48894885
"TESTCI=1",
48904886
);
48914887
GCC_WARN_SHADOW = YES;
4892-
INFOPLIST_FILE = Sources/Resources/Info.plist;
48934888
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
48944889
LD_DYLIB_INSTALL_NAME = "$(DYLIB_INSTALL_NAME_BASE:standardizepath)/$(EXECUTABLE_PATH)";
48954890
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
4896-
MODULEMAP_FILE = "$(SRCROOT)/Sources/Resources/Sentry.modulemap";
48974891
ONLY_ACTIVE_ARCH = YES;
48984892
OTHER_CFLAGS = "-DCARTHAGE_$(CARTHAGE)";
48994893
PRODUCT_BUNDLE_IDENTIFIER = io.sentry.Sentry;
@@ -5236,11 +5230,9 @@
52365230
GCC_C_LANGUAGE_STANDARD = "compiler-default";
52375231
GCC_OPTIMIZATION_LEVEL = 0;
52385232
GCC_WARN_SHADOW = YES;
5239-
INFOPLIST_FILE = Sources/Resources/Info.plist;
52405233
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
52415234
LD_DYLIB_INSTALL_NAME = "$(DYLIB_INSTALL_NAME_BASE:standardizepath)/$(EXECUTABLE_PATH)";
52425235
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
5243-
MODULEMAP_FILE = "$(SRCROOT)/Sources/Resources/Sentry.modulemap";
52445236
ONLY_ACTIVE_ARCH = YES;
52455237
OTHER_CFLAGS = "-DCARTHAGE_$(CARTHAGE)";
52465238
PRODUCT_BUNDLE_IDENTIFIER = io.sentry.Sentry;
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
PRODUCT_NAME = Sentry
2-
INFOPLIST_FILE = Sources/Sentry/Info.plist
2+
INFOPLIST_FILE = Sources/Resources/Info.plist
33
PRODUCT_BUNDLE_IDENTIFIER = io.sentry.Sentry
44

55
CURRENT_PROJECT_VERSION = 8.13.0
66

7-
MODULEMAP_FILE = $(SRCROOT)/Sources/Sentry/Sentry.modulemap
7+
MODULEMAP_FILE = $(SRCROOT)/Sources/Resources/Sentry.modulemap

0 commit comments

Comments
 (0)