Skip to content

Commit

Permalink
Merge pull request hyperoslo#345 from hyperoslo/fix/update_project
Browse files Browse the repository at this point in the history
Update and fix project
  • Loading branch information
onmyway133 authored Oct 9, 2017
2 parents b6e5954 + 3a65411 commit 14876f9
Show file tree
Hide file tree
Showing 22 changed files with 167 additions and 158 deletions.
3 changes: 0 additions & 3 deletions .mention-bot

This file was deleted.

4 changes: 0 additions & 4 deletions .slather.yml

This file was deleted.

2 changes: 1 addition & 1 deletion .swift-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
3.0
4.0
5 changes: 0 additions & 5 deletions .travis.yml

This file was deleted.

86 changes: 57 additions & 29 deletions Demo/ImagePickerDemo/ImagePickerDemo.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
29D699DF1B70ABFC0021FA73 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 29D699DE1B70ABFC0021FA73 /* AppDelegate.swift */; };
29D699E61B70ABFC0021FA73 /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 29D699E51B70ABFC0021FA73 /* Images.xcassets */; };
29D699E91B70ABFC0021FA73 /* LaunchScreen.xib in Resources */ = {isa = PBXBuildFile; fileRef = 29D699E71B70ABFC0021FA73 /* LaunchScreen.xib */; };
4221AE1F43A643A689082012 /* Pods_ImagePickerDemo.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F1148A4E4BFF9A0AAED07754 /* Pods_ImagePickerDemo.framework */; };
A23836048FD18F274FB629F2 /* Pods_ImagePickerDemo.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3E0B31E77EFE064C4E63D017 /* Pods_ImagePickerDemo.framework */; };
D20AA8A51D5330100085FF5B /* ViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = D20AA8A41D5330100085FF5B /* ViewController.swift */; };
/* End PBXBuildFile section */

Expand All @@ -20,19 +20,19 @@
29D699DE1B70ABFC0021FA73 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
29D699E51B70ABFC0021FA73 /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Images.xcassets; sourceTree = "<group>"; };
29D699E81B70ABFC0021FA73 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/LaunchScreen.xib; sourceTree = "<group>"; };
6F9E1FF802198DC16F260795 /* Pods-ImagePickerDemo.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-ImagePickerDemo.release.xcconfig"; path = "Pods/Target Support Files/Pods-ImagePickerDemo/Pods-ImagePickerDemo.release.xcconfig"; sourceTree = "<group>"; };
2A8853E2BE3B43C6DC7CF614 /* Pods-ImagePickerDemo.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-ImagePickerDemo.debug.xcconfig"; path = "Pods/Target Support Files/Pods-ImagePickerDemo/Pods-ImagePickerDemo.debug.xcconfig"; sourceTree = "<group>"; };
3E0B31E77EFE064C4E63D017 /* Pods_ImagePickerDemo.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_ImagePickerDemo.framework; sourceTree = BUILT_PRODUCTS_DIR; };
733A7AD0105A657A80502E72 /* Pods.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods.framework; sourceTree = BUILT_PRODUCTS_DIR; };
C4392341AC7391C01AD9F350 /* Pods-ImagePickerDemo.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-ImagePickerDemo.debug.xcconfig"; path = "Pods/Target Support Files/Pods-ImagePickerDemo/Pods-ImagePickerDemo.debug.xcconfig"; sourceTree = "<group>"; };
7F1C1FC700491641CD7DB2C1 /* Pods-ImagePickerDemo.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-ImagePickerDemo.release.xcconfig"; path = "Pods/Target Support Files/Pods-ImagePickerDemo/Pods-ImagePickerDemo.release.xcconfig"; sourceTree = "<group>"; };
D20AA8A41D5330100085FF5B /* ViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ViewController.swift; sourceTree = "<group>"; };
F1148A4E4BFF9A0AAED07754 /* Pods_ImagePickerDemo.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_ImagePickerDemo.framework; sourceTree = BUILT_PRODUCTS_DIR; };
/* End PBXFileReference section */

/* Begin PBXFrameworksBuildPhase section */
29D699D61B70ABFC0021FA73 /* Frameworks */ = {
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
4221AE1F43A643A689082012 /* Pods_ImagePickerDemo.framework in Frameworks */,
A23836048FD18F274FB629F2 /* Pods_ImagePickerDemo.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand All @@ -45,7 +45,7 @@
29D699DB1B70ABFC0021FA73 /* ImagePickerDemo */,
29D699DA1B70ABFC0021FA73 /* Products */,
DD112158CF9886DE925FED5E /* Frameworks */,
A067DFAD5749963FA2D2ADED /* Pods */,
388F913CF71E1D89FDE2519A /* Pods */,
);
indentWidth = 2;
sourceTree = "<group>";
Expand Down Expand Up @@ -79,11 +79,11 @@
name = "Supporting Files";
sourceTree = "<group>";
};
A067DFAD5749963FA2D2ADED /* Pods */ = {
388F913CF71E1D89FDE2519A /* Pods */ = {
isa = PBXGroup;
children = (
C4392341AC7391C01AD9F350 /* Pods-ImagePickerDemo.debug.xcconfig */,
6F9E1FF802198DC16F260795 /* Pods-ImagePickerDemo.release.xcconfig */,
2A8853E2BE3B43C6DC7CF614 /* Pods-ImagePickerDemo.debug.xcconfig */,
7F1C1FC700491641CD7DB2C1 /* Pods-ImagePickerDemo.release.xcconfig */,
);
name = Pods;
sourceTree = "<group>";
Expand All @@ -92,7 +92,7 @@
isa = PBXGroup;
children = (
733A7AD0105A657A80502E72 /* Pods.framework */,
F1148A4E4BFF9A0AAED07754 /* Pods_ImagePickerDemo.framework */,
3E0B31E77EFE064C4E63D017 /* Pods_ImagePickerDemo.framework */,
);
name = Frameworks;
sourceTree = "<group>";
Expand All @@ -104,12 +104,12 @@
isa = PBXNativeTarget;
buildConfigurationList = 29D699F81B70ABFC0021FA73 /* Build configuration list for PBXNativeTarget "ImagePickerDemo" */;
buildPhases = (
CFC24DB54992EE46F3A63C6F /* [CP] Check Pods Manifest.lock */,
31B4D2E55A81DB27B864B2A3 /* [CP] Check Pods Manifest.lock */,
29D699D51B70ABFC0021FA73 /* Sources */,
29D699D61B70ABFC0021FA73 /* Frameworks */,
29D699D71B70ABFC0021FA73 /* Resources */,
A0BD0958A43D0416D3FF9365 /* [CP] Embed Pods Frameworks */,
6821C4AC157C46704C0307CA /* [CP] Copy Pods Resources */,
F3EF51BCE509121FBC00640E /* [CP] Embed Pods Frameworks */,
EEE9A1733584FC13190615E2 /* [CP] Copy Pods Resources */,
);
buildRules = (
);
Expand All @@ -127,7 +127,7 @@
isa = PBXProject;
attributes = {
LastSwiftUpdateCheck = 0700;
LastUpgradeCheck = 0800;
LastUpgradeCheck = 0900;
ORGANIZATIONNAME = "Ramon Gilabert Llop";
TargetAttributes = {
29D699D81B70ABFC0021FA73 = {
Expand Down Expand Up @@ -167,49 +167,65 @@
/* End PBXResourcesBuildPhase section */

/* Begin PBXShellScriptBuildPhase section */
6821C4AC157C46704C0307CA /* [CP] Copy Pods Resources */ = {
31B4D2E55A81DB27B864B2A3 /* [CP] Check Pods Manifest.lock */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputPaths = (
"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
"${PODS_ROOT}/Manifest.lock",
);
name = "[CP] Copy Pods Resources";
name = "[CP] Check Pods Manifest.lock";
outputPaths = (
"$(DERIVED_FILE_DIR)/Pods-ImagePickerDemo-checkManifestLockResult.txt",
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-ImagePickerDemo/Pods-ImagePickerDemo-resources.sh\"\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;
};
A0BD0958A43D0416D3FF9365 /* [CP] Embed Pods Frameworks */ = {
EEE9A1733584FC13190615E2 /* [CP] Copy Pods Resources */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputPaths = (
);
name = "[CP] Embed Pods Frameworks";
name = "[CP] Copy Pods Resources";
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-ImagePickerDemo/Pods-ImagePickerDemo-frameworks.sh\"\n";
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-ImagePickerDemo/Pods-ImagePickerDemo-resources.sh\"\n";
showEnvVarsInLog = 0;
};
CFC24DB54992EE46F3A63C6F /* [CP] Check Pods Manifest.lock */ = {
F3EF51BCE509121FBC00640E /* [CP] Embed Pods Frameworks */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputPaths = (
"${SRCROOT}/Pods/Target Support Files/Pods-ImagePickerDemo/Pods-ImagePickerDemo-frameworks.sh",
"${BUILT_PRODUCTS_DIR}/Cache/Cache.framework",
"${BUILT_PRODUCTS_DIR}/Hue/Hue.framework",
"${BUILT_PRODUCTS_DIR}/ImagePicker/ImagePicker.framework",
"${BUILT_PRODUCTS_DIR}/Imaginary/Imaginary.framework",
"${BUILT_PRODUCTS_DIR}/Lightbox/Lightbox.framework",
"${BUILT_PRODUCTS_DIR}/SwiftHash/SwiftHash.framework",
);
name = "[CP] Check Pods Manifest.lock";
name = "[CP] Embed Pods Frameworks";
outputPaths = (
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Cache.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Hue.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/ImagePicker.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Imaginary.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Lightbox.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SwiftHash.framework",
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
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";
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-ImagePickerDemo/Pods-ImagePickerDemo-frameworks.sh\"\n";
showEnvVarsInLog = 0;
};
/* End PBXShellScriptBuildPhase section */
Expand Down Expand Up @@ -246,14 +262,20 @@
CLANG_CXX_LIBRARY = "libc++";
CLANG_ENABLE_MODULES = YES;
CLANG_ENABLE_OBJC_ARC = YES;
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
CLANG_WARN_BOOL_CONVERSION = YES;
CLANG_WARN_COMMA = YES;
CLANG_WARN_CONSTANT_CONVERSION = YES;
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
CLANG_WARN_EMPTY_BODY = YES;
CLANG_WARN_ENUM_CONVERSION = YES;
CLANG_WARN_INFINITE_RECURSION = YES;
CLANG_WARN_INT_CONVERSION = YES;
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
CLANG_WARN_STRICT_PROTOTYPES = YES;
CLANG_WARN_SUSPICIOUS_MOVE = YES;
CLANG_WARN_UNREACHABLE_CODE = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
Expand All @@ -277,11 +299,12 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 8.2;
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
MTL_ENABLE_DEBUG_INFO = YES;
ONLY_ACTIVE_ARCH = YES;
SDKROOT = iphoneos;
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
SWIFT_VERSION = 4.0;
TARGETED_DEVICE_FAMILY = "1,2";
};
name = Debug;
Expand All @@ -294,14 +317,20 @@
CLANG_CXX_LIBRARY = "libc++";
CLANG_ENABLE_MODULES = YES;
CLANG_ENABLE_OBJC_ARC = YES;
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
CLANG_WARN_BOOL_CONVERSION = YES;
CLANG_WARN_COMMA = YES;
CLANG_WARN_CONSTANT_CONVERSION = YES;
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
CLANG_WARN_EMPTY_BODY = YES;
CLANG_WARN_ENUM_CONVERSION = YES;
CLANG_WARN_INFINITE_RECURSION = YES;
CLANG_WARN_INT_CONVERSION = YES;
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
CLANG_WARN_STRICT_PROTOTYPES = YES;
CLANG_WARN_SUSPICIOUS_MOVE = YES;
CLANG_WARN_UNREACHABLE_CODE = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
Expand All @@ -318,18 +347,19 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 8.2;
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
MTL_ENABLE_DEBUG_INFO = NO;
SDKROOT = iphoneos;
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
SWIFT_VERSION = 4.0;
TARGETED_DEVICE_FAMILY = "1,2";
VALIDATE_PRODUCT = YES;
};
name = Release;
};
29D699F91B70ABFC0021FA73 /* Debug */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = C4392341AC7391C01AD9F350 /* Pods-ImagePickerDemo.debug.xcconfig */;
baseConfigurationReference = 2A8853E2BE3B43C6DC7CF614 /* Pods-ImagePickerDemo.debug.xcconfig */;
buildSettings = {
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
Expand All @@ -342,13 +372,12 @@
PRODUCT_BUNDLE_IDENTIFIER = no.hyper.ImagePickerDemo2;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE = "";
SWIFT_VERSION = 3.0;
};
name = Debug;
};
29D699FA1B70ABFC0021FA73 /* Release */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = 6F9E1FF802198DC16F260795 /* Pods-ImagePickerDemo.release.xcconfig */;
baseConfigurationReference = 7F1C1FC700491641CD7DB2C1 /* Pods-ImagePickerDemo.release.xcconfig */;
buildSettings = {
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
Expand All @@ -361,7 +390,6 @@
PRODUCT_BUNDLE_IDENTIFIER = no.hyper.ImagePickerDemo2;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE = "";
SWIFT_VERSION = 3.0;
};
name = Release;
};
Expand Down
5 changes: 2 additions & 3 deletions Demo/ImagePickerDemo/ImagePickerDemo/ViewController.swift
Original file line number Diff line number Diff line change
Expand Up @@ -35,15 +35,14 @@ class ViewController: UIViewController, ImagePickerDelegate {
return button
}

func buttonTouched(button: UIButton) {
@objc func buttonTouched(button: UIButton) {
var config = Configuration()
config.doneButtonTitle = "Finish"
config.noImagesTitle = "Sorry! There are no images here!"
config.recordLocation = false
config.allowVideoSelection = true

let imagePicker = ImagePickerController()
imagePicker.configuration = config
let imagePicker = ImagePickerController(configuration: config)
imagePicker.delegate = self

present(imagePicker, animated: true, completion: nil)
Expand Down
7 changes: 3 additions & 4 deletions Demo/ImagePickerDemo/Podfile
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
platform :ios, '8.2'
platform :ios, '9.2'

use_frameworks!
inhibit_all_warnings!

target 'ImagePickerDemo' do
pod 'ImagePicker', path: '../../'
pod 'Lightbox', git: 'https://github.com/hyperoslo/Lightbox.git'
pod 'Sugar', git: 'https://github.com/hyperoslo/Sugar.git'
pod 'Hue', git: 'https://github.com/hyperoslo/Hue.git'
pod 'Lightbox'
pod 'Hue'
end
51 changes: 20 additions & 31 deletions Demo/ImagePickerDemo/Podfile.lock
Original file line number Diff line number Diff line change
@@ -1,43 +1,32 @@
PODS:
- Hue (2.0.1)
- ImagePicker (2.1.1)
- Lightbox (1.0.0):
- Hue
- Sugar (3.1.2)
- Cache (4.0.2):
- SwiftHash (~> 2.0.0)
- Hue (3.0.0)
- ImagePicker (3.0.0)
- Imaginary (3.0.0):
- Cache (~> 4.0)
- Lightbox (2.0.0):
- Hue (~> 3.0)
- Imaginary (~> 3.0)
- SwiftHash (2.0.0)

DEPENDENCIES:
- Hue (from `https://github.com/hyperoslo/Hue.git`)
- Hue
- ImagePicker (from `../../`)
- Lightbox (from `https://github.com/hyperoslo/Lightbox.git`)
- Sugar (from `https://github.com/hyperoslo/Sugar.git`)
- Lightbox

EXTERNAL SOURCES:
Hue:
:git: https://github.com/hyperoslo/Hue.git
ImagePicker:
:path: ../../
Lightbox:
:git: https://github.com/hyperoslo/Lightbox.git
Sugar:
:git: https://github.com/hyperoslo/Sugar.git

CHECKOUT OPTIONS:
Hue:
:commit: 979ba84244b5166b461bf31bbb6dba561d2c2a1e
:git: https://github.com/hyperoslo/Hue.git
Lightbox:
:commit: 48f307b00332e4c5dc9a785757d974224f0f7307
:git: https://github.com/hyperoslo/Lightbox.git
Sugar:
:commit: 41e0f1e92bfd29b805fa74f87444975ca2976887
:git: https://github.com/hyperoslo/Sugar.git

SPEC CHECKSUMS:
Hue: ab7efb15270e0bc764f2f468aa6f3f2728d52f2b
ImagePicker: 4845cf22f8dd201ff5730474b619f017d374a3b8
Lightbox: a7edccb98c1a84a4b089a44dbaf2b39a409fbfcb
Sugar: 41f2efa0244806f524ff2d77c951a6a43e81a0f3
Cache: 363b6899cee63c82ccbd291e64a6c202abc17a88
Hue: b8fe1e43eef13631331eebecb2198b68e2622f95
ImagePicker: f8a3ce52e587b55f58aef2d83d894ed6f7820f51
Imaginary: 2765d293d425cbed3b07fa11642554cbaebe913d
Lightbox: 83ec9f4aba4c79fc7bb9bcd263386df9969f09bb
SwiftHash: d2e09b13495447178cdfb8e46e54a5c46f15f5a9

PODFILE CHECKSUM: 4211a335ad26e5b66e84b7da22d4a0fcf78fb3ca
PODFILE CHECKSUM: 702c1e0df019fe44ce740e86904dd384d55aefbe

COCOAPODS: 1.1.0.rc.3
COCOAPODS: 1.3.1
Loading

0 comments on commit 14876f9

Please sign in to comment.