From 54da63c4a11f6e5fb5f0aa5f47f3dc3adc6e712b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Toma=CC=81s=CC=8C=20Par=CC=8Ci=CC=81zek?= Date: Mon, 2 Oct 2017 14:16:02 +0200 Subject: [PATCH 1/4] Specified Hue dependency version in podspec --- Lightbox.podspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Lightbox.podspec b/Lightbox.podspec index 9f4580dc..32f565af 100644 --- a/Lightbox.podspec +++ b/Lightbox.podspec @@ -13,7 +13,7 @@ Pod::Spec.new do |s| s.ios.resource = 'Resources/Lightbox.bundle' s.frameworks = 'UIKit', 'AVFoundation', 'AVKit' - s.dependency 'Hue' + s.dependency 'Hue', '2.0.1' s.pod_target_xcconfig = { 'SWIFT_VERSION' => '3.0' } end From 0d60426da2daf8c76ab4693c7f820fae7c6b1fa0 Mon Sep 17 00:00:00 2001 From: Khoa Pham Date: Tue, 3 Oct 2017 13:28:30 +0200 Subject: [PATCH 2/4] Lock to 2.0 --- Cartfile | 2 +- Lightbox.podspec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Cartfile b/Cartfile index 5ea355bc..4bfc34e0 100644 --- a/Cartfile +++ b/Cartfile @@ -1 +1 @@ -github "hyperoslo/Hue" "master" +github "hyperoslo/Hue" ~> 2.0 diff --git a/Lightbox.podspec b/Lightbox.podspec index 32f565af..86de1a6e 100644 --- a/Lightbox.podspec +++ b/Lightbox.podspec @@ -13,7 +13,7 @@ Pod::Spec.new do |s| s.ios.resource = 'Resources/Lightbox.bundle' s.frameworks = 'UIKit', 'AVFoundation', 'AVKit' - s.dependency 'Hue', '2.0.1' + s.dependency 'Hue', '~> 2.0' s.pod_target_xcconfig = { 'SWIFT_VERSION' => '3.0' } end From c00d8b62dda9ea232061665d4332610aad1173de Mon Sep 17 00:00:00 2001 From: Khoa Pham Date: Tue, 3 Oct 2017 13:31:18 +0200 Subject: [PATCH 3/4] Update demo --- .../DemoLightbox.xcodeproj/project.pbxproj | 10 +++++++++- Example/DemoLightbox/Podfile.lock | 8 ++++---- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/Example/DemoLightbox/DemoLightbox.xcodeproj/project.pbxproj b/Example/DemoLightbox/DemoLightbox.xcodeproj/project.pbxproj index 6739cc50..256cb088 100644 --- a/Example/DemoLightbox/DemoLightbox.xcodeproj/project.pbxproj +++ b/Example/DemoLightbox/DemoLightbox.xcodeproj/project.pbxproj @@ -164,13 +164,16 @@ files = ( ); inputPaths = ( + "${PODS_PODFILE_DIR_PATH}/Podfile.lock", + "${PODS_ROOT}/Manifest.lock", ); name = "[CP] Check Pods Manifest.lock"; outputPaths = ( + "$(DERIVED_FILE_DIR)/Pods-DemoLightbox-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; }; 3BCDC27EE322C46C109D231B /* [CP] Copy Pods Resources */ = { @@ -194,9 +197,14 @@ files = ( ); inputPaths = ( + "${SRCROOT}/Pods/Target Support Files/Pods-DemoLightbox/Pods-DemoLightbox-frameworks.sh", + "${BUILT_PRODUCTS_DIR}/Hue/Hue.framework", + "${BUILT_PRODUCTS_DIR}/Lightbox/Lightbox.framework", ); name = "[CP] Embed Pods Frameworks"; outputPaths = ( + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Hue.framework", + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Lightbox.framework", ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; diff --git a/Example/DemoLightbox/Podfile.lock b/Example/DemoLightbox/Podfile.lock index d1409d3e..446b60f9 100644 --- a/Example/DemoLightbox/Podfile.lock +++ b/Example/DemoLightbox/Podfile.lock @@ -1,19 +1,19 @@ PODS: - Hue (2.0.1) - Lightbox (1.0.0): - - Hue + - Hue (~> 2.0) DEPENDENCIES: - Lightbox (from `../../`) EXTERNAL SOURCES: Lightbox: - :path: "../../" + :path: ../../ SPEC CHECKSUMS: Hue: 354caec055fdc9d38b5ef33ca2e7224721843baf - Lightbox: a7edccb98c1a84a4b089a44dbaf2b39a409fbfcb + Lightbox: d15b5e265e505009932fa447f27b5262b8b1b604 PODFILE CHECKSUM: cd88b68c201e5c39cef62070056649eaee91c71b -COCOAPODS: 1.2.1 +COCOAPODS: 1.3.1 From eb4b12f633fc1b919d0fcf6fe34318172c2c4b49 Mon Sep 17 00:00:00 2001 From: Khoa Pham Date: Tue, 3 Oct 2017 13:34:07 +0200 Subject: [PATCH 4/4] Bump 1.1.0 --- Lightbox.podspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Lightbox.podspec b/Lightbox.podspec index 86de1a6e..47e06ae4 100644 --- a/Lightbox.podspec +++ b/Lightbox.podspec @@ -1,7 +1,7 @@ Pod::Spec.new do |s| s.name = "Lightbox" s.summary = "A a convenient and easy to use image viewer for your iOS app, packed with all the features you expect" - s.version = "1.0.0" + s.version = "1.1.0" s.homepage = "https://github.com/hyperoslo/Lightbox" s.license = 'MIT' s.author = { "Hyper Interaktiv AS" => "ios@hyper.no" }