Skip to content

Commit

Permalink
Merge pull request #35 from kamerc/master
Browse files Browse the repository at this point in the history
Updates for SplitRow to work with Swift 5 & Eureka 5.0.0
  • Loading branch information
kamerc authored Apr 18, 2019
2 parents 4fcdffb + cb4e147 commit 3358fa8
Show file tree
Hide file tree
Showing 7 changed files with 19 additions and 19 deletions.
2 changes: 1 addition & 1 deletion Cartfile
Original file line number Diff line number Diff line change
@@ -1 +1 @@
github "xmartlabs/Eureka" ~> 4.3
github "xmartlabs/Eureka" ~> 5.0
2 changes: 1 addition & 1 deletion Cartfile.resolved
Original file line number Diff line number Diff line change
@@ -1 +1 @@
github "xmartlabs/Eureka" "4.3.1"
github "xmartlabs/Eureka" "5.0.0"
2 changes: 1 addition & 1 deletion Podfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Uncomment the next line to define a global platform for your project
platform :ios, '10.0'
platform :ios, '9.3'

target 'Example' do
# Comment the next line if you're not using Swift and don't want to use dynamic frameworks
Expand Down
2 changes: 1 addition & 1 deletion Podfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,6 @@ SPEC REPOS:
SPEC CHECKSUMS:
Eureka: 0f64f477ec8ef6201c6fec143d60ff5c201cf654

PODFILE CHECKSUM: 48e81cb6265dd765e906cb34965214643e3ddbbd
PODFILE CHECKSUM: c9a8ec3c5837faa99aa96063ba9280064d61c203

COCOAPODS: 1.5.3
10 changes: 5 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ A row for Eureka to put two rows side by side into the same UITableViewCell.

<p align="left">
<img src="https://img.shields.io/badge/platform-iOS-blue.svg?style=flat" alt="Platform iOS" />
<a href="https://developer.apple.com/swift"><img src="https://img.shields.io/badge/swift4-compatible-4BC51D.svg?style=flat" alt="Swift 4 compatible" /></a>
<a href="https://developer.apple.com/swift"><img src="https://img.shields.io/badge/swift5-compatible-4BC51D.svg?style=flat" alt="Swift 5 compatible" /></a>
<a href="https://github.com/Carthage/Carthage"><img src="https://img.shields.io/badge/Carthage-compatible-4BC51D.svg?style=flat" alt="Carthage compatible" /></a>
<a href="https://cocoapods.org/pods/SplitRow"><img src="https://img.shields.io/cocoapods/v/SplitRow.svg" alt="CocoaPods compatible" /></a>
<a href="https://raw.githubusercontent.com/EurekaCommunity/SplitRow/master/LICENSE"><img src="http://img.shields.io/badge/license-MIT-blue.svg?style=flat" alt="License: MIT" /></a>
Expand Down Expand Up @@ -34,7 +34,7 @@ Specify Eureka into your project's `Podfile`:

```ruby
source 'https://github.com/CocoaPods/Specs.git'
platform :ios, '9.0'
platform :ios, '9.3'
use_frameworks!

pod 'SplitRow'
Expand All @@ -53,7 +53,7 @@ $ pod install
Specify SplitRow into your project's `Cartfile`:

```
github "EurekaCommunity/SplitRow" ~> 1.3
github "EurekaCommunity/SplitRow" ~> 2.0.0
```

Then run the following command:
Expand Down Expand Up @@ -123,9 +123,9 @@ class ViewController: FormViewController {

## Requirements

* iOS 9.0+
* iOS 9.3+
* Xcode 9.0+
* Eureka ~> 4.1
* Eureka ~> 5.0

## Getting involved

Expand Down
4 changes: 2 additions & 2 deletions SplitRow.podspec
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
Pod::Spec.new do |s|
s.name = "SplitRow"
s.version = "1.3.0"
s.version = "2.0.0"
s.summary = "A row for Eureka to put two rows side by side into the same UITableViewCell."
s.homepage = "https://github.com/EurekaCommunity/SplitRow"
s.license = { :type => "MIT", :file => "LICENSE" }
s.author = "Marco Betschart"
s.social_media_url = "https://twitter.com/EurekaCommunity"
s.platform = :ios, "9.0"
s.platform = :ios, "9.3"
s.source = { :git => "https://github.com/EurekaCommunity/SplitRow.git", :tag => "#{s.version}" }
s.source_files = "SplitRow/**/*.{swift}"
s.frameworks = "UIKit", "Foundation"
Expand Down
16 changes: 8 additions & 8 deletions SplitRow.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@

/* Begin PBXBuildFile section */
148193C2A89A285F9169834D /* Pods_Example.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B7966D658B0381D7985F87C5 /* Pods_Example.framework */; };
2D3360162266338C00FE758F /* Eureka.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7983DCB620B0C50100963F05 /* Eureka.framework */; settings = {ATTRIBUTES = (Required, ); }; };
2DF6C97521C03E6B00B8749E /* Pods__CP__SplitRow.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2DF6C97421C03E6B00B8749E /* Pods__CP__SplitRow.framework */; };
2DF6C97721C03EDF00B8749E /* Eureka.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2DF6C97621C03EDF00B8749E /* Eureka.framework */; settings = {ATTRIBUTES = (Required, ); }; };
750C064FE84DB87B0692EDD4 /* Pods_SplitRowTests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 292265190EEB0208296B082B /* Pods_SplitRowTests.framework */; };
797710781FDAD27100917866 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 797710771FDAD27100917866 /* AppDelegate.swift */; };
7977107A1FDAD27100917866 /* ViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 797710791FDAD27100917866 /* ViewController.swift */; };
Expand Down Expand Up @@ -95,7 +95,7 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
2DF6C97721C03EDF00B8749E /* Eureka.framework in Frameworks */,
2D3360162266338C00FE758F /* Eureka.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand Down Expand Up @@ -595,7 +595,7 @@
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = swiss.mandelkind.Example;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_VERSION = 4.0;
SWIFT_VERSION = 5.0;
TARGETED_DEVICE_FAMILY = "1,2";
};
name = Debug;
Expand All @@ -614,7 +614,7 @@
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = swiss.mandelkind.Example;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_VERSION = 4.0;
SWIFT_VERSION = 5.0;
TARGETED_DEVICE_FAMILY = "1,2";
};
name = Release;
Expand All @@ -641,7 +641,7 @@
PRODUCT_NAME = SplitRow;
SKIP_INSTALL = YES;
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
SWIFT_VERSION = 4.2;
SWIFT_VERSION = 5.0;
TARGETED_DEVICE_FAMILY = "1,2";
};
name = Debug;
Expand All @@ -667,7 +667,7 @@
PRODUCT_BUNDLE_IDENTIFIER = swiss.mandelkind.SplitRow;
PRODUCT_NAME = SplitRow;
SKIP_INSTALL = YES;
SWIFT_VERSION = 4.2;
SWIFT_VERSION = 5.0;
TARGETED_DEVICE_FAMILY = "1,2";
};
name = Release;
Expand Down Expand Up @@ -723,7 +723,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 10.0;
IPHONEOS_DEPLOYMENT_TARGET = 9.3;
MTL_ENABLE_DEBUG_INFO = YES;
ONLY_ACTIVE_ARCH = YES;
SDKROOT = iphoneos;
Expand Down Expand Up @@ -780,7 +780,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 10.0;
IPHONEOS_DEPLOYMENT_TARGET = 9.3;
MTL_ENABLE_DEBUG_INFO = NO;
SDKROOT = iphoneos;
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
Expand Down

0 comments on commit 3358fa8

Please sign in to comment.