Skip to content

Commit

Permalink
Merge pull request #5 from EurekaCommunity/Eureka4
Browse files Browse the repository at this point in the history
Eureka4
  • Loading branch information
alldritt authored Sep 28, 2017
2 parents cb8dc84 + 6d00377 commit 22e18fd
Show file tree
Hide file tree
Showing 50 changed files with 740 additions and 454 deletions.
2 changes: 1 addition & 1 deletion ColorPicker/ColorPickerRow.swift
Original file line number Diff line number Diff line change
Expand Up @@ -238,7 +238,7 @@ public final class ColorPickerCell : Cell<UIColor>, CellType, UICollectionViewDe

// MARK: MyCustomRow

open class _ColorPickerRow: Row<ColorPickerCell> {
public class _ColorPickerRow: Row<ColorPickerCell> {

open var showsCurrentSwatch = true {
didSet {
Expand Down
2 changes: 1 addition & 1 deletion ColorPicker/ColorRow.swift
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ public final class ColorCell : Cell<UIColor>, CellType {

// MARK: MyCustomRow

open class _ColorRow: Row<ColorCell> {
public class _ColorRow: Row<ColorCell> {

var isCircular = false {
didSet {
Expand Down
8 changes: 4 additions & 4 deletions ColorPickerRow.podspec
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
Pod::Spec.new do |s|
s.name = 'ColorPickerRow'
s.version = '0.1.0'
s.version = '1.1.0'
s.license = 'MIT'
s.summary = 'A color picker row for use with the Eureka form library'
s.homepage = 'https://github.com/EurekaCommunity/ColorPickerRow'
s.source = { :git => 'https://github.com/EurekaCommunity/ColorPickerRow.git'}
s.source = { :git => 'https://github.com/EurekaCommunity/ColorPickerRow.git' }
s.ios.deployment_target = '8.0'
s.ios.frameworks = 'UIKit', 'Foundation'
s.source_files = 'ColorPicker/**/*.swift'
s.requires_arc = true
s.author = "Mark Alldritt"
s.dependencies = {
'Eureka' => '> 2.0.0',
'UIColor_Hex_Swift' => '~> 3.0.2'
'Eureka' => '>= 4.0.0',
'UIColor_Hex_Swift'
}
end
14 changes: 11 additions & 3 deletions Example.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -193,9 +193,14 @@
files = (
);
inputPaths = (
"${SRCROOT}/Pods/Target Support Files/Pods-ColorPicker/Pods-ColorPicker-frameworks.sh",
"${BUILT_PRODUCTS_DIR}/Eureka/Eureka.framework",
"${BUILT_PRODUCTS_DIR}/UIColor_Hex_Swift/UIColor_Hex_Swift.framework",
);
name = "[CP] Embed Pods Frameworks";
outputPaths = (
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Eureka.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/UIColor_Hex_Swift.framework",
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
Expand Down Expand Up @@ -223,13 +228,16 @@
files = (
);
inputPaths = (
"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
"${PODS_ROOT}/Manifest.lock",
);
name = "[CP] Check Pods Manifest.lock";
outputPaths = (
"$(DERIVED_FILE_DIR)/Pods-ColorPicker-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;
};
/* End PBXShellScriptBuildPhase section */
Expand Down Expand Up @@ -379,7 +387,7 @@
PRODUCT_BUNDLE_IDENTIFIER = com.latenightsw.EurekaCustomView;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
SWIFT_VERSION = 3.0;
SWIFT_VERSION = 4.0;
};
name = Debug;
};
Expand All @@ -396,7 +404,7 @@
PRODUCT_BUNDLE_IDENTIFIER = com.latenightsw.EurekaCustomView;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
SWIFT_VERSION = 3.0;
SWIFT_VERSION = 4.0;
};
name = Release;
};
Expand Down
6 changes: 3 additions & 3 deletions Podfile
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
platform :ios, '10.0'
source 'https://github.com/CocoaPods/Specs.git'

target ColorPicker do
target 'ColorPicker' do
use_frameworks!

pod 'Eureka', :git => 'https://github.com/xmartlabs/Eureka.git', :branch => 'master' #'~> 2.0.0-beta.1'
pod 'UIColor_Hex_Swift', '~> 3.0.2'
pod 'Eureka', '>= 4.0.0'
pod 'UIColor_Hex_Swift'

end
22 changes: 6 additions & 16 deletions Podfile.lock
Original file line number Diff line number Diff line change
@@ -1,25 +1,15 @@
PODS:
- Eureka (3.0.0)
- Eureka (4.0.0)
- UIColor_Hex_Swift (3.0.2)

DEPENDENCIES:
- Eureka (from `https://github.com/xmartlabs/Eureka.git`, branch `master`)
- UIColor_Hex_Swift (~> 3.0.2)

EXTERNAL SOURCES:
Eureka:
:branch: master
:git: https://github.com/xmartlabs/Eureka.git

CHECKOUT OPTIONS:
Eureka:
:commit: 77cb04f587a4e83f28ad5f3174f6f8f6c086b524
:git: https://github.com/xmartlabs/Eureka.git
- Eureka (~> 4.0.0)
- UIColor_Hex_Swift

SPEC CHECKSUMS:
Eureka: 5b9418d7bfdc21ca977d69d124a6409f3e9af2c7
Eureka: c0b55d2aec82050c1400c7d65960b700be8d10ef
UIColor_Hex_Swift: 95f718452092a3efc8a827dffd2c04d3237be02d

PODFILE CHECKSUM: af7f6296626bb44cb5f6bedfacf378f45aa2c098
PODFILE CHECKSUM: 309386d4cd991af5cee3f3de160a3338b893ff73

COCOAPODS: 1.2.1
COCOAPODS: 1.3.1
25 changes: 14 additions & 11 deletions Pods/Eureka/README.md

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

7 changes: 7 additions & 0 deletions Pods/Eureka/Source/Core/BaseRow.swift

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

3 changes: 1 addition & 2 deletions Pods/Eureka/Source/Core/Cell.swift

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

Loading

0 comments on commit 22e18fd

Please sign in to comment.