Skip to content

Commit 6bc40da

Browse files
committed
Changes to MACH-O static library.
1 parent bf7aaeb commit 6bc40da

File tree

2 files changed

+181
-7
lines changed

2 files changed

+181
-7
lines changed

Examples/Example.xcodeproj/project.pbxproj

Lines changed: 177 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -63,12 +63,89 @@
6363
/* End PBXBuildFile section */
6464

6565
/* Begin PBXContainerItemProxy section */
66-
B6F732B321C01D3B0007F9D9 /* PBXContainerItemProxy */ = {
66+
1E88A64F226C8A81007B9436 /* PBXContainerItemProxy */ = {
6767
isa = PBXContainerItemProxy;
6868
containerPortal = C88AC6FC214D9BA800C1A3E5 /* Rx.xcodeproj */;
6969
proxyType = 2;
70-
remoteGlobalIDString = C8165ABC21891AFF00494BEF;
71-
remoteInfo = RxAtomic;
70+
remoteGlobalIDString = C88BB8711B07E5ED0064D411;
71+
remoteInfo = "RxSwift-macOS";
72+
};
73+
1E88A651226C8A81007B9436 /* PBXContainerItemProxy */ = {
74+
isa = PBXContainerItemProxy;
75+
containerPortal = C88AC6FC214D9BA800C1A3E5 /* Rx.xcodeproj */;
76+
proxyType = 2;
77+
remoteGlobalIDString = D2EA280C1BB9B5A200880ED3;
78+
remoteInfo = "RxSwift-tvOS";
79+
};
80+
1E88A653226C8A81007B9436 /* PBXContainerItemProxy */ = {
81+
isa = PBXContainerItemProxy;
82+
containerPortal = C88AC6FC214D9BA800C1A3E5 /* Rx.xcodeproj */;
83+
proxyType = 2;
84+
remoteGlobalIDString = C8F0C0021BBBFB8B001B112F;
85+
remoteInfo = "RxSwift-watchOS";
86+
};
87+
1E88A655226C8A81007B9436 /* PBXContainerItemProxy */ = {
88+
isa = PBXContainerItemProxy;
89+
containerPortal = C88AC6FC214D9BA800C1A3E5 /* Rx.xcodeproj */;
90+
proxyType = 2;
91+
remoteGlobalIDString = C80939E71B8A71840088E94D;
92+
remoteInfo = "RxCocoa-macOS";
93+
};
94+
1E88A657226C8A81007B9436 /* PBXContainerItemProxy */ = {
95+
isa = PBXContainerItemProxy;
96+
containerPortal = C88AC6FC214D9BA800C1A3E5 /* Rx.xcodeproj */;
97+
proxyType = 2;
98+
remoteGlobalIDString = D2138C751BB9BE9800339B5C;
99+
remoteInfo = "RxCocoa-tvOS";
100+
};
101+
1E88A659226C8A81007B9436 /* PBXContainerItemProxy */ = {
102+
isa = PBXContainerItemProxy;
103+
containerPortal = C88AC6FC214D9BA800C1A3E5 /* Rx.xcodeproj */;
104+
proxyType = 2;
105+
remoteGlobalIDString = C8F0C04B1BBBFBB9001B112F;
106+
remoteInfo = "RxCocoa-watchOS";
107+
};
108+
1E88A65B226C8A81007B9436 /* PBXContainerItemProxy */ = {
109+
isa = PBXContainerItemProxy;
110+
containerPortal = C88AC6FC214D9BA800C1A3E5 /* Rx.xcodeproj */;
111+
proxyType = 2;
112+
remoteGlobalIDString = C8093C451B8A71FC0088E94D;
113+
remoteInfo = "RxBlocking-macOS";
114+
};
115+
1E88A65D226C8A81007B9436 /* PBXContainerItemProxy */ = {
116+
isa = PBXContainerItemProxy;
117+
containerPortal = C88AC6FC214D9BA800C1A3E5 /* Rx.xcodeproj */;
118+
proxyType = 2;
119+
remoteGlobalIDString = D2EBEB811BB9B99D003A27DC;
120+
remoteInfo = "RxBlocking-tvOS";
121+
};
122+
1E88A65F226C8A81007B9436 /* PBXContainerItemProxy */ = {
123+
isa = PBXContainerItemProxy;
124+
containerPortal = C88AC6FC214D9BA800C1A3E5 /* Rx.xcodeproj */;
125+
proxyType = 2;
126+
remoteGlobalIDString = C8F0C0581BBBFBCE001B112F;
127+
remoteInfo = "RxBlocking-watchOS";
128+
};
129+
1E88A661226C8A81007B9436 /* PBXContainerItemProxy */ = {
130+
isa = PBXContainerItemProxy;
131+
containerPortal = C88AC6FC214D9BA800C1A3E5 /* Rx.xcodeproj */;
132+
proxyType = 2;
133+
remoteGlobalIDString = C88FA51D1C25C4B500CCFEA4;
134+
remoteInfo = "RxTest-macOS";
135+
};
136+
1E88A663226C8A81007B9436 /* PBXContainerItemProxy */ = {
137+
isa = PBXContainerItemProxy;
138+
containerPortal = C88AC6FC214D9BA800C1A3E5 /* Rx.xcodeproj */;
139+
proxyType = 2;
140+
remoteGlobalIDString = C88FA52E1C25C4C000CCFEA4;
141+
remoteInfo = "RxTest-tvOS";
142+
};
143+
1E88A665226C8A81007B9436 /* PBXContainerItemProxy */ = {
144+
isa = PBXContainerItemProxy;
145+
containerPortal = C88AC6FC214D9BA800C1A3E5 /* Rx.xcodeproj */;
146+
proxyType = 2;
147+
remoteGlobalIDString = C88FA53F1C25C4CC00CCFEA4;
148+
remoteInfo = "RxTest-watchOS";
72149
};
73150
C82C3C591F3B937500309AE8 /* PBXContainerItemProxy */ = {
74151
isa = PBXContainerItemProxy;
@@ -349,11 +426,22 @@
349426
C88AC6FD214D9BA800C1A3E5 /* Products */ = {
350427
isa = PBXGroup;
351428
children = (
352-
B6F732B421C01D3B0007F9D9 /* RxAtomic.framework */,
353429
C88AC715214D9BA800C1A3E5 /* RxSwift.framework */,
430+
1E88A650226C8A81007B9436 /* RxSwift.framework */,
431+
1E88A652226C8A81007B9436 /* RxSwift.framework */,
432+
1E88A654226C8A81007B9436 /* RxSwift.framework */,
354433
C88AC71D214D9BA800C1A3E5 /* RxCocoa.framework */,
434+
1E88A656226C8A81007B9436 /* RxCocoa.framework */,
435+
1E88A658226C8A81007B9436 /* RxCocoa.framework */,
436+
1E88A65A226C8A81007B9436 /* RxCocoa.framework */,
355437
C88AC725214D9BA800C1A3E5 /* RxBlocking.framework */,
438+
1E88A65C226C8A81007B9436 /* RxBlocking.framework */,
439+
1E88A65E226C8A81007B9436 /* RxBlocking.framework */,
440+
1E88A660226C8A81007B9436 /* RxBlocking.framework */,
356441
C88AC72D214D9BA800C1A3E5 /* RxTest.framework */,
442+
1E88A662226C8A81007B9436 /* RxTest.framework */,
443+
1E88A664226C8A81007B9436 /* RxTest.framework */,
444+
1E88A666226C8A81007B9436 /* RxTest.framework */,
357445
C88AC735214D9BA800C1A3E5 /* AllTests-iOS.xctest */,
358446
C88AC737214D9BA800C1A3E5 /* AllTests-tvOS.xctest */,
359447
C88AC739214D9BA800C1A3E5 /* AllTests-macOS.xctest */,
@@ -591,6 +679,7 @@
591679
developmentRegion = English;
592680
hasScannedForEncodings = 0;
593681
knownRegions = (
682+
English,
594683
en,
595684
Base,
596685
);
@@ -615,11 +704,88 @@
615704
/* End PBXProject section */
616705

617706
/* Begin PBXReferenceProxy section */
618-
B6F732B421C01D3B0007F9D9 /* RxAtomic.framework */ = {
707+
1E88A650226C8A81007B9436 /* RxSwift.framework */ = {
708+
isa = PBXReferenceProxy;
709+
fileType = wrapper.framework;
710+
path = RxSwift.framework;
711+
remoteRef = 1E88A64F226C8A81007B9436 /* PBXContainerItemProxy */;
712+
sourceTree = BUILT_PRODUCTS_DIR;
713+
};
714+
1E88A652226C8A81007B9436 /* RxSwift.framework */ = {
715+
isa = PBXReferenceProxy;
716+
fileType = wrapper.framework;
717+
path = RxSwift.framework;
718+
remoteRef = 1E88A651226C8A81007B9436 /* PBXContainerItemProxy */;
719+
sourceTree = BUILT_PRODUCTS_DIR;
720+
};
721+
1E88A654226C8A81007B9436 /* RxSwift.framework */ = {
722+
isa = PBXReferenceProxy;
723+
fileType = wrapper.framework;
724+
path = RxSwift.framework;
725+
remoteRef = 1E88A653226C8A81007B9436 /* PBXContainerItemProxy */;
726+
sourceTree = BUILT_PRODUCTS_DIR;
727+
};
728+
1E88A656226C8A81007B9436 /* RxCocoa.framework */ = {
729+
isa = PBXReferenceProxy;
730+
fileType = wrapper.framework;
731+
path = RxCocoa.framework;
732+
remoteRef = 1E88A655226C8A81007B9436 /* PBXContainerItemProxy */;
733+
sourceTree = BUILT_PRODUCTS_DIR;
734+
};
735+
1E88A658226C8A81007B9436 /* RxCocoa.framework */ = {
736+
isa = PBXReferenceProxy;
737+
fileType = wrapper.framework;
738+
path = RxCocoa.framework;
739+
remoteRef = 1E88A657226C8A81007B9436 /* PBXContainerItemProxy */;
740+
sourceTree = BUILT_PRODUCTS_DIR;
741+
};
742+
1E88A65A226C8A81007B9436 /* RxCocoa.framework */ = {
743+
isa = PBXReferenceProxy;
744+
fileType = wrapper.framework;
745+
path = RxCocoa.framework;
746+
remoteRef = 1E88A659226C8A81007B9436 /* PBXContainerItemProxy */;
747+
sourceTree = BUILT_PRODUCTS_DIR;
748+
};
749+
1E88A65C226C8A81007B9436 /* RxBlocking.framework */ = {
750+
isa = PBXReferenceProxy;
751+
fileType = wrapper.framework;
752+
path = RxBlocking.framework;
753+
remoteRef = 1E88A65B226C8A81007B9436 /* PBXContainerItemProxy */;
754+
sourceTree = BUILT_PRODUCTS_DIR;
755+
};
756+
1E88A65E226C8A81007B9436 /* RxBlocking.framework */ = {
619757
isa = PBXReferenceProxy;
620758
fileType = wrapper.framework;
621-
path = RxAtomic.framework;
622-
remoteRef = B6F732B321C01D3B0007F9D9 /* PBXContainerItemProxy */;
759+
path = RxBlocking.framework;
760+
remoteRef = 1E88A65D226C8A81007B9436 /* PBXContainerItemProxy */;
761+
sourceTree = BUILT_PRODUCTS_DIR;
762+
};
763+
1E88A660226C8A81007B9436 /* RxBlocking.framework */ = {
764+
isa = PBXReferenceProxy;
765+
fileType = wrapper.framework;
766+
path = RxBlocking.framework;
767+
remoteRef = 1E88A65F226C8A81007B9436 /* PBXContainerItemProxy */;
768+
sourceTree = BUILT_PRODUCTS_DIR;
769+
};
770+
1E88A662226C8A81007B9436 /* RxTest.framework */ = {
771+
isa = PBXReferenceProxy;
772+
fileType = wrapper.framework;
773+
path = RxTest.framework;
774+
remoteRef = 1E88A661226C8A81007B9436 /* PBXContainerItemProxy */;
775+
sourceTree = BUILT_PRODUCTS_DIR;
776+
};
777+
1E88A664226C8A81007B9436 /* RxTest.framework */ = {
778+
isa = PBXReferenceProxy;
779+
fileType = wrapper.framework;
780+
path = RxTest.framework;
781+
remoteRef = 1E88A663226C8A81007B9436 /* PBXContainerItemProxy */;
782+
sourceTree = BUILT_PRODUCTS_DIR;
783+
};
784+
1E88A666226C8A81007B9436 /* RxTest.framework */ = {
785+
isa = PBXReferenceProxy;
786+
fileType = wrapper.framework;
787+
path = RxTest.framework;
788+
remoteRef = 1E88A665226C8A81007B9436 /* PBXContainerItemProxy */;
623789
sourceTree = BUILT_PRODUCTS_DIR;
624790
};
625791
C88AC715214D9BA800C1A3E5 /* RxSwift.framework */ = {
@@ -927,6 +1093,7 @@
9271093
INFOPLIST_FILE = Sources/Differentiator/Info.plist;
9281094
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
9291095
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
1096+
MACH_O_TYPE = staticlib;
9301097
PRODUCT_BUNDLE_IDENTIFIER = org.rxswiftcommunity.Differentiator;
9311098
PRODUCT_NAME = "$(TARGET_NAME)";
9321099
SKIP_INSTALL = YES;
@@ -950,6 +1117,7 @@
9501117
INFOPLIST_FILE = Sources/Differentiator/Info.plist;
9511118
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
9521119
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
1120+
MACH_O_TYPE = staticlib;
9531121
PRODUCT_BUNDLE_IDENTIFIER = org.rxswiftcommunity.Differentiator;
9541122
PRODUCT_NAME = "$(TARGET_NAME)";
9551123
SKIP_INSTALL = YES;
@@ -1094,6 +1262,7 @@
10941262
INFOPLIST_FILE = Sources/RxDataSources/Info.plist;
10951263
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
10961264
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
1265+
MACH_O_TYPE = staticlib;
10971266
PRODUCT_BUNDLE_IDENTIFIER = kzaher.RxDataSources;
10981267
PRODUCT_NAME = RxDataSources;
10991268
SKIP_INSTALL = YES;
@@ -1117,6 +1286,7 @@
11171286
INFOPLIST_FILE = Sources/RxDataSources/Info.plist;
11181287
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
11191288
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
1289+
MACH_O_TYPE = staticlib;
11201290
PRODUCT_BUNDLE_IDENTIFIER = kzaher.RxDataSources;
11211291
PRODUCT_NAME = RxDataSources;
11221292
SKIP_INSTALL = YES;

RxDataSources.xcodeproj/project.pbxproj

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -513,6 +513,7 @@
513513
INFOPLIST_FILE = Sources/Differentiator/Info.plist;
514514
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
515515
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
516+
MACH_O_TYPE = staticlib;
516517
PRODUCT_BUNDLE_IDENTIFIER = org.rxswiftcommunity.Differentiator;
517518
PRODUCT_NAME = "$(TARGET_NAME)";
518519
SKIP_INSTALL = YES;
@@ -536,6 +537,7 @@
536537
INFOPLIST_FILE = Sources/Differentiator/Info.plist;
537538
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
538539
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
540+
MACH_O_TYPE = staticlib;
539541
PRODUCT_BUNDLE_IDENTIFIER = org.rxswiftcommunity.Differentiator;
540542
PRODUCT_NAME = "$(TARGET_NAME)";
541543
SKIP_INSTALL = YES;
@@ -716,6 +718,7 @@
716718
INFOPLIST_FILE = Sources/RxDataSources/Info.plist;
717719
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
718720
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
721+
MACH_O_TYPE = staticlib;
719722
PRODUCT_BUNDLE_IDENTIFIER = kzaher.RxDataSources;
720723
PRODUCT_NAME = RxDataSources;
721724
SKIP_INSTALL = YES;
@@ -735,6 +738,7 @@
735738
INFOPLIST_FILE = Sources/RxDataSources/Info.plist;
736739
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
737740
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
741+
MACH_O_TYPE = staticlib;
738742
PRODUCT_BUNDLE_IDENTIFIER = kzaher.RxDataSources;
739743
PRODUCT_NAME = RxDataSources;
740744
SKIP_INSTALL = YES;

0 commit comments

Comments
 (0)