Skip to content

Commit a6a4153

Browse files
1ec51ec5
authored
Merge pull request #149 from mapbox/1ec5-embed-framework
Embed framework in example applications
2 parents 029ea37 + 4272004 commit a6a4153

File tree

1 file changed

+33
-6
lines changed

1 file changed

+33
-6
lines changed

‎MapboxGeocoder.xcodeproj/project.pbxproj‎

Lines changed: 33 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
DA2E03F21CB0FE0200D1269A /* MBRectangularRegion.swift in Sources */ = {isa = PBXBuildFile; fileRef = DA2E03F11CB0FE0200D1269A /* MBRectangularRegion.swift */; };
2525
DA2EC05C1CED72E900D4BA5D /* MBPlacemarkScope.swift in Sources */ = {isa = PBXBuildFile; fileRef = DA2EC05B1CED72E900D4BA5D /* MBPlacemarkScope.swift */; };
2626
DA2EC05E1CED732F00D4BA5D /* MBGeocodeOptions.swift in Sources */ = {isa = PBXBuildFile; fileRef = DA2EC05D1CED732F00D4BA5D /* MBGeocodeOptions.swift */; };
27+
DA4C581920E195E300A61B00 /* MapboxGeocoder.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = DDC2470419A1C3B40054B0C0 /* MapboxGeocoder.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
2728
DA4D90071DD63AEC006EC71A /* PlacemarkScopeTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = DA4D90061DD63AEC006EC71A /* PlacemarkScopeTests.swift */; };
2829
DA4D90081DD63AEC006EC71A /* PlacemarkScopeTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = DA4D90061DD63AEC006EC71A /* PlacemarkScopeTests.swift */; };
2930
DA4D90091DD63AEC006EC71A /* PlacemarkScopeTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = DA4D90061DD63AEC006EC71A /* PlacemarkScopeTests.swift */; };
@@ -72,17 +73,17 @@
7273
DA737B011E599C2C00AD2CDE /* OHHTTPStubs.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DA737AFC1E599BB300AD2CDE /* OHHTTPStubs.framework */; };
7374
DA737B041E599C4A00AD2CDE /* OHHTTPStubs.framework.dSYM in CopyFiles */ = {isa = PBXBuildFile; fileRef = DA737AFF1E599BD400AD2CDE /* OHHTTPStubs.framework.dSYM */; };
7475
DA737B051E599C6B00AD2CDE /* OHHTTPStubs.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DA737AFA1E599B9D00AD2CDE /* OHHTTPStubs.framework */; };
76+
DAA75ED620DDAD760049807C /* MapboxGeocoder.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DDC2470419A1C3B40054B0C0 /* MapboxGeocoder.framework */; };
77+
DAA75ED720DDAD760049807C /* MapboxGeocoder.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = DDC2470419A1C3B40054B0C0 /* MapboxGeocoder.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
7578
DAF158851D03D81600829B35 /* Launch Screen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = DAF158841D03D81600829B35 /* Launch Screen.storyboard */; };
7679
DAF158861D03D81600829B35 /* Launch Screen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = DAF158841D03D81600829B35 /* Launch Screen.storyboard */; };
7780
DD342B5619A140EE00219F77 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = DD342B5519A140EE00219F77 /* AppDelegate.swift */; };
7881
DD342B5819A140EE00219F77 /* ViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = DD342B5719A140EE00219F77 /* ViewController.swift */; };
7982
DDC2295C1A36074F006BE405 /* MapboxGeocoder.h in Headers */ = {isa = PBXBuildFile; fileRef = DDC229581A36073B006BE405 /* MapboxGeocoder.h */; settings = {ATTRIBUTES = (Public, ); }; };
8083
DDC2295E1A360843006BE405 /* MBGeocoder.swift in Sources */ = {isa = PBXBuildFile; fileRef = DDC229591A36073B006BE405 /* MBGeocoder.swift */; };
81-
DDC2471819A1C3B40054B0C0 /* MapboxGeocoder.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DDC2470419A1C3B40054B0C0 /* MapboxGeocoder.framework */; };
8284
DDC2472F19A1C60E0054B0C0 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = DDC2472E19A1C60E0054B0C0 /* main.m */; };
8385
DDC2473219A1C60E0054B0C0 /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = DDC2473119A1C60E0054B0C0 /* AppDelegate.m */; };
8486
DDC2473519A1C60E0054B0C0 /* ViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = DDC2473419A1C60E0054B0C0 /* ViewController.m */; };
85-
DDC2474F19A1C64D0054B0C0 /* MapboxGeocoder.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DDC2470419A1C3B40054B0C0 /* MapboxGeocoder.framework */; };
8687
DDF1E84D1BD6F7BA00C40C78 /* ReverseGeocodingTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = DDF1E84C1BD6F7BA00C40C78 /* ReverseGeocodingTests.swift */; };
8788
DDF1E85C1BD70E4C00C40C78 /* reverse_invalid.json in Resources */ = {isa = PBXBuildFile; fileRef = DDF1E85A1BD70E4C00C40C78 /* reverse_invalid.json */; };
8889
DDF1E85D1BD70E4C00C40C78 /* reverse_valid.json in Resources */ = {isa = PBXBuildFile; fileRef = DDF1E85B1BD70E4C00C40C78 /* reverse_valid.json */; };
@@ -134,6 +135,17 @@
134135
/* End PBXContainerItemProxy section */
135136

136137
/* Begin PBXCopyFilesBuildPhase section */
138+
DA4C581A20E195E300A61B00 /* Embed Frameworks */ = {
139+
isa = PBXCopyFilesBuildPhase;
140+
buildActionMask = 2147483647;
141+
dstPath = "";
142+
dstSubfolderSpec = 10;
143+
files = (
144+
DA4C581920E195E300A61B00 /* MapboxGeocoder.framework in Embed Frameworks */,
145+
);
146+
name = "Embed Frameworks";
147+
runOnlyForDeploymentPostprocessing = 0;
148+
};
137149
DA737B021E599C3600AD2CDE /* CopyFiles */ = {
138150
isa = PBXCopyFilesBuildPhase;
139151
buildActionMask = 2147483647;
@@ -144,6 +156,17 @@
144156
);
145157
runOnlyForDeploymentPostprocessing = 0;
146158
};
159+
DAA75ED820DDAD760049807C /* Embed Frameworks */ = {
160+
isa = PBXCopyFilesBuildPhase;
161+
buildActionMask = 2147483647;
162+
dstPath = "";
163+
dstSubfolderSpec = 10;
164+
files = (
165+
DAA75ED720DDAD760049807C /* MapboxGeocoder.framework in Embed Frameworks */,
166+
);
167+
name = "Embed Frameworks";
168+
runOnlyForDeploymentPostprocessing = 0;
169+
};
147170
/* End PBXCopyFilesBuildPhase section */
148171

149172
/* Begin PBXFileReference section */
@@ -239,7 +262,7 @@
239262
isa = PBXFrameworksBuildPhase;
240263
buildActionMask = 2147483647;
241264
files = (
242-
DDC2471819A1C3B40054B0C0 /* MapboxGeocoder.framework in Frameworks */,
265+
DAA75ED620DDAD760049807C /* MapboxGeocoder.framework in Frameworks */,
243266
DA737AEE1E5999C900AD2CDE /* Mapbox.framework in Frameworks */,
244267
);
245268
runOnlyForDeploymentPostprocessing = 0;
@@ -256,7 +279,6 @@
256279
isa = PBXFrameworksBuildPhase;
257280
buildActionMask = 2147483647;
258281
files = (
259-
DDC2474F19A1C64D0054B0C0 /* MapboxGeocoder.framework in Frameworks */,
260282
DA737AF51E599AB300AD2CDE /* Mapbox.framework in Frameworks */,
261283
);
262284
runOnlyForDeploymentPostprocessing = 0;
@@ -547,6 +569,7 @@
547569
DD342B4D19A140EE00219F77 /* Frameworks */,
548570
DD342B4E19A140EE00219F77 /* Resources */,
549571
DA737AF11E599A2300AD2CDE /* Copy Frameworks */,
572+
DAA75ED820DDAD760049807C /* Embed Frameworks */,
550573
);
551574
buildRules = (
552575
);
@@ -584,6 +607,7 @@
584607
DDC2472719A1C60E0054B0C0 /* Frameworks */,
585608
DDC2472819A1C60E0054B0C0 /* Resources */,
586609
DA737AF71E599ABF00AD2CDE /* Copy Frameworks */,
610+
DA4C581A20E195E300A61B00 /* Embed Frameworks */,
587611
);
588612
buildRules = (
589613
);
@@ -787,10 +811,11 @@
787811
);
788812
name = "Copy Frameworks";
789813
outputPaths = (
814+
"$(BUILT_PRODUCTS_DIR)/$(FRAMEWORKS_FOLDER_PATH)/Mapbox.framework",
790815
);
791816
runOnlyForDeploymentPostprocessing = 0;
792817
shellPath = /bin/sh;
793-
shellScript = "/usr/local/bin/carthage copy-frameworks";
818+
shellScript = "/usr/local/bin/carthage copy-frameworks\n";
794819
};
795820
DA737AF71E599ABF00AD2CDE /* Copy Frameworks */ = {
796821
isa = PBXShellScriptBuildPhase;
@@ -805,7 +830,7 @@
805830
);
806831
runOnlyForDeploymentPostprocessing = 0;
807832
shellPath = /bin/sh;
808-
shellScript = "/usr/local/bin/carthage copy-frameworks";
833+
shellScript = "/usr/local/bin/carthage copy-frameworks\n";
809834
};
810835
DA737B071E599C7900AD2CDE /* Copy Frameworks */ = {
811836
isa = PBXShellScriptBuildPhase;
@@ -1377,6 +1402,7 @@
13771402
DD342B6D19A140EE00219F77 /* Debug */ = {
13781403
isa = XCBuildConfiguration;
13791404
buildSettings = {
1405+
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
13801406
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
13811407
ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
13821408
FRAMEWORK_SEARCH_PATHS = (
@@ -1395,6 +1421,7 @@
13951421
DD342B6E19A140EE00219F77 /* Release */ = {
13961422
isa = XCBuildConfiguration;
13971423
buildSettings = {
1424+
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
13981425
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
13991426
ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
14001427
FRAMEWORK_SEARCH_PATHS = (

0 commit comments

Comments
 (0)