Skip to content

Commit f1b6f08

Browse files
DivineDominionDivineDominion
committed
update Xcode project to use RxSwift.xcframework
1 parent 6b9bc23 commit f1b6f08

1 file changed

Lines changed: 76 additions & 47 deletions

File tree

‎RxFileMonitor.xcodeproj/project.pbxproj‎

Lines changed: 76 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -3,38 +3,39 @@
33
archiveVersion = 1;
44
classes = {
55
};
6-
objectVersion = 46;
6+
objectVersion = 54;
77
objects = {
88

99
/* Begin PBXBuildFile section */
10+
5039073C2D2950ED004BEDD2 /* RxSwift.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5039073B2D2950ED004BEDD2 /* RxSwift.xcframework */; };
11+
5039073F2D2950FC004BEDD2 /* RxFileMonitor.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 50E835431DD1B26900783B62 /* RxFileMonitor.framework */; };
12+
503907402D2950FC004BEDD2 /* RxFileMonitor.framework in Copy Frameworks */ = {isa = PBXBuildFile; fileRef = 50E835431DD1B26900783B62 /* RxFileMonitor.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
13+
503907432D2950FD004BEDD2 /* RxSwift.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5039073B2D2950ED004BEDD2 /* RxSwift.xcframework */; };
14+
503907442D2950FD004BEDD2 /* RxSwift.xcframework in Copy Frameworks */ = {isa = PBXBuildFile; fileRef = 5039073B2D2950ED004BEDD2 /* RxSwift.xcframework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
15+
503907452D295105004BEDD2 /* RxFileMonitor.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 50E835431DD1B26900783B62 /* RxFileMonitor.framework */; };
16+
503907462D295105004BEDD2 /* RxFileMonitor.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 50E835431DD1B26900783B62 /* RxFileMonitor.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
17+
503907492D295105004BEDD2 /* RxSwift.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5039073B2D2950ED004BEDD2 /* RxSwift.xcframework */; };
18+
5039074A2D295105004BEDD2 /* RxSwift.xcframework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 5039073B2D2950ED004BEDD2 /* RxSwift.xcframework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
1019
5096B2B51DD21D0B00076058 /* Change.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5096B2B41DD21D0B00076058 /* Change.swift */; };
11-
5096B2B71DD2216B00076058 /* RxSwift.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5096B2B61DD2216B00076058 /* RxSwift.framework */; };
12-
5096B2B81DD2216B00076058 /* RxSwift.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5096B2B61DD2216B00076058 /* RxSwift.framework */; };
13-
5096B2B91DD2217900076058 /* RxSwift.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5096B2B61DD2216B00076058 /* RxSwift.framework */; };
14-
5096B2BA1DD2217900076058 /* RxSwift.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 5096B2B61DD2216B00076058 /* RxSwift.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
1520
5096B2BC1DD221D700076058 /* RxFileMonitor.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5096B2BB1DD221D700076058 /* RxFileMonitor.swift */; };
1621
5096B2C11DD22D6000076058 /* FolderContentChangeEvent.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5096B2C01DD22D6000076058 /* FolderContentChangeEvent.swift */; };
17-
50B257C91F7AB26D0044F65F /* RxSwift.framework in Copy Frameworks */ = {isa = PBXBuildFile; fileRef = 5096B2B61DD2216B00076058 /* RxSwift.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
18-
50E8354D1DD1B26900783B62 /* RxFileMonitor.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 50E835431DD1B26900783B62 /* RxFileMonitor.framework */; };
1922
50E835521DD1B26900783B62 /* RxFileMonitorTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 50E835511DD1B26900783B62 /* RxFileMonitorTests.swift */; };
2023
50E835541DD1B26900783B62 /* RxFileMonitor.h in Headers */ = {isa = PBXBuildFile; fileRef = 50E835461DD1B26900783B62 /* RxFileMonitor.h */; settings = {ATTRIBUTES = (Public, ); }; };
2124
50E835641DD1B28400783B62 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 50E835631DD1B28400783B62 /* AppDelegate.swift */; };
2225
50E835661DD1B28400783B62 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 50E835651DD1B28400783B62 /* Assets.xcassets */; };
2326
50E835691DD1B28400783B62 /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = 50E835671DD1B28400783B62 /* MainMenu.xib */; };
24-
50E835701DD1BE2700783B62 /* RxFileMonitor.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 50E835431DD1B26900783B62 /* RxFileMonitor.framework */; };
25-
50E835711DD1BE2700783B62 /* RxFileMonitor.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 50E835431DD1B26900783B62 /* RxFileMonitor.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
2627
50E835761DD1D1C200783B62 /* FolderContentMonitor.swift in Sources */ = {isa = PBXBuildFile; fileRef = 50E835751DD1D1C200783B62 /* FolderContentMonitor.swift */; };
2728
/* End PBXBuildFile section */
2829

2930
/* Begin PBXContainerItemProxy section */
30-
50E8354E1DD1B26900783B62 /* PBXContainerItemProxy */ = {
31+
503907412D2950FD004BEDD2 /* PBXContainerItemProxy */ = {
3132
isa = PBXContainerItemProxy;
3233
containerPortal = 50E8353A1DD1B26900783B62 /* Project object */;
3334
proxyType = 1;
3435
remoteGlobalIDString = 50E835421DD1B26900783B62;
3536
remoteInfo = RxFileMonitor;
3637
};
37-
50E835721DD1BE2700783B62 /* PBXContainerItemProxy */ = {
38+
503907472D295105004BEDD2 /* PBXContainerItemProxy */ = {
3839
isa = PBXContainerItemProxy;
3940
containerPortal = 50E8353A1DD1B26900783B62 /* Project object */;
4041
proxyType = 1;
@@ -44,34 +45,35 @@
4445
/* End PBXContainerItemProxy section */
4546

4647
/* Begin PBXCopyFilesBuildPhase section */
47-
50B257C81F7AB25D0044F65F /* Copy Frameworks */ = {
48+
5039074B2D295105004BEDD2 /* Embed Frameworks */ = {
4849
isa = PBXCopyFilesBuildPhase;
4950
buildActionMask = 2147483647;
5051
dstPath = "";
5152
dstSubfolderSpec = 10;
5253
files = (
53-
50B257C91F7AB26D0044F65F /* RxSwift.framework in Copy Frameworks */,
54+
503907462D295105004BEDD2 /* RxFileMonitor.framework in Embed Frameworks */,
55+
5039074A2D295105004BEDD2 /* RxSwift.xcframework in Embed Frameworks */,
5456
);
55-
name = "Copy Frameworks";
57+
name = "Embed Frameworks";
5658
runOnlyForDeploymentPostprocessing = 0;
5759
};
58-
50E835741DD1BE2700783B62 /* Embed Frameworks */ = {
60+
50B257C81F7AB25D0044F65F /* Copy Frameworks */ = {
5961
isa = PBXCopyFilesBuildPhase;
6062
buildActionMask = 2147483647;
6163
dstPath = "";
6264
dstSubfolderSpec = 10;
6365
files = (
64-
5096B2BA1DD2217900076058 /* RxSwift.framework in Embed Frameworks */,
65-
50E835711DD1BE2700783B62 /* RxFileMonitor.framework in Embed Frameworks */,
66+
503907402D2950FC004BEDD2 /* RxFileMonitor.framework in Copy Frameworks */,
67+
503907442D2950FD004BEDD2 /* RxSwift.xcframework in Copy Frameworks */,
6668
);
67-
name = "Embed Frameworks";
69+
name = "Copy Frameworks";
6870
runOnlyForDeploymentPostprocessing = 0;
6971
};
7072
/* End PBXCopyFilesBuildPhase section */
7173

7274
/* Begin PBXFileReference section */
75+
5039073B2D2950ED004BEDD2 /* RxSwift.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = RxSwift.xcframework; path = Carthage/Build/RxSwift.xcframework; sourceTree = "<group>"; };
7376
5096B2B41DD21D0B00076058 /* Change.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Change.swift; sourceTree = "<group>"; };
74-
5096B2B61DD2216B00076058 /* RxSwift.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = RxSwift.framework; path = Carthage/Build/Mac/RxSwift.framework; sourceTree = "<group>"; };
7577
5096B2BB1DD221D700076058 /* RxFileMonitor.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RxFileMonitor.swift; sourceTree = "<group>"; };
7678
5096B2C01DD22D6000076058 /* FolderContentChangeEvent.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = FolderContentChangeEvent.swift; sourceTree = "<group>"; };
7779
5096B2C21DD22FC200076058 /* LICENSE */ = {isa = PBXFileReference; lastKnownFileType = text; path = LICENSE; sourceTree = "<group>"; };
@@ -96,31 +98,39 @@
9698
isa = PBXFrameworksBuildPhase;
9799
buildActionMask = 2147483647;
98100
files = (
99-
5096B2B71DD2216B00076058 /* RxSwift.framework in Frameworks */,
101+
5039073C2D2950ED004BEDD2 /* RxSwift.xcframework in Frameworks */,
100102
);
101103
runOnlyForDeploymentPostprocessing = 0;
102104
};
103105
50E835491DD1B26900783B62 /* Frameworks */ = {
104106
isa = PBXFrameworksBuildPhase;
105107
buildActionMask = 2147483647;
106108
files = (
107-
5096B2B81DD2216B00076058 /* RxSwift.framework in Frameworks */,
108-
50E8354D1DD1B26900783B62 /* RxFileMonitor.framework in Frameworks */,
109+
5039073F2D2950FC004BEDD2 /* RxFileMonitor.framework in Frameworks */,
110+
503907432D2950FD004BEDD2 /* RxSwift.xcframework in Frameworks */,
109111
);
110112
runOnlyForDeploymentPostprocessing = 0;
111113
};
112114
50E8355E1DD1B28400783B62 /* Frameworks */ = {
113115
isa = PBXFrameworksBuildPhase;
114116
buildActionMask = 2147483647;
115117
files = (
116-
5096B2B91DD2217900076058 /* RxSwift.framework in Frameworks */,
117-
50E835701DD1BE2700783B62 /* RxFileMonitor.framework in Frameworks */,
118+
503907452D295105004BEDD2 /* RxFileMonitor.framework in Frameworks */,
119+
503907492D295105004BEDD2 /* RxSwift.xcframework in Frameworks */,
118120
);
119121
runOnlyForDeploymentPostprocessing = 0;
120122
};
121123
/* End PBXFrameworksBuildPhase section */
122124

123125
/* Begin PBXGroup section */
126+
5039073A2D2950ED004BEDD2 /* Frameworks */ = {
127+
isa = PBXGroup;
128+
children = (
129+
5039073B2D2950ED004BEDD2 /* RxSwift.xcframework */,
130+
);
131+
name = Frameworks;
132+
sourceTree = "<group>";
133+
};
124134
5096B2BD1DD222D000076058 /* Monitors */ = {
125135
isa = PBXGroup;
126136
children = (
@@ -140,8 +150,8 @@
140150
50E835451DD1B26900783B62 /* RxFileMonitor */,
141151
50E835501DD1B26900783B62 /* RxFileMonitorTests */,
142152
50E835621DD1B28400783B62 /* Example */,
153+
5039073A2D2950ED004BEDD2 /* Frameworks */,
143154
50E835441DD1B26900783B62 /* Products */,
144-
5096B2B61DD2216B00076058 /* RxSwift.framework */,
145155
);
146156
sourceTree = "<group>";
147157
};
@@ -230,7 +240,7 @@
230240
buildRules = (
231241
);
232242
dependencies = (
233-
50E8354F1DD1B26900783B62 /* PBXTargetDependency */,
243+
503907422D2950FD004BEDD2 /* PBXTargetDependency */,
234244
);
235245
name = RxFileMonitorTests;
236246
productName = RxFileMonitorTests;
@@ -244,12 +254,12 @@
244254
50E8355D1DD1B28400783B62 /* Sources */,
245255
50E8355E1DD1B28400783B62 /* Frameworks */,
246256
50E8355F1DD1B28400783B62 /* Resources */,
247-
50E835741DD1BE2700783B62 /* Embed Frameworks */,
257+
5039074B2D295105004BEDD2 /* Embed Frameworks */,
248258
);
249259
buildRules = (
250260
);
251261
dependencies = (
252-
50E835731DD1BE2700783B62 /* PBXTargetDependency */,
262+
503907482D295105004BEDD2 /* PBXTargetDependency */,
253263
);
254264
name = Example;
255265
productName = Example;
@@ -360,15 +370,15 @@
360370
/* End PBXSourcesBuildPhase section */
361371

362372
/* Begin PBXTargetDependency section */
363-
50E8354F1DD1B26900783B62 /* PBXTargetDependency */ = {
373+
503907422D2950FD004BEDD2 /* PBXTargetDependency */ = {
364374
isa = PBXTargetDependency;
365375
target = 50E835421DD1B26900783B62 /* RxFileMonitor */;
366-
targetProxy = 50E8354E1DD1B26900783B62 /* PBXContainerItemProxy */;
376+
targetProxy = 503907412D2950FD004BEDD2 /* PBXContainerItemProxy */;
367377
};
368-
50E835731DD1BE2700783B62 /* PBXTargetDependency */ = {
378+
503907482D295105004BEDD2 /* PBXTargetDependency */ = {
369379
isa = PBXTargetDependency;
370380
target = 50E835421DD1B26900783B62 /* RxFileMonitor */;
371-
targetProxy = 50E835721DD1BE2700783B62 /* PBXContainerItemProxy */;
381+
targetProxy = 503907472D295105004BEDD2 /* PBXContainerItemProxy */;
372382
};
373383
/* End PBXTargetDependency section */
374384

@@ -498,7 +508,8 @@
498508
MACOSX_DEPLOYMENT_TARGET = 10.13;
499509
MTL_ENABLE_DEBUG_INFO = NO;
500510
SDKROOT = macosx;
501-
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
511+
SWIFT_COMPILATION_MODE = wholemodule;
512+
SWIFT_OPTIMIZATION_LEVEL = "-O";
502513
VERSIONING_SYSTEM = "apple-generic";
503514
VERSION_INFO_PREFIX = "";
504515
};
@@ -518,12 +529,16 @@
518529
DYLIB_INSTALL_NAME_BASE = "@rpath";
519530
FRAMEWORK_SEARCH_PATHS = (
520531
"$(inherited)",
521-
"$(PROJECT_DIR)/Carthage/Build/Mac",
532+
"$(PROJECT_DIR)/Carthage/Build/",
522533
);
523534
FRAMEWORK_VERSION = A;
524535
INFOPLIST_FILE = RxFileMonitor/Info.plist;
525536
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
526-
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks";
537+
LD_RUNPATH_SEARCH_PATHS = (
538+
"$(inherited)",
539+
"@executable_path/../Frameworks",
540+
"@loader_path/Frameworks",
541+
);
527542
PRODUCT_BUNDLE_IDENTIFIER = de.christiantietze.RxFileMonitor;
528543
PRODUCT_NAME = "$(TARGET_NAME)";
529544
SKIP_INSTALL = YES;
@@ -546,12 +561,16 @@
546561
DYLIB_INSTALL_NAME_BASE = "@rpath";
547562
FRAMEWORK_SEARCH_PATHS = (
548563
"$(inherited)",
549-
"$(PROJECT_DIR)/Carthage/Build/Mac",
564+
"$(PROJECT_DIR)/Carthage/Build/",
550565
);
551566
FRAMEWORK_VERSION = A;
552567
INFOPLIST_FILE = RxFileMonitor/Info.plist;
553568
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
554-
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks";
569+
LD_RUNPATH_SEARCH_PATHS = (
570+
"$(inherited)",
571+
"@executable_path/../Frameworks",
572+
"@loader_path/Frameworks",
573+
);
555574
PRODUCT_BUNDLE_IDENTIFIER = de.christiantietze.RxFileMonitor;
556575
PRODUCT_NAME = "$(TARGET_NAME)";
557576
SKIP_INSTALL = YES;
@@ -562,7 +581,6 @@
562581
50E8355B1DD1B26900783B62 /* Debug */ = {
563582
isa = XCBuildConfiguration;
564583
buildSettings = {
565-
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
566584
COMBINE_HIDPI_IMAGES = YES;
567585
DEAD_CODE_STRIPPING = YES;
568586
DEVELOPMENT_TEAM = "";
@@ -571,7 +589,11 @@
571589
"$(PROJECT_DIR)/Carthage/Build/Mac",
572590
);
573591
INFOPLIST_FILE = RxFileMonitorTests/Info.plist;
574-
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks";
592+
LD_RUNPATH_SEARCH_PATHS = (
593+
"$(inherited)",
594+
"@executable_path/../Frameworks",
595+
"@loader_path/../Frameworks",
596+
);
575597
MACOSX_DEPLOYMENT_TARGET = "$(RECOMMENDED_MACOSX_DEPLOYMENT_TARGET)";
576598
PRODUCT_BUNDLE_IDENTIFIER = de.christiantietze.RxFileMonitorTests;
577599
PRODUCT_NAME = "$(TARGET_NAME)";
@@ -582,7 +604,6 @@
582604
50E8355C1DD1B26900783B62 /* Release */ = {
583605
isa = XCBuildConfiguration;
584606
buildSettings = {
585-
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
586607
COMBINE_HIDPI_IMAGES = YES;
587608
DEAD_CODE_STRIPPING = YES;
588609
DEVELOPMENT_TEAM = "";
@@ -591,7 +612,11 @@
591612
"$(PROJECT_DIR)/Carthage/Build/Mac",
592613
);
593614
INFOPLIST_FILE = RxFileMonitorTests/Info.plist;
594-
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks";
615+
LD_RUNPATH_SEARCH_PATHS = (
616+
"$(inherited)",
617+
"@executable_path/../Frameworks",
618+
"@loader_path/../Frameworks",
619+
);
595620
MACOSX_DEPLOYMENT_TARGET = "$(RECOMMENDED_MACOSX_DEPLOYMENT_TARGET)";
596621
PRODUCT_BUNDLE_IDENTIFIER = de.christiantietze.RxFileMonitorTests;
597622
PRODUCT_NAME = "$(TARGET_NAME)";
@@ -602,18 +627,20 @@
602627
50E8356C1DD1B28400783B62 /* Debug */ = {
603628
isa = XCBuildConfiguration;
604629
buildSettings = {
605-
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
606630
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
607631
CODE_SIGN_IDENTITY = "-";
608632
COMBINE_HIDPI_IMAGES = YES;
609633
DEAD_CODE_STRIPPING = YES;
610634
DEVELOPMENT_TEAM = "";
611635
FRAMEWORK_SEARCH_PATHS = (
612636
"$(inherited)",
613-
"$(PROJECT_DIR)/Carthage/Build/Mac",
637+
"$(PROJECT_DIR)/Carthage/Build/**",
614638
);
615639
INFOPLIST_FILE = Example/Info.plist;
616-
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
640+
LD_RUNPATH_SEARCH_PATHS = (
641+
"$(inherited)",
642+
"@executable_path/../Frameworks",
643+
);
617644
MACOSX_DEPLOYMENT_TARGET = "$(RECOMMENDED_MACOSX_DEPLOYMENT_TARGET)";
618645
PRODUCT_BUNDLE_IDENTIFIER = de.christiantietze.Example;
619646
PRODUCT_NAME = "$(TARGET_NAME)";
@@ -624,18 +651,20 @@
624651
50E8356D1DD1B28400783B62 /* Release */ = {
625652
isa = XCBuildConfiguration;
626653
buildSettings = {
627-
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
628654
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
629655
CODE_SIGN_IDENTITY = "-";
630656
COMBINE_HIDPI_IMAGES = YES;
631657
DEAD_CODE_STRIPPING = YES;
632658
DEVELOPMENT_TEAM = "";
633659
FRAMEWORK_SEARCH_PATHS = (
634660
"$(inherited)",
635-
"$(PROJECT_DIR)/Carthage/Build/Mac",
661+
"$(PROJECT_DIR)/Carthage/Build/**",
636662
);
637663
INFOPLIST_FILE = Example/Info.plist;
638-
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
664+
LD_RUNPATH_SEARCH_PATHS = (
665+
"$(inherited)",
666+
"@executable_path/../Frameworks",
667+
);
639668
MACOSX_DEPLOYMENT_TARGET = "$(RECOMMENDED_MACOSX_DEPLOYMENT_TARGET)";
640669
PRODUCT_BUNDLE_IDENTIFIER = de.christiantietze.Example;
641670
PRODUCT_NAME = "$(TARGET_NAME)";

0 commit comments

Comments
 (0)