Skip to content

Commit

Permalink
Rename MapboxDirectionsCompat to CMapboxDirections
Browse files Browse the repository at this point in the history
  • Loading branch information
frederoni committed Jun 7, 2019
1 parent ea8bae4 commit 06065a7
Show file tree
Hide file tree
Showing 19 changed files with 41 additions and 34 deletions.
7 changes: 7 additions & 0 deletions .swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions MapboxDirections.podspec
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,8 @@ Pod::Spec.new do |s|

# ――― Source Code ―――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――― #

s.source_files = ["Sources/MapboxDirections", "Sources/MapboxDirections/*/*", "Sources/MapboxDirectionsCompat", "Sources/MapboxDirectionsCompat/*/*"]
s.exclude_files = ["Sources/MapboxDirectionsCompat/MapboxDirectionsCompat.h"]
s.source_files = ["Sources/MapboxDirections", "Sources/MapboxDirections/*/*", "Sources/CMapboxDirections", "Sources/CMapboxDirections/*/*"]
s.exclude_files = ["Sources/CMapboxDirections/CMapboxDirections.h"]

# ――― Project Settings ――――――――――――――――――――――――――――――――――――――――――――――――――――――――― #

Expand Down
38 changes: 19 additions & 19 deletions MapboxDirections.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +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, ); }; };
3563928722AAA0AB004A377E /* CMapboxDirections.h in Headers */ = {isa = PBXBuildFile; fileRef = 3563928622AAA0AB004A377E /* CMapboxDirections.h */; settings = {ATTRIBUTES = (Public, ); }; };
3563928822AAA0AB004A377E /* CMapboxDirections.h in Headers */ = {isa = PBXBuildFile; fileRef = 3563928622AAA0AB004A377E /* CMapboxDirections.h */; settings = {ATTRIBUTES = (Public, ); }; };
3563928922AAA0AB004A377E /* CMapboxDirections.h in Headers */ = {isa = PBXBuildFile; fileRef = 3563928622AAA0AB004A377E /* CMapboxDirections.h */; settings = {ATTRIBUTES = (Public, ); }; };
3563928A22AAA0AB004A377E /* CMapboxDirections.h in Headers */ = {isa = PBXBuildFile; fileRef = 3563928622AAA0AB004A377E /* CMapboxDirections.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 */; };
Expand Down Expand Up @@ -322,13 +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 = "<group>"; };
3556CE9C22649CF3009397B5 /* BridgingTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; name = BridgingTests.m; path = ../objc/BridgingTests.m; sourceTree = "<group>"; };
3563928622AAA0AB004A377E /* MapboxDirectionsCompat.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = MapboxDirectionsCompat.h; path = include/MapboxDirectionsCompat.h; sourceTree = "<group>"; };
3563928622AAA0AB004A377E /* CMapboxDirections.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CMapboxDirections.h; path = include/CMapboxDirections.h; sourceTree = "<group>"; };
35828C9D217A003F00ED546E /* OfflineDirections.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OfflineDirections.swift; sourceTree = "<group>"; };
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; };
35C0D78A22563B2A005E05A5 /* MBRoadClasses.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = MBRoadClasses.h; path = Sources/CMapboxDirections/include/MBRoadClasses.h; sourceTree = SOURCE_ROOT; };
35C0D78B22563B2A005E05A5 /* MBRouteOptions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = MBRouteOptions.h; path = Sources/CMapboxDirections/include/MBRouteOptions.h; sourceTree = SOURCE_ROOT; };
35C0D78C22563B2B005E05A5 /* MBLaneIndication.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = MBLaneIndication.h; path = Sources/CMapboxDirections/include/MBLaneIndication.h; sourceTree = SOURCE_ROOT; };
35C0D78D22563B2B005E05A5 /* MBRouteOptions.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = MBRouteOptions.m; path = Sources/CMapboxDirections/MBRouteOptions.m; sourceTree = SOURCE_ROOT; };
35C0D78E22563B2B005E05A5 /* MBAttribute.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = MBAttribute.h; path = Sources/CMapboxDirections/include/MBAttribute.h; sourceTree = SOURCE_ROOT; };
35CC310A2285739700EA1966 /* WalkingOptionsTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WalkingOptionsTests.swift; sourceTree = "<group>"; };
35D92FEF218203AA000C78CB /* 2018-10-16-Liechtenstein.tar */ = {isa = PBXFileReference; lastKnownFileType = archive.tar; path = "2018-10-16-Liechtenstein.tar"; sourceTree = "<group>"; };
35DBF004217DF0D90009D2AE /* MBCoordinateBounds.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MBCoordinateBounds.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -510,18 +510,18 @@
/* End PBXFrameworksBuildPhase section */

/* Begin PBXGroup section */
35C0D78922563B1C005E05A5 /* MapboxDirectionsCompat */ = {
35C0D78922563B1C005E05A5 /* CMapboxDirections */ = {
isa = PBXGroup;
children = (
3563928622AAA0AB004A377E /* MapboxDirectionsCompat.h */,
3563928622AAA0AB004A377E /* CMapboxDirections.h */,
35C0D78E22563B2B005E05A5 /* MBAttribute.h */,
35C0D78C22563B2B005E05A5 /* MBLaneIndication.h */,
35C0D78A22563B2A005E05A5 /* MBRoadClasses.h */,
35C0D78B22563B2A005E05A5 /* MBRouteOptions.h */,
35C0D78D22563B2B005E05A5 /* MBRouteOptions.m */,
);
name = MapboxDirectionsCompat;
path = ../MapboxDirectionsCompat;
name = CMapboxDirections;
path = ../CMapboxDirections;
sourceTree = "<group>";
};
35DBF017217F387F0009D2AE /* Offline */ = {
Expand Down Expand Up @@ -619,7 +619,7 @@
DA6C9D891CAE442B00094FBC /* MapboxDirections */ = {
isa = PBXGroup;
children = (
35C0D78922563B1C005E05A5 /* MapboxDirectionsCompat */,
35C0D78922563B1C005E05A5 /* CMapboxDirections */,
8D381B681FDB1009008D5A58 /* Extensions */,
C5DAAC9E20191683001F9261 /* Match */,
DA6C9D8A1CAE442B00094FBC /* MapboxDirections.h */,
Expand Down Expand Up @@ -823,7 +823,7 @@
35C0D79422563B2B005E05A5 /* MBRouteOptions.h in Headers */,
35C0D79822563B2B005E05A5 /* MBLaneIndication.h in Headers */,
35C0D79022563B2B005E05A5 /* MBRoadClasses.h in Headers */,
3563928822AAA0AB004A377E /* MapboxDirectionsCompat.h in Headers */,
3563928822AAA0AB004A377E /* CMapboxDirections.h in Headers */,
35C0D7A022563B2B005E05A5 /* MBAttribute.h in Headers */,
DA1A10C61D00F969009F82FA /* MapboxDirections.h in Headers */,
);
Expand All @@ -836,7 +836,7 @@
35C0D79522563B2B005E05A5 /* MBRouteOptions.h in Headers */,
35C0D79922563B2B005E05A5 /* MBLaneIndication.h in Headers */,
35C0D79122563B2B005E05A5 /* MBRoadClasses.h in Headers */,
3563928922AAA0AB004A377E /* MapboxDirectionsCompat.h in Headers */,
3563928922AAA0AB004A377E /* CMapboxDirections.h in Headers */,
35C0D7A122563B2B005E05A5 /* MBAttribute.h in Headers */,
DA1A10EC1D010247009F82FA /* MapboxDirections.h in Headers */,
);
Expand All @@ -849,7 +849,7 @@
35C0D79622563B2B005E05A5 /* MBRouteOptions.h in Headers */,
35C0D79A22563B2B005E05A5 /* MBLaneIndication.h in Headers */,
35C0D79222563B2B005E05A5 /* MBRoadClasses.h in Headers */,
3563928A22AAA0AB004A377E /* MapboxDirectionsCompat.h in Headers */,
3563928A22AAA0AB004A377E /* CMapboxDirections.h in Headers */,
35C0D7A222563B2B005E05A5 /* MBAttribute.h in Headers */,
DA1A11031D0103A3009F82FA /* MapboxDirections.h in Headers */,
);
Expand All @@ -862,7 +862,7 @@
35C0D79322563B2B005E05A5 /* MBRouteOptions.h in Headers */,
35C0D79722563B2B005E05A5 /* MBLaneIndication.h in Headers */,
35C0D78F22563B2B005E05A5 /* MBRoadClasses.h in Headers */,
3563928722AAA0AB004A377E /* MapboxDirectionsCompat.h in Headers */,
3563928722AAA0AB004A377E /* CMapboxDirections.h in Headers */,
35C0D79F22563B2B005E05A5 /* MBAttribute.h in Headers */,
DA6C9D8B1CAE442B00094FBC /* MapboxDirections.h in Headers */,
);
Expand Down
8 changes: 4 additions & 4 deletions Package.swift
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ let package = Package(
targets: ["MapboxDirections"]
),
.library(
name: "MapboxDirectionsCompat",
targets: ["MapboxDirectionsCompat"]
name: "CMapboxDirections",
targets: ["CMapboxDirections"]
),
],
dependencies: [
Expand All @@ -25,9 +25,9 @@ let package = Package(
// Targets can depend on other targets in this package, and on products in packages which this package depends on.
.target(
name: "MapboxDirections",
dependencies: ["MapboxDirectionsCompat", "Polyline"]),
dependencies: ["CMapboxDirections", "Polyline"]),
.target(
name: "MapboxDirectionsCompat"
name: "CMapboxDirections"
),
.testTarget(
name: "MapboxDirectionsTests",
Expand Down
File renamed without changes.
2 changes: 1 addition & 1 deletion Sources/MapboxDirections/MBAttribute.swift
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import Foundation
#if SWIFT_PACKAGE
import MapboxDirectionsCompat
import CMapboxDirections
#endif


Expand Down
2 changes: 1 addition & 1 deletion Sources/MapboxDirections/MBDirectionsOptions.swift
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import Foundation
import Polyline
import CoreLocation
#if SWIFT_PACKAGE
import MapboxDirectionsCompat
import CMapboxDirections
#endif


Expand Down
2 changes: 1 addition & 1 deletion Sources/MapboxDirections/MBLaneIndication.swift
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import Foundation
#if SWIFT_PACKAGE
import MapboxDirectionsCompat
import CMapboxDirections
#endif


Expand Down
2 changes: 1 addition & 1 deletion Sources/MapboxDirections/MBRoadClasses.swift
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import Foundation
#if SWIFT_PACKAGE
import MapboxDirectionsCompat
import CMapboxDirections
#endif


Expand Down
2 changes: 1 addition & 1 deletion Sources/MapboxDirections/MBRouteLeg.swift
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import Foundation
import CoreLocation
import Polyline
#if SWIFT_PACKAGE
import MapboxDirectionsCompat
import CMapboxDirections
#endif


Expand Down
2 changes: 1 addition & 1 deletion Sources/MapboxDirections/MBRouteOptions.swift
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import Foundation
import CoreLocation
#if SWIFT_PACKAGE
import MapboxDirectionsCompat
import CMapboxDirections
#endif


Expand Down
2 changes: 1 addition & 1 deletion Sources/MapboxDirections/MBRouteStep.swift
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import Foundation
import CoreLocation
import Polyline
#if SWIFT_PACKAGE
import MapboxDirectionsCompat
import CMapboxDirections
#endif


Expand Down
2 changes: 1 addition & 1 deletion Sources/MapboxDirections/MapboxDirections.h
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,5 @@ FOUNDATION_EXPORT double MapboxDirectionsVersionNumber;
FOUNDATION_EXPORT const unsigned char MapboxDirectionsVersionString[];

#if !SWIFT_PACKAGE
#import "MapboxDirectionsCompat.h"
#import "CMapboxDirections.h"
#endif
2 changes: 1 addition & 1 deletion Sources/MapboxDirections/Match/MBMatchOptions.swift
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import Foundation
import CoreLocation
#if SWIFT_PACKAGE
import MapboxDirectionsCompat
import CMapboxDirections
#endif


Expand Down

0 comments on commit 06065a7

Please sign in to comment.