Skip to content

Commit

Permalink
Update to CP 1.3.1
Browse files Browse the repository at this point in the history
  • Loading branch information
AliSoftware committed Aug 12, 2017
1 parent 1cdcdf4 commit 695b6bf
Show file tree
Hide file tree
Showing 8 changed files with 199 additions and 177 deletions.
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# frozen_string_literal: true
source 'https://rubygems.org'

gem 'cocoapods', '1.2.1'
gem 'cocoapods', '1.3.1'
gem 'xcpretty'
gem 'rake'
gem 'octokit', '~> 4.7'
14 changes: 7 additions & 7 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@ GEM
addressable (2.5.1)
public_suffix (~> 2.0, >= 2.0.2)
claide (1.0.2)
cocoapods (1.2.1)
cocoapods (1.3.1)
activesupport (>= 4.0.2, < 5)
claide (>= 1.0.1, < 2.0)
cocoapods-core (= 1.2.1)
claide (>= 1.0.2, < 2.0)
cocoapods-core (= 1.3.1)
cocoapods-deintegrate (>= 1.0.1, < 2.0)
cocoapods-downloader (>= 1.1.3, < 2.0)
cocoapods-plugins (>= 1.0.0, < 2.0)
Expand All @@ -28,9 +28,9 @@ GEM
molinillo (~> 0.5.7)
nap (~> 1.0)
ruby-macho (~> 1.1)
xcodeproj (>= 1.4.4, < 2.0)
cocoapods-core (1.2.1)
activesupport (>= 4.0.2, < 5)
xcodeproj (>= 1.5.1, < 2.0)
cocoapods-core (1.3.1)
activesupport (>= 4.0.2, < 6)
fuzzy_match (~> 2.0.4)
nap (~> 1.0)
cocoapods-deintegrate (1.0.1)
Expand Down Expand Up @@ -81,7 +81,7 @@ PLATFORMS
ruby

DEPENDENCIES
cocoapods (= 1.2.1)
cocoapods (= 1.3.1)
octokit (~> 4.7)
rake
xcpretty
Expand Down
2 changes: 1 addition & 1 deletion Podfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -19,4 +19,4 @@ SPEC CHECKSUMS:

PODFILE CHECKSUM: 81c0228e2e71a9683d0eed53bd9f6bd1165815b7

COCOAPODS: 1.2.1
COCOAPODS: 1.3.1
2 changes: 1 addition & 1 deletion Pods/Manifest.lock

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

289 changes: 142 additions & 147 deletions Pods/Pods.xcodeproj/project.pbxproj

Large diffs are not rendered by default.

33 changes: 23 additions & 10 deletions Pods/Target Support Files/Pods-Tests/Pods-Tests-frameworks.sh

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

22 changes: 13 additions & 9 deletions Pods/Target Support Files/Pods-Tests/Pods-Tests-resources.sh

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

12 changes: 11 additions & 1 deletion StencilSwiftKit.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -236,13 +236,16 @@
files = (
);
inputPaths = (
"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
"${PODS_ROOT}/Manifest.lock",
);
name = "[CP] Check Pods Manifest.lock";
outputPaths = (
"$(DERIVED_FILE_DIR)/Pods-Tests-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";
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;
};
DD3EE1B91E65D8BC00EA1599 /* ⚠️ SwiftLint */ = {
Expand All @@ -265,9 +268,16 @@
files = (
);
inputPaths = (
"${SRCROOT}/Pods/Target Support Files/Pods-Tests/Pods-Tests-frameworks.sh",
"${BUILT_PRODUCTS_DIR}/PathKit/PathKit.framework",
"${BUILT_PRODUCTS_DIR}/Stencil/Stencil.framework",
"${BUILT_PRODUCTS_DIR}/StencilSwiftKit/StencilSwiftKit.framework",
);
name = "[CP] Embed Pods Frameworks";
outputPaths = (
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/PathKit.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Stencil.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/StencilSwiftKit.framework",
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
Expand Down

0 comments on commit 695b6bf

Please sign in to comment.