Skip to content
This repository has been archived by the owner on Jun 14, 2024. It is now read-only.

Commit

Permalink
Disable incompatible Nav SDK and DocsCode target
Browse files Browse the repository at this point in the history
  • Loading branch information
@friedbunny
friedbunny committed Jun 10, 2019
1 parent a73864a commit 9e3356d
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 123 deletions.
78 changes: 0 additions & 78 deletions Examples.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,6 @@
DD5939E61E6778480009BEB2 /* clustering.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = DD5939E51E6778480009BEB2 /* clustering.xcassets */; };
DDF943291E5DE63300545D0F /* ClusteringExample.m in Sources */ = {isa = PBXBuildFile; fileRef = DDF943281E5DE63300545D0F /* ClusteringExample.m */; };
DDF9432B1E5DEACC00545D0F /* ports.geojson in Resources */ = {isa = PBXBuildFile; fileRef = DDF9432A1E5DEACC00545D0F /* ports.geojson */; };
EA1C611F9E5485E9FD8FBE46 /* Pods_DocsCode.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0A9B7FC43E5E24E028DE6B6D /* Pods_DocsCode.framework */; };
F9C1D0F8EE832A1D242930D2 /* Pods_ExamplesTests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F8EE2FB6BE39BB48832DA94C /* Pods_ExamplesTests.framework */; };
/* End PBXBuildFile section */

Expand Down Expand Up @@ -235,7 +234,6 @@
07F53B841E00D02100B58DB3 /* AnnotationViewsAndImagesExample.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AnnotationViewsAndImagesExample.m; sourceTree = "<group>"; };
07F53B861E00D08600B58DB3 /* AnnotationViewsAndImagesExample.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AnnotationViewsAndImagesExample.h; sourceTree = "<group>"; };
0A4917D6B62E749D739044A4 /* Pods-ExamplesUITests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-ExamplesUITests.debug.xcconfig"; path = "Pods/Target Support Files/Pods-ExamplesUITests/Pods-ExamplesUITests.debug.xcconfig"; sourceTree = "<group>"; };
0A9B7FC43E5E24E028DE6B6D /* Pods_DocsCode.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_DocsCode.framework; sourceTree = BUILT_PRODUCTS_DIR; };
1F0701512252CE420045E061 /* TextFormattingExample.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TextFormattingExample.h; sourceTree = "<group>"; };
1F0701522252CE420045E061 /* TextFormattingExample.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = TextFormattingExample.m; sourceTree = "<group>"; };
1F0701542252D2090045E061 /* TextFormattingExample.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TextFormattingExample.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -332,7 +330,6 @@
64CF97191DF2252C00C3C27B /* RasterImageryExample.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RasterImageryExample.h; sourceTree = "<group>"; };
7556D44879C1E2866B0355B8 /* Pods-ExamplesTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-ExamplesTests.release.xcconfig"; path = "Pods/Target Support Files/Pods-ExamplesTests/Pods-ExamplesTests.release.xcconfig"; sourceTree = "<group>"; };
7692D1D792EB3849E8754E6B /* Pods_ExamplesUITests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_ExamplesUITests.framework; sourceTree = BUILT_PRODUCTS_DIR; };
7823ECBC65EEAAC3EA0B6E42 /* Pods-DocsCode.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-DocsCode.release.xcconfig"; path = "Pods/Target Support Files/Pods-DocsCode/Pods-DocsCode.release.xcconfig"; sourceTree = "<group>"; };
960A215F1D344F9F00BB348B /* DraggableAnnotationViewExample.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DraggableAnnotationViewExample.h; sourceTree = "<group>"; };
960A21601D344F9F00BB348B /* DraggableAnnotationViewExample.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = DraggableAnnotationViewExample.m; sourceTree = "<group>"; };
96115A661CAD4E1C000963B8 /* OfflinePackExample.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OfflinePackExample.h; sourceTree = "<group>"; };
Expand Down Expand Up @@ -392,7 +389,6 @@
976D90ED8B2046B3B8A6C39C /* Pods-Shared-DocsCode.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Shared-DocsCode.release.xcconfig"; path = "Pods/Target Support Files/Pods-Shared-DocsCode/Pods-Shared-DocsCode.release.xcconfig"; sourceTree = "<group>"; };
9A1ECC25B13FE3249B26BE0A /* Pods-Shared-DocsCode.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Shared-DocsCode.debug.xcconfig"; path = "Pods/Target Support Files/Pods-Shared-DocsCode/Pods-Shared-DocsCode.debug.xcconfig"; sourceTree = "<group>"; };
9EC12D8F1A97963D68BFA871 /* Pods_Examples.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Examples.framework; sourceTree = BUILT_PRODUCTS_DIR; };
B81679E7B93FDEBBFB42646A /* Pods-DocsCode.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-DocsCode.debug.xcconfig"; path = "Pods/Target Support Files/Pods-DocsCode/Pods-DocsCode.debug.xcconfig"; sourceTree = "<group>"; };
C057E98F506AAA58F0473788 /* Pods-Shared-Examples.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Shared-Examples.debug.xcconfig"; path = "Pods/Target Support Files/Pods-Shared-Examples/Pods-Shared-Examples.debug.xcconfig"; sourceTree = "<group>"; };
CA39B2BA209B881300D37037 /* BuildingLightExample+UITesting.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "BuildingLightExample+UITesting.m"; sourceTree = "<group>"; };
CA39B2BB209B881300D37037 /* AnimatedLineExample+UITesting.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "AnimatedLineExample+UITesting.m"; sourceTree = "<group>"; };
Expand All @@ -418,7 +414,6 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
EA1C611F9E5485E9FD8FBE46 /* Pods_DocsCode.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand Down Expand Up @@ -930,8 +925,6 @@
532FB53EE0142E4DAC3FB49B /* Pods-Shared-Examples.release.xcconfig */,
9A1ECC25B13FE3249B26BE0A /* Pods-Shared-DocsCode.debug.xcconfig */,
976D90ED8B2046B3B8A6C39C /* Pods-Shared-DocsCode.release.xcconfig */,
B81679E7B93FDEBBFB42646A /* Pods-DocsCode.debug.xcconfig */,
7823ECBC65EEAAC3EA0B6E42 /* Pods-DocsCode.release.xcconfig */,
);
name = Pods;
sourceTree = "<group>";
Expand Down Expand Up @@ -964,7 +957,6 @@
9EC12D8F1A97963D68BFA871 /* Pods_Examples.framework */,
F8EE2FB6BE39BB48832DA94C /* Pods_ExamplesTests.framework */,
7692D1D792EB3849E8754E6B /* Pods_ExamplesUITests.framework */,
0A9B7FC43E5E24E028DE6B6D /* Pods_DocsCode.framework */,
);
name = Frameworks;
sourceTree = "<group>";
Expand All @@ -976,12 +968,10 @@
isa = PBXNativeTarget;
buildConfigurationList = 0503374F1F7199DF007309B0 /* Build configuration list for PBXNativeTarget "DocsCode" */;
buildPhases = (
CFB2F8D6044EEE1F709058B1 /* [CP] Check Pods Manifest.lock */,
0503373A1F7199DF007309B0 /* Sources */,
0503373B1F7199DF007309B0 /* Frameworks */,
0503373C1F7199DF007309B0 /* Resources */,
056F105B1FC4C80A0037FFBE /* Insert Mapbox Access Token */,
04C6081359E89BDBF5C7ADE7 /* [CP] Embed Pods Frameworks */,
);
buildRules = (
);
Expand Down Expand Up @@ -1189,50 +1179,6 @@
/* End PBXResourcesBuildPhase section */

/* Begin PBXShellScriptBuildPhase section */
04C6081359E89BDBF5C7ADE7 /* [CP] Embed Pods Frameworks */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputPaths = (
"${PODS_ROOT}/Target Support Files/Pods-DocsCode/Pods-DocsCode-frameworks.sh",
"${PODS_ROOT}/Mapbox-iOS-SDK/dynamic/Mapbox.framework",
"${PODS_ROOT}/Mapbox-iOS-SDK/dynamic/Mapbox.framework.dSYM",
"${PODS_ROOT}/Mapbox-iOS-SDK/dynamic/CD548FF3-ECB4-31D0-8E4F-AE55F70E287F.bcsymbolmap",
"${PODS_ROOT}/Mapbox-iOS-SDK/dynamic/70E1902C-569B-3192-A297-3622F9745C20.bcsymbolmap",
"${BUILT_PRODUCTS_DIR}/MapboxCoreNavigation/MapboxCoreNavigation.framework",
"${BUILT_PRODUCTS_DIR}/MapboxDirections.swift/MapboxDirections.framework",
"${BUILT_PRODUCTS_DIR}/MapboxMobileEvents/MapboxMobileEvents.framework",
"${BUILT_PRODUCTS_DIR}/MapboxNavigation/MapboxNavigation.framework",
"${PODS_ROOT}/MapboxNavigationNative/MapboxNavigationNative.framework",
"${PODS_ROOT}/MapboxNavigationNative/MapboxNavigationNative.framework.dSYM",
"${BUILT_PRODUCTS_DIR}/MapboxSpeech/MapboxSpeech.framework",
"${BUILT_PRODUCTS_DIR}/Polyline/Polyline.framework",
"${BUILT_PRODUCTS_DIR}/Solar/Solar.framework",
"${BUILT_PRODUCTS_DIR}/Turf/Turf.framework",
);
name = "[CP] Embed Pods Frameworks";
outputPaths = (
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Mapbox.framework",
"${DWARF_DSYM_FOLDER_PATH}/Mapbox.framework.dSYM",
"${BUILT_PRODUCTS_DIR}/CD548FF3-ECB4-31D0-8E4F-AE55F70E287F.bcsymbolmap",
"${BUILT_PRODUCTS_DIR}/70E1902C-569B-3192-A297-3622F9745C20.bcsymbolmap",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/MapboxCoreNavigation.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/MapboxDirections.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/MapboxMobileEvents.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/MapboxNavigation.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/MapboxNavigationNative.framework",
"${DWARF_DSYM_FOLDER_PATH}/MapboxNavigationNative.framework.dSYM",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/MapboxSpeech.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Polyline.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Solar.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Turf.framework",
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-DocsCode/Pods-DocsCode-frameworks.sh\"\n";
showEnvVarsInLog = 0;
};
056F105B1FC4C80A0037FFBE /* Insert Mapbox Access Token */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
Expand Down Expand Up @@ -1337,28 +1283,6 @@
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Examples/Pods-Examples-frameworks.sh\"\n";
showEnvVarsInLog = 0;
};
CFB2F8D6044EEE1F709058B1 /* [CP] Check Pods Manifest.lock */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputFileListPaths = (
);
inputPaths = (
"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
"${PODS_ROOT}/Manifest.lock",
);
name = "[CP] Check Pods Manifest.lock";
outputFileListPaths = (
);
outputPaths = (
"$(DERIVED_FILE_DIR)/Pods-DocsCode-checkManifestLockResult.txt",
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
showEnvVarsInLog = 0;
};
E8773E0E765E2B04318A4906 /* [CP] Check Pods Manifest.lock */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
Expand Down Expand Up @@ -1583,7 +1507,6 @@
/* Begin XCBuildConfiguration section */
0503374D1F7199DF007309B0 /* Debug */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = B81679E7B93FDEBBFB42646A /* Pods-DocsCode.debug.xcconfig */;
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CLANG_ANALYZER_NONNULL = YES;
Expand All @@ -1603,7 +1526,6 @@
};
0503374E1F7199DF007309B0 /* Release */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = 7823ECBC65EEAAC3EA0B6E42 /* Pods-DocsCode.release.xcconfig */;
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CLANG_ANALYZER_NONNULL = YES;
Expand Down
14 changes: 8 additions & 6 deletions Podfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,14 @@ target 'Examples' do
shared_pods
end

target 'DocsCode' do
pod 'MapboxNavigation', '0.34.0'
# pod 'MapboxCoreNavigation', :podspec => 'https://raw.githubusercontent.com/mapbox/mapbox-navigation-ios/v0.17.0-beta.1/MapboxCoreNavigation.podspec'
# pod 'MapboxNavigation', :podspec => 'https://raw.githubusercontent.com/mapbox/mapbox-navigation-ios/v0.17.0-beta.1/MapboxNavigation.podspec'
shared_pods
end
# Temporary solution until Navigation moves out of this repo.
# https://github.com/mapbox/ios-sdk-examples/issues/222
# target 'DocsCode' do
# pod 'MapboxNavigation', '0.34.0'
# # pod 'MapboxCoreNavigation', :podspec => 'https://raw.githubusercontent.com/mapbox/mapbox-navigation-ios/v0.17.0-beta.1/MapboxCoreNavigation.podspec'
# # pod 'MapboxNavigation', :podspec => 'https://raw.githubusercontent.com/mapbox/mapbox-navigation-ios/v0.17.0-beta.1/MapboxNavigation.podspec'
# shared_pods
# end

target 'ExamplesTests' do
# Pods for testing
Expand Down
41 changes: 2 additions & 39 deletions Podfile.lock
View file
Original file line number Diff line number Diff line change
@@ -1,57 +1,20 @@
PODS:
- Mapbox-iOS-SDK (5.0.0)
- MapboxCoreNavigation (0.34.0):
- MapboxDirections.swift (~> 0.28.0)
- MapboxMobileEvents (~> 0.9.3)
- MapboxNavigationNative (~> 6.2.1)
- Turf (~> 0.3.0)
- MapboxDirections.swift (0.28.0):
- Polyline (~> 4.2)
- MapboxMobileEvents (0.9.3)
- MapboxNavigation (0.34.0):
- Mapbox-iOS-SDK (~> 5.0.0)
- MapboxCoreNavigation (= 0.34.0)
- MapboxSpeech (~> 0.1.0)
- Solar (~> 2.1)
- MapboxNavigationNative (6.2.1)
- MapboxSpeech (0.1.1)
- Polyline (4.2.1)
- Solar (2.1.0)
- SwiftLint (0.32.0)
- Turf (0.3.0)

DEPENDENCIES:
- Mapbox-iOS-SDK (= 5.0.0)
- MapboxNavigation (= 0.34.0)
- SwiftLint (~> 0.29)

SPEC REPOS:
https://github.com/cocoapods/specs.git:
- Mapbox-iOS-SDK
- MapboxCoreNavigation
- MapboxDirections.swift
- MapboxMobileEvents
- MapboxNavigation
- MapboxNavigationNative
- MapboxSpeech
- Polyline
- Solar
- SwiftLint
- Turf

SPEC CHECKSUMS:
Mapbox-iOS-SDK: 018266d830ecb6e57d913494c280383b47981590
MapboxCoreNavigation: 6163a863738994237bd9eff28ebc303f28661994
MapboxDirections.swift: bec8771badfbdd55a0194649a4194b2c2cb15b96
MapboxMobileEvents: dea3b845b1a8528def7150dedf0cedefc6dfe284
MapboxNavigation: 4eee9aaaf19d584ee234242c57ac6644db32a76e
MapboxNavigationNative: 11dc22140f4698d3f26989f2b6379dc81ef0d4c1
MapboxSpeech: 59b3984d3f433a443d24acf53097f918c5cc70f9
Polyline: 0e9890790292741c8186201a536b6bb6a78d02dd
Solar: 2dc6e7cc39186cb0c8228fa08df76fb50c7d8f24
SwiftLint: 009a898ef2a1c851f45e1b59349bf6ff2ddc990d
Turf: c6bdf62d6a70c647874f295dd1cf4eefc0c3e9e6

PODFILE CHECKSUM: 6db03254a03b265a71ec1ee5a4e9aaf3572eb984
PODFILE CHECKSUM: 458e3b0c1850589d9cf09cd66a129b40235bd22c

COCOAPODS: 1.7.1
COCOAPODS: 1.7.0

0 comments on commit 9e3356d

Please sign in to comment.