From 06065a7f333eb85981615296766504ab0a648849 Mon Sep 17 00:00:00 2001 From: Fredrik Karlsson Date: Fri, 7 Jun 2019 17:41:27 +0200 Subject: [PATCH] Rename MapboxDirectionsCompat to CMapboxDirections --- .../contents.xcworkspacedata | 7 ++++ MapboxDirections.podspec | 4 +- MapboxDirections.xcodeproj/project.pbxproj | 38 +++++++++---------- Package.swift | 8 ++-- .../MBRouteOptions.m | 0 .../include/CMapboxDirections.h} | 0 .../include/MBAttribute.h | 0 .../include/MBLaneIndication.h | 0 .../include/MBRoadClasses.h | 0 .../include/MBRouteOptions.h | 0 Sources/MapboxDirections/MBAttribute.swift | 2 +- .../MBDirectionsOptions.swift | 2 +- .../MapboxDirections/MBLaneIndication.swift | 2 +- Sources/MapboxDirections/MBRoadClasses.swift | 2 +- Sources/MapboxDirections/MBRouteLeg.swift | 2 +- Sources/MapboxDirections/MBRouteOptions.swift | 2 +- Sources/MapboxDirections/MBRouteStep.swift | 2 +- Sources/MapboxDirections/MapboxDirections.h | 2 +- .../Match/MBMatchOptions.swift | 2 +- 19 files changed, 41 insertions(+), 34 deletions(-) create mode 100644 .swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata rename Sources/{MapboxDirectionsCompat => CMapboxDirections}/MBRouteOptions.m (100%) rename Sources/{MapboxDirectionsCompat/include/MapboxDirectionsCompat.h => CMapboxDirections/include/CMapboxDirections.h} (100%) rename Sources/{MapboxDirectionsCompat => CMapboxDirections}/include/MBAttribute.h (100%) rename Sources/{MapboxDirectionsCompat => CMapboxDirections}/include/MBLaneIndication.h (100%) rename Sources/{MapboxDirectionsCompat => CMapboxDirections}/include/MBRoadClasses.h (100%) rename Sources/{MapboxDirectionsCompat => CMapboxDirections}/include/MBRouteOptions.h (100%) diff --git a/.swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata b/.swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata new file mode 100644 index 000000000..919434a62 --- /dev/null +++ b/.swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata @@ -0,0 +1,7 @@ + + + + + diff --git a/MapboxDirections.podspec b/MapboxDirections.podspec index 61ee0ee42..5a6c91610 100644 --- a/MapboxDirections.podspec +++ b/MapboxDirections.podspec @@ -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 ――――――――――――――――――――――――――――――――――――――――――――――――――――――――― # diff --git a/MapboxDirections.xcodeproj/project.pbxproj b/MapboxDirections.xcodeproj/project.pbxproj index e2ebe736f..535e92e5f 100644 --- a/MapboxDirections.xcodeproj/project.pbxproj +++ b/MapboxDirections.xcodeproj/project.pbxproj @@ -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 */; }; @@ -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 = ""; }; 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 = ""; }; + 3563928622AAA0AB004A377E /* CMapboxDirections.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CMapboxDirections.h; path = include/CMapboxDirections.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/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 = ""; }; 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 = ""; }; @@ -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 = ""; }; 35DBF017217F387F0009D2AE /* Offline */ = { @@ -619,7 +619,7 @@ DA6C9D891CAE442B00094FBC /* MapboxDirections */ = { isa = PBXGroup; children = ( - 35C0D78922563B1C005E05A5 /* MapboxDirectionsCompat */, + 35C0D78922563B1C005E05A5 /* CMapboxDirections */, 8D381B681FDB1009008D5A58 /* Extensions */, C5DAAC9E20191683001F9261 /* Match */, DA6C9D8A1CAE442B00094FBC /* MapboxDirections.h */, @@ -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 */, ); @@ -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 */, ); @@ -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 */, ); @@ -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 */, ); diff --git a/Package.swift b/Package.swift index 7e245a215..5e3cfdd46 100644 --- a/Package.swift +++ b/Package.swift @@ -12,8 +12,8 @@ let package = Package( targets: ["MapboxDirections"] ), .library( - name: "MapboxDirectionsCompat", - targets: ["MapboxDirectionsCompat"] + name: "CMapboxDirections", + targets: ["CMapboxDirections"] ), ], dependencies: [ @@ -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", diff --git a/Sources/MapboxDirectionsCompat/MBRouteOptions.m b/Sources/CMapboxDirections/MBRouteOptions.m similarity index 100% rename from Sources/MapboxDirectionsCompat/MBRouteOptions.m rename to Sources/CMapboxDirections/MBRouteOptions.m diff --git a/Sources/MapboxDirectionsCompat/include/MapboxDirectionsCompat.h b/Sources/CMapboxDirections/include/CMapboxDirections.h similarity index 100% rename from Sources/MapboxDirectionsCompat/include/MapboxDirectionsCompat.h rename to Sources/CMapboxDirections/include/CMapboxDirections.h diff --git a/Sources/MapboxDirectionsCompat/include/MBAttribute.h b/Sources/CMapboxDirections/include/MBAttribute.h similarity index 100% rename from Sources/MapboxDirectionsCompat/include/MBAttribute.h rename to Sources/CMapboxDirections/include/MBAttribute.h diff --git a/Sources/MapboxDirectionsCompat/include/MBLaneIndication.h b/Sources/CMapboxDirections/include/MBLaneIndication.h similarity index 100% rename from Sources/MapboxDirectionsCompat/include/MBLaneIndication.h rename to Sources/CMapboxDirections/include/MBLaneIndication.h diff --git a/Sources/MapboxDirectionsCompat/include/MBRoadClasses.h b/Sources/CMapboxDirections/include/MBRoadClasses.h similarity index 100% rename from Sources/MapboxDirectionsCompat/include/MBRoadClasses.h rename to Sources/CMapboxDirections/include/MBRoadClasses.h diff --git a/Sources/MapboxDirectionsCompat/include/MBRouteOptions.h b/Sources/CMapboxDirections/include/MBRouteOptions.h similarity index 100% rename from Sources/MapboxDirectionsCompat/include/MBRouteOptions.h rename to Sources/CMapboxDirections/include/MBRouteOptions.h diff --git a/Sources/MapboxDirections/MBAttribute.swift b/Sources/MapboxDirections/MBAttribute.swift index e86ef5a23..2ea2b61b9 100644 --- a/Sources/MapboxDirections/MBAttribute.swift +++ b/Sources/MapboxDirections/MBAttribute.swift @@ -1,6 +1,6 @@ import Foundation #if SWIFT_PACKAGE -import MapboxDirectionsCompat +import CMapboxDirections #endif diff --git a/Sources/MapboxDirections/MBDirectionsOptions.swift b/Sources/MapboxDirections/MBDirectionsOptions.swift index 0529b6fc3..9e955b88c 100644 --- a/Sources/MapboxDirections/MBDirectionsOptions.swift +++ b/Sources/MapboxDirections/MBDirectionsOptions.swift @@ -2,7 +2,7 @@ import Foundation import Polyline import CoreLocation #if SWIFT_PACKAGE -import MapboxDirectionsCompat +import CMapboxDirections #endif diff --git a/Sources/MapboxDirections/MBLaneIndication.swift b/Sources/MapboxDirections/MBLaneIndication.swift index 26ef43800..0b58e6278 100644 --- a/Sources/MapboxDirections/MBLaneIndication.swift +++ b/Sources/MapboxDirections/MBLaneIndication.swift @@ -1,6 +1,6 @@ import Foundation #if SWIFT_PACKAGE -import MapboxDirectionsCompat +import CMapboxDirections #endif diff --git a/Sources/MapboxDirections/MBRoadClasses.swift b/Sources/MapboxDirections/MBRoadClasses.swift index 60be507b2..a4cffd973 100644 --- a/Sources/MapboxDirections/MBRoadClasses.swift +++ b/Sources/MapboxDirections/MBRoadClasses.swift @@ -1,6 +1,6 @@ import Foundation #if SWIFT_PACKAGE -import MapboxDirectionsCompat +import CMapboxDirections #endif diff --git a/Sources/MapboxDirections/MBRouteLeg.swift b/Sources/MapboxDirections/MBRouteLeg.swift index 72e996240..b533df289 100644 --- a/Sources/MapboxDirections/MBRouteLeg.swift +++ b/Sources/MapboxDirections/MBRouteLeg.swift @@ -2,7 +2,7 @@ import Foundation import CoreLocation import Polyline #if SWIFT_PACKAGE -import MapboxDirectionsCompat +import CMapboxDirections #endif diff --git a/Sources/MapboxDirections/MBRouteOptions.swift b/Sources/MapboxDirections/MBRouteOptions.swift index 6961b1b06..b94093708 100644 --- a/Sources/MapboxDirections/MBRouteOptions.swift +++ b/Sources/MapboxDirections/MBRouteOptions.swift @@ -1,7 +1,7 @@ import Foundation import CoreLocation #if SWIFT_PACKAGE -import MapboxDirectionsCompat +import CMapboxDirections #endif diff --git a/Sources/MapboxDirections/MBRouteStep.swift b/Sources/MapboxDirections/MBRouteStep.swift index 65adb3b10..efc392998 100644 --- a/Sources/MapboxDirections/MBRouteStep.swift +++ b/Sources/MapboxDirections/MBRouteStep.swift @@ -2,7 +2,7 @@ import Foundation import CoreLocation import Polyline #if SWIFT_PACKAGE -import MapboxDirectionsCompat +import CMapboxDirections #endif diff --git a/Sources/MapboxDirections/MapboxDirections.h b/Sources/MapboxDirections/MapboxDirections.h index 9ca1884fb..1e8203993 100644 --- a/Sources/MapboxDirections/MapboxDirections.h +++ b/Sources/MapboxDirections/MapboxDirections.h @@ -8,5 +8,5 @@ FOUNDATION_EXPORT double MapboxDirectionsVersionNumber; FOUNDATION_EXPORT const unsigned char MapboxDirectionsVersionString[]; #if !SWIFT_PACKAGE -#import "MapboxDirectionsCompat.h" +#import "CMapboxDirections.h" #endif diff --git a/Sources/MapboxDirections/Match/MBMatchOptions.swift b/Sources/MapboxDirections/Match/MBMatchOptions.swift index ccdfa4676..5cd498eb4 100644 --- a/Sources/MapboxDirections/Match/MBMatchOptions.swift +++ b/Sources/MapboxDirections/Match/MBMatchOptions.swift @@ -1,7 +1,7 @@ import Foundation import CoreLocation #if SWIFT_PACKAGE -import MapboxDirectionsCompat +import CMapboxDirections #endif