From 156c784b14556e99d3322a4249a818d6db2e6a24 Mon Sep 17 00:00:00 2001 From: Fredrik Karlsson Date: Fri, 7 Jun 2019 15:41:49 +0200 Subject: [PATCH] Fix refs in default and Carthage build --- MapboxDirections.xcodeproj/project.pbxproj | 28 ++++++++++++++------- Sources/MapboxDirections/MapboxDirections.h | 4 +-- 2 files changed, 21 insertions(+), 11 deletions(-) diff --git a/MapboxDirections.xcodeproj/project.pbxproj b/MapboxDirections.xcodeproj/project.pbxproj index 437d8e4b1..e2ebe736f 100644 --- a/MapboxDirections.xcodeproj/project.pbxproj +++ b/MapboxDirections.xcodeproj/project.pbxproj @@ -10,6 +10,10 @@ 3556CE9D22649CF3009397B5 /* BridgingTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 3556CE9C22649CF3009397B5 /* BridgingTests.m */; }; 3556CE9E22649CF3009397B5 /* BridgingTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 3556CE9C22649CF3009397B5 /* BridgingTests.m */; }; 3556CE9F22649CF3009397B5 /* BridgingTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 3556CE9C22649CF3009397B5 /* BridgingTests.m */; }; + 3563928722AAA0AB004A377E /* MapboxDirectionsCompat.h in Headers */ = {isa = PBXBuildFile; fileRef = 3563928622AAA0AB004A377E /* MapboxDirectionsCompat.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 3563928822AAA0AB004A377E /* MapboxDirectionsCompat.h in Headers */ = {isa = PBXBuildFile; fileRef = 3563928622AAA0AB004A377E /* MapboxDirectionsCompat.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 3563928922AAA0AB004A377E /* MapboxDirectionsCompat.h in Headers */ = {isa = PBXBuildFile; fileRef = 3563928622AAA0AB004A377E /* MapboxDirectionsCompat.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 3563928A22AAA0AB004A377E /* MapboxDirectionsCompat.h in Headers */ = {isa = PBXBuildFile; fileRef = 3563928622AAA0AB004A377E /* MapboxDirectionsCompat.h */; settings = {ATTRIBUTES = (Public, ); }; }; 35828C9E217A003F00ED546E /* OfflineDirections.swift in Sources */ = {isa = PBXBuildFile; fileRef = 35828C9D217A003F00ED546E /* OfflineDirections.swift */; }; 35828C9F217A003F00ED546E /* OfflineDirections.swift in Sources */ = {isa = PBXBuildFile; fileRef = 35828C9D217A003F00ED546E /* OfflineDirections.swift */; }; 35828CA0217A003F00ED546E /* OfflineDirections.swift in Sources */ = {isa = PBXBuildFile; fileRef = 35828C9D217A003F00ED546E /* OfflineDirections.swift */; }; @@ -318,12 +322,13 @@ /* Begin PBXFileReference section */ 3556CE9922649CF2009397B5 /* MapboxDirectionsTests-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "MapboxDirectionsTests-Bridging-Header.h"; path = "../objc/MapboxDirectionsTests-Bridging-Header.h"; sourceTree = ""; }; 3556CE9C22649CF3009397B5 /* BridgingTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; name = BridgingTests.m; path = ../objc/BridgingTests.m; sourceTree = ""; }; + 3563928622AAA0AB004A377E /* MapboxDirectionsCompat.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = MapboxDirectionsCompat.h; path = include/MapboxDirectionsCompat.h; sourceTree = ""; }; 35828C9D217A003F00ED546E /* OfflineDirections.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OfflineDirections.swift; sourceTree = ""; }; - 35C0D78A22563B2A005E05A5 /* MBRoadClasses.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = MBRoadClasses.h; path = Sources/objc/MBRoadClasses.h; sourceTree = SOURCE_ROOT; }; - 35C0D78B22563B2A005E05A5 /* MBRouteOptions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = MBRouteOptions.h; path = Sources/objc/MBRouteOptions.h; sourceTree = SOURCE_ROOT; }; - 35C0D78C22563B2B005E05A5 /* MBLaneIndication.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = MBLaneIndication.h; path = Sources/objc/MBLaneIndication.h; sourceTree = SOURCE_ROOT; }; - 35C0D78D22563B2B005E05A5 /* MBRouteOptions.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = MBRouteOptions.m; path = Sources/objc/MBRouteOptions.m; sourceTree = SOURCE_ROOT; }; - 35C0D78E22563B2B005E05A5 /* MBAttribute.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = MBAttribute.h; path = Sources/objc/MBAttribute.h; sourceTree = SOURCE_ROOT; }; + 35C0D78A22563B2A005E05A5 /* MBRoadClasses.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = MBRoadClasses.h; path = Sources/MapboxDirectionsCompat/include/MBRoadClasses.h; sourceTree = SOURCE_ROOT; }; + 35C0D78B22563B2A005E05A5 /* MBRouteOptions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = MBRouteOptions.h; path = Sources/MapboxDirectionsCompat/include/MBRouteOptions.h; sourceTree = SOURCE_ROOT; }; + 35C0D78C22563B2B005E05A5 /* MBLaneIndication.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = MBLaneIndication.h; path = Sources/MapboxDirectionsCompat/include/MBLaneIndication.h; sourceTree = SOURCE_ROOT; }; + 35C0D78D22563B2B005E05A5 /* MBRouteOptions.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = MBRouteOptions.m; path = Sources/MapboxDirectionsCompat/MBRouteOptions.m; sourceTree = SOURCE_ROOT; }; + 35C0D78E22563B2B005E05A5 /* MBAttribute.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = MBAttribute.h; path = Sources/MapboxDirectionsCompat/include/MBAttribute.h; sourceTree = SOURCE_ROOT; }; 35CC310A2285739700EA1966 /* WalkingOptionsTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WalkingOptionsTests.swift; sourceTree = ""; }; 35D92FEF218203AA000C78CB /* 2018-10-16-Liechtenstein.tar */ = {isa = PBXFileReference; lastKnownFileType = archive.tar; path = "2018-10-16-Liechtenstein.tar"; sourceTree = ""; }; 35DBF004217DF0D90009D2AE /* MBCoordinateBounds.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MBCoordinateBounds.swift; sourceTree = ""; }; @@ -505,17 +510,18 @@ /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ - 35C0D78922563B1C005E05A5 /* Objective-C */ = { + 35C0D78922563B1C005E05A5 /* MapboxDirectionsCompat */ = { isa = PBXGroup; children = ( + 3563928622AAA0AB004A377E /* MapboxDirectionsCompat.h */, 35C0D78E22563B2B005E05A5 /* MBAttribute.h */, 35C0D78C22563B2B005E05A5 /* MBLaneIndication.h */, 35C0D78A22563B2A005E05A5 /* MBRoadClasses.h */, 35C0D78B22563B2A005E05A5 /* MBRouteOptions.h */, 35C0D78D22563B2B005E05A5 /* MBRouteOptions.m */, ); - name = "Objective-C"; - path = ../objc; + name = MapboxDirectionsCompat; + path = ../MapboxDirectionsCompat; sourceTree = ""; }; 35DBF017217F387F0009D2AE /* Offline */ = { @@ -613,7 +619,7 @@ DA6C9D891CAE442B00094FBC /* MapboxDirections */ = { isa = PBXGroup; children = ( - 35C0D78922563B1C005E05A5 /* Objective-C */, + 35C0D78922563B1C005E05A5 /* MapboxDirectionsCompat */, 8D381B681FDB1009008D5A58 /* Extensions */, C5DAAC9E20191683001F9261 /* Match */, DA6C9D8A1CAE442B00094FBC /* MapboxDirections.h */, @@ -817,6 +823,7 @@ 35C0D79422563B2B005E05A5 /* MBRouteOptions.h in Headers */, 35C0D79822563B2B005E05A5 /* MBLaneIndication.h in Headers */, 35C0D79022563B2B005E05A5 /* MBRoadClasses.h in Headers */, + 3563928822AAA0AB004A377E /* MapboxDirectionsCompat.h in Headers */, 35C0D7A022563B2B005E05A5 /* MBAttribute.h in Headers */, DA1A10C61D00F969009F82FA /* MapboxDirections.h in Headers */, ); @@ -829,6 +836,7 @@ 35C0D79522563B2B005E05A5 /* MBRouteOptions.h in Headers */, 35C0D79922563B2B005E05A5 /* MBLaneIndication.h in Headers */, 35C0D79122563B2B005E05A5 /* MBRoadClasses.h in Headers */, + 3563928922AAA0AB004A377E /* MapboxDirectionsCompat.h in Headers */, 35C0D7A122563B2B005E05A5 /* MBAttribute.h in Headers */, DA1A10EC1D010247009F82FA /* MapboxDirections.h in Headers */, ); @@ -841,6 +849,7 @@ 35C0D79622563B2B005E05A5 /* MBRouteOptions.h in Headers */, 35C0D79A22563B2B005E05A5 /* MBLaneIndication.h in Headers */, 35C0D79222563B2B005E05A5 /* MBRoadClasses.h in Headers */, + 3563928A22AAA0AB004A377E /* MapboxDirectionsCompat.h in Headers */, 35C0D7A222563B2B005E05A5 /* MBAttribute.h in Headers */, DA1A11031D0103A3009F82FA /* MapboxDirections.h in Headers */, ); @@ -853,6 +862,7 @@ 35C0D79322563B2B005E05A5 /* MBRouteOptions.h in Headers */, 35C0D79722563B2B005E05A5 /* MBLaneIndication.h in Headers */, 35C0D78F22563B2B005E05A5 /* MBRoadClasses.h in Headers */, + 3563928722AAA0AB004A377E /* MapboxDirectionsCompat.h in Headers */, 35C0D79F22563B2B005E05A5 /* MBAttribute.h in Headers */, DA6C9D8B1CAE442B00094FBC /* MapboxDirections.h in Headers */, ); diff --git a/Sources/MapboxDirections/MapboxDirections.h b/Sources/MapboxDirections/MapboxDirections.h index a07d590ea..e45428656 100644 --- a/Sources/MapboxDirections/MapboxDirections.h +++ b/Sources/MapboxDirections/MapboxDirections.h @@ -7,6 +7,6 @@ FOUNDATION_EXPORT double MapboxDirectionsVersionNumber; //! Project version string for MapboxDirections. FOUNDATION_EXPORT const unsigned char MapboxDirectionsVersionString[]; -#if SWIFT_PACKAGE -import MapboxDirectionsCompat +#if !SWIFT_PACKAGE +#import #endif