Skip to content

Commit 170a57a

Browse files
msmollinmsmollin
authored
Update to remove multi-import warnings from sample app (#314)
1 parent 0807472 commit 170a57a

9 files changed

+18
-40
lines changed

‎Podfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ platform :ios, '9.3'
22
use_frameworks!
33

44
def shared_pods
5-
pod 'Mapzen-ios-sdk', :path => '.'
5+
pod 'Mapzen-ios-sdk', :path => '.'
66
end
77

88
target "ios-sdk" do

‎Podfile.lock

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ DEPENDENCIES:
1818

1919
EXTERNAL SOURCES:
2020
Mapzen-ios-sdk:
21-
:path: "."
21+
:path: .
2222

2323
SPEC CHECKSUMS:
2424
HockeySDK: 78a3f8bb9100277b531defc56c970369a3ca267a
@@ -27,6 +27,6 @@ SPEC CHECKSUMS:
2727
Pelias: e32abfaf0c0de756d60bf4283d17c3e8e047d87d
2828
Tangram-es: 173ce01650f3de4e6f5c7b4e7280156f50c19d06
2929

30-
PODFILE CHECKSUM: 30ab71694270835747d1ff9ade4c95d207a9939e
30+
PODFILE CHECKSUM: c3857dc867e20644e58540a825d1e3339d1012e0
3131

3232
COCOAPODS: 1.2.1

‎SampleApp/AppDelegate.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
import UIKit
1010
import HockeySDK
11-
import MapzenSDK
11+
import Mapzen_ios_sdk
1212

1313
@UIApplicationMain
1414
class AppDelegate: UIResponder, UIApplicationDelegate {

‎SampleApp/DemoMapViewController.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
//
88

99
import UIKit
10-
import MapzenSDK
10+
import Mapzen_ios_sdk
1111

1212
class DemoMapViewController: SampleMapViewController, MapMarkerSelectDelegate {
1313

‎SampleApp/DemoRouteViewController.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
//
88

99
import OnTheRoad
10-
import MapzenSDK
10+
import Mapzen_ios_sdk
1111

1212
class DemoRouteViewController: SampleMapViewController, MapSingleTapGestureDelegate {
1313
let routeListSegueId = "routeListSegueId"

‎SampleApp/DemoSearchPinsViewController.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
//
88

99
import TangramMap
10-
import MapzenSDK
10+
import Mapzen_ios_sdk
1111

1212
class DemoSearchPinsViewController: SampleMapViewController, UITextFieldDelegate, AutocompleteSearchDelegate {
1313

‎SampleApp/SampleAutocompleteTableViewController.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
import UIKit
1010
import CoreLocation
11-
import MapzenSDK
11+
import Mapzen_ios_sdk
1212

1313
protocol AutocompleteSearchDelegate {
1414
func selected(_ location: PeliasMapkitAnnotation)

‎SampleApp/SampleMapViewController.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
//
88

99
import CoreLocation
10-
import MapzenSDK
1110
import UIKit
11+
import Mapzen_ios_sdk
1212

1313
class SampleMapViewController : MZMapViewController {
1414

‎ios-sdk.xcodeproj/project.pbxproj

Lines changed: 9 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,10 @@
99
/* Begin PBXBuildFile section */
1010
5BB1A61A6A1B20597B8B4286 /* Pods_MapzenSDK.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 04E4AC0993E5EBFAAC2141F1 /* Pods_MapzenSDK.framework */; };
1111
7D4639F11EB115280074BEC5 /* MapzenSDK.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7D4639E81EB115280074BEC5 /* MapzenSDK.framework */; };
12-
7D4639FD1EB115280074BEC5 /* MapzenSDK.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7D4639E81EB115280074BEC5 /* MapzenSDK.framework */; };
13-
7D4639FE1EB115280074BEC5 /* MapzenSDK.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 7D4639E81EB115280074BEC5 /* MapzenSDK.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
1412
7D463A191EB135460074BEC5 /* ApplicationExtensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7D463A061EB135460074BEC5 /* ApplicationExtensions.swift */; };
1513
7D463A1A1EB135460074BEC5 /* BundleExtensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7D463A071EB135460074BEC5 /* BundleExtensions.swift */; };
1614
7D463A1B1EB135460074BEC5 /* DictionaryExtensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7D463A081EB135460074BEC5 /* DictionaryExtensions.swift */; };
1715
7D463A1C1EB135460074BEC5 /* Dimensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7D463A0A1EB135460074BEC5 /* Dimensions.swift */; };
18-
7D463A1D1EB135460074BEC5 /* LocationManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7D463A0B1EB135460074BEC5 /* LocationManager.swift */; };
1916
7D463A1E1EB135460074BEC5 /* MapzenManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7D463A0C1EB135460074BEC5 /* MapzenManager.swift */; };
2017
7D463A1F1EB135460074BEC5 /* MapzenManagerExtensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7D463A0D1EB135460074BEC5 /* MapzenManagerExtensions.swift */; };
2118
7D463A201EB135460074BEC5 /* MapzenSearch.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7D463A0E1EB135460074BEC5 /* MapzenSearch.swift */; };
@@ -69,6 +66,7 @@
6966
DB7A33DF1C8F8E8B009CC743 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = DB7A33DE1C8F8E8B009CC743 /* Assets.xcassets */; };
7067
DB7A33E21C8F8E8B009CC743 /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = DB7A33E01C8F8E8B009CC743 /* LaunchScreen.storyboard */; };
7168
DBC869901D3662DD00DDC4FE /* SampleAutocompleteTableViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = DBC8698F1D3662DD00DDC4FE /* SampleAutocompleteTableViewController.swift */; };
69+
DBEF2B141EC3B99A00D19B62 /* LocationManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7D463A0B1EB135460074BEC5 /* LocationManager.swift */; };
7270
DBF441AE1D351B0A007DEE95 /* DemoMapViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = DBF441AD1D351B0A007DEE95 /* DemoMapViewController.swift */; };
7371
DBF441B01D351C90007DEE95 /* GLKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DBF441AF1D351C90007DEE95 /* GLKit.framework */; };
7472
/* End PBXBuildFile section */
@@ -88,13 +86,6 @@
8886
remoteGlobalIDString = DB7A33D31C8F8E8B009CC743;
8987
remoteInfo = "ios-sdk";
9088
};
91-
7D4639FB1EB115280074BEC5 /* PBXContainerItemProxy */ = {
92-
isa = PBXContainerItemProxy;
93-
containerPortal = DB7A33CC1C8F8E8B009CC743 /* Project object */;
94-
proxyType = 1;
95-
remoteGlobalIDString = 7D4639E71EB115270074BEC5;
96-
remoteInfo = MapzenSDK;
97-
};
9889
DB7A33E91C8F8E8B009CC743 /* PBXContainerItemProxy */ = {
9990
isa = PBXContainerItemProxy;
10091
containerPortal = DB7A33CC1C8F8E8B009CC743 /* Project object */;
@@ -105,17 +96,6 @@
10596
/* End PBXContainerItemProxy section */
10697

10798
/* Begin PBXCopyFilesBuildPhase section */
108-
7D463A041EB115280074BEC5 /* Embed Frameworks */ = {
109-
isa = PBXCopyFilesBuildPhase;
110-
buildActionMask = 2147483647;
111-
dstPath = "";
112-
dstSubfolderSpec = 10;
113-
files = (
114-
7D4639FE1EB115280074BEC5 /* MapzenSDK.framework in Embed Frameworks */,
115-
);
116-
name = "Embed Frameworks";
117-
runOnlyForDeploymentPostprocessing = 0;
118-
};
11999
7D9EBCD31E6E0BA500303E1B /* CopyFiles */ = {
120100
isa = PBXCopyFilesBuildPhase;
121101
buildActionMask = 2147483647;
@@ -228,7 +208,6 @@
228208
isa = PBXFrameworksBuildPhase;
229209
buildActionMask = 2147483647;
230210
files = (
231-
7D4639FD1EB115280074BEC5 /* MapzenSDK.framework in Frameworks */,
232211
DBF441B01D351C90007DEE95 /* GLKit.framework in Frameworks */,
233212
AC586709D7E7D4C22AA9474D /* Pods_ios_sdk.framework in Frameworks */,
234213
);
@@ -456,12 +435,10 @@
456435
191580EBEEB1CBE8776858D7 /* [CP] Embed Pods Frameworks */,
457436
9ED767F151C3E563270C40FC /* [CP] Copy Pods Resources */,
458437
7D9EBCD31E6E0BA500303E1B /* CopyFiles */,
459-
7D463A041EB115280074BEC5 /* Embed Frameworks */,
460438
);
461439
buildRules = (
462440
);
463441
dependencies = (
464-
7D4639FC1EB115280074BEC5 /* PBXTargetDependency */,
465442
);
466443
name = "ios-sdk";
467444
productName = "ios-sdk";
@@ -504,7 +481,7 @@
504481
7D4639EF1EB115280074BEC5 = {
505482
CreatedOnToolsVersion = 8.3.1;
506483
LastSwiftMigration = 0830;
507-
ProvisioningStyle = Automatic;
484+
ProvisioningStyle = Manual;
508485
TestTargetID = DB7A33D31C8F8E8B009CC743;
509486
};
510487
DB7A33D31C8F8E8B009CC743 = {
@@ -719,7 +696,7 @@
719696
7D463A1C1EB135460074BEC5 /* Dimensions.swift in Sources */,
720697
7D463A191EB135460074BEC5 /* ApplicationExtensions.swift in Sources */,
721698
7D463A221EB135460074BEC5 /* MZMapViewController.swift in Sources */,
722-
7D463A1D1EB135460074BEC5 /* LocationManager.swift in Sources */,
699+
DBEF2B141EC3B99A00D19B62 /* LocationManager.swift in Sources */,
723700
7D463A2A1EB135460074BEC5 /* UIColorExtensions.swift in Sources */,
724701
7D463A1A1EB135460074BEC5 /* BundleExtensions.swift in Sources */,
725702
7D463A291EB135460074BEC5 /* TangramExtensions.swift in Sources */,
@@ -795,11 +772,6 @@
795772
target = DB7A33D31C8F8E8B009CC743 /* ios-sdk */;
796773
targetProxy = 7D4639F41EB115280074BEC5 /* PBXContainerItemProxy */;
797774
};
798-
7D4639FC1EB115280074BEC5 /* PBXTargetDependency */ = {
799-
isa = PBXTargetDependency;
800-
target = 7D4639E71EB115270074BEC5 /* MapzenSDK */;
801-
targetProxy = 7D4639FB1EB115280074BEC5 /* PBXContainerItemProxy */;
802-
};
803775
DB7A33EA1C8F8E8B009CC743 /* PBXTargetDependency */ = {
804776
isa = PBXTargetDependency;
805777
target = DB7A33D31C8F8E8B009CC743 /* ios-sdk */;
@@ -892,15 +864,18 @@
892864
isa = XCBuildConfiguration;
893865
baseConfigurationReference = D3998FF91F67B727EE3E0C7A /* Pods-MapzenSDKTests.debug.xcconfig */;
894866
buildSettings = {
867+
BUNDLE_LOADER = "$(TEST_HOST)";
895868
CLANG_ANALYZER_NONNULL = YES;
896869
CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
897870
CLANG_ENABLE_MODULES = YES;
898871
CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
872+
DEVELOPMENT_TEAM = "";
899873
INFOPLIST_FILE = MapzenSDKTests/Info.plist;
900874
IPHONEOS_DEPLOYMENT_TARGET = 10.3;
901875
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
902876
PRODUCT_BUNDLE_IDENTIFIER = com.mapzen.MapzenSDKTests;
903877
PRODUCT_NAME = "$(TARGET_NAME)";
878+
PROVISIONING_PROFILE_SPECIFIER = "";
904879
SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
905880
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
906881
SWIFT_VERSION = 3.0;
@@ -912,16 +887,19 @@
912887
isa = XCBuildConfiguration;
913888
baseConfigurationReference = AAABB1E1300FAB97736F2F7F /* Pods-MapzenSDKTests.release.xcconfig */;
914889
buildSettings = {
890+
BUNDLE_LOADER = "$(TEST_HOST)";
915891
CLANG_ANALYZER_NONNULL = YES;
916892
CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
917893
CLANG_ENABLE_MODULES = YES;
918894
CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
919895
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
896+
DEVELOPMENT_TEAM = "";
920897
INFOPLIST_FILE = MapzenSDKTests/Info.plist;
921898
IPHONEOS_DEPLOYMENT_TARGET = 10.3;
922899
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
923900
PRODUCT_BUNDLE_IDENTIFIER = com.mapzen.MapzenSDKTests;
924901
PRODUCT_NAME = "$(TARGET_NAME)";
902+
PROVISIONING_PROFILE_SPECIFIER = "";
925903
SWIFT_VERSION = 3.0;
926904
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/ios-sdk.app/ios-sdk";
927905
};

0 commit comments

Comments
 (0)