From 98b5cd7fbda8c0d17e101340564bab1b6ea30060 Mon Sep 17 00:00:00 2001 From: randallli Date: Wed, 7 Dec 2016 16:10:35 -0500 Subject: [PATCH] Removed crutch logic for pre published dependency. --- examples/apps/RobotoFontLoaderExample/Podfile | 3 --- examples/apps/RobotoFontLoaderExample/Podfile.lock | 7 ++----- .../RobotoFontLoaderExample.xcodeproj/project.pbxproj | 4 ++-- 3 files changed, 4 insertions(+), 10 deletions(-) diff --git a/examples/apps/RobotoFontLoaderExample/Podfile b/examples/apps/RobotoFontLoaderExample/Podfile index 959b51d..b71d060 100644 --- a/examples/apps/RobotoFontLoaderExample/Podfile +++ b/examples/apps/RobotoFontLoaderExample/Podfile @@ -4,9 +4,6 @@ target "RobotoFontLoaderExample" do pod 'MDFRobotoFontLoader', :path => '../../../' pod 'CatalogByConvention' - # Note: this works around the unreleased state of the FontDiskLoader. - pod 'MDFFontDiskLoader', :path => '../../../../material-font-disk-loader-ios/' - target 'RobotoFontLoaderExampleTests' do end end diff --git a/examples/apps/RobotoFontLoaderExample/Podfile.lock b/examples/apps/RobotoFontLoaderExample/Podfile.lock index a88c410..c0b253d 100644 --- a/examples/apps/RobotoFontLoaderExample/Podfile.lock +++ b/examples/apps/RobotoFontLoaderExample/Podfile.lock @@ -6,12 +6,9 @@ PODS: DEPENDENCIES: - CatalogByConvention - - MDFFontDiskLoader (from `../../../../material-font-disk-loader-ios/`) - MDFRobotoFontLoader (from `../../../`) EXTERNAL SOURCES: - MDFFontDiskLoader: - :path: "../../../../material-font-disk-loader-ios/" MDFRobotoFontLoader: :path: "../../../" @@ -20,6 +17,6 @@ SPEC CHECKSUMS: MDFFontDiskLoader: 95d6c92c644f24897dee5a860973b0da4d9a1ce4 MDFRobotoFontLoader: 4c4f388aed303e99e57e4c99d04230ed7b870f9d -PODFILE CHECKSUM: 74430d337f691113bb689e9060fdf65deade59fa +PODFILE CHECKSUM: 052a88478a1b381320d170733a3507d3153c787e -COCOAPODS: 1.0.1 +COCOAPODS: 1.1.1 diff --git a/examples/apps/RobotoFontLoaderExample/RobotoFontLoaderExample.xcodeproj/project.pbxproj b/examples/apps/RobotoFontLoaderExample/RobotoFontLoaderExample.xcodeproj/project.pbxproj index ecb6fc7..ba4b254 100644 --- a/examples/apps/RobotoFontLoaderExample/RobotoFontLoaderExample.xcodeproj/project.pbxproj +++ b/examples/apps/RobotoFontLoaderExample/RobotoFontLoaderExample.xcodeproj/project.pbxproj @@ -281,7 +281,7 @@ ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "diff \"${PODS_ROOT}/../Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [[ $? != 0 ]] ; then\n cat << EOM\nerror: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\nEOM\n exit 1\nfi\n"; + shellScript = "diff \"${PODS_ROOT}/../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"; showEnvVarsInLog = 0; }; 3E7B3F2DA631F2D65D429269 /* [CP] Embed Pods Frameworks */ = { @@ -341,7 +341,7 @@ ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "diff \"${PODS_ROOT}/../Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [[ $? != 0 ]] ; then\n cat << EOM\nerror: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\nEOM\n exit 1\nfi\n"; + shellScript = "diff \"${PODS_ROOT}/../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"; showEnvVarsInLog = 0; }; /* End PBXShellScriptBuildPhase section */