Skip to content

Commit

Permalink
Merge pull request #1798 from xmartlabs/swift5
Browse files Browse the repository at this point in the history
Updates for Swift 5
  • Loading branch information
mtnbarreto committed Apr 1, 2019
2 parents 54e2caf + c9893bc commit 3cdd6d3
Show file tree
Hide file tree
Showing 35 changed files with 116 additions and 117 deletions.
2 changes: 1 addition & 1 deletion .swift-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
4.2
5.0
10 changes: 6 additions & 4 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,12 +1,14 @@
language: objective-c
osx_image: xcode10.1
osx_image: xcode10.2
branches:
only:
- master
env:
- DESTINATION="OS=11.3,name=iPhone 8" SCHEME="Eureka" SDK=iphonesimulator
- DESTINATION="OS=12.2,name=iPhone XS" SCHEME="Eureka" SDK=iphonesimulator
before_install:
- gem install xcpretty --no-rdoc --no-ri --no-document --quiet
- brew update
- brew outdated carthage || brew upgrade carthage
script:
- set -o pipefail
- xcodebuild -version
- xcodebuild -project Eureka.xcodeproj -scheme "$SCHEME" -sdk "$SDK" -destination "$DESTINATION" -configuration Debug ONLY_ACTIVE_ARCH=NO test | xcpretty -c
- xcodebuild -project Eureka.xcodeproj -scheme "$SCHEME" -sdk "$SDK" -destination "$DESTINATION" -configuration Debug ONLY_ACTIVE_ARCH=NO test | xcpretty
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,11 @@
# Change Log
All notable changes to this project will be documented in this file.

### [5.0.0](https://github.com/xmartlabs/Eureka/releases/tag/5.0.0)

* Bug fixes and stability improvements
* iOS deployment target increased to iOS9.3

### [4.3.1](https://github.com/xmartlabs/Eureka/releases/tag/4.3.1)

* Bug fixes and stability improvements
Expand Down
2 changes: 1 addition & 1 deletion Eureka.playground/contents.xcplayground
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<playground version='5.0' target-platform='ios' auto-termination-delay='20' display-mode='rendered' executeOnSourceChanges='false' timelineScrubberEnabled='true' last-migration='0900'>
<playground version='5.0' target-platform='ios' auto-termination-delay='20' display-mode='rendered' timelineScrubberEnabled='true' last-migration='1020'>
<timeline fileName='timeline.xctimeline'/>
</playground>
28 changes: 14 additions & 14 deletions Eureka.playground/timeline.xctimeline
Original file line number Diff line number Diff line change
Expand Up @@ -3,82 +3,82 @@
version = "3.0">
<TimelineItems>
<LoggerValueHistoryTimelineItem
documentLocation = "file:///Users/barreto/Development/iOS/OpenSource/Eureka/Eureka.playground#CharacterRangeLen=19&amp;CharacterRangeLoc=734&amp;EndingColumnNumber=19&amp;EndingLineNumber=26&amp;StartingColumnNumber=0&amp;StartingLineNumber=26&amp;Timestamp=521572280.074264"
documentLocation = "file:///Users/barreto/Development/iOS/opensource/Eureka/Eureka.playground#CharacterRangeLen=19&amp;CharacterRangeLoc=734&amp;EndingColumnNumber=19&amp;EndingLineNumber=26&amp;StartingColumnNumber=0&amp;StartingLineNumber=26&amp;Timestamp=575824644.159923"
lockedSize = "{1063, 340}"
selectedRepresentationIndex = "0"
shouldTrackSuperviewWidth = "NO">
</LoggerValueHistoryTimelineItem>
<LoggerValueHistoryTimelineItem
documentLocation = "file:///Users/barreto/Development/iOS/OpenSource/Eureka/Eureka.playground#CharacterRangeLen=19&amp;CharacterRangeLoc=1253&amp;EndingColumnNumber=31&amp;EndingLineNumber=32&amp;StartingColumnNumber=12&amp;StartingLineNumber=32&amp;Timestamp=521572280.074493"
documentLocation = "file:///Users/barreto/Development/iOS/opensource/Eureka/Eureka.playground#CharacterRangeLen=19&amp;CharacterRangeLoc=1253&amp;EndingColumnNumber=31&amp;EndingLineNumber=32&amp;StartingColumnNumber=12&amp;StartingLineNumber=32&amp;Timestamp=575824644.160043"
lockedSize = "{322, 325}"
selectedRepresentationIndex = "0"
shouldTrackSuperviewWidth = "NO">
</LoggerValueHistoryTimelineItem>
<LoggerValueHistoryTimelineItem
documentLocation = "file:///Users/barreto/Development/iOS/OpenSource/Eureka/Eureka.playground#CharacterRangeLen=9&amp;CharacterRangeLoc=1567&amp;EndingColumnNumber=24&amp;EndingLineNumber=38&amp;StartingColumnNumber=15&amp;StartingLineNumber=38&amp;Timestamp=521572280.074669"
documentLocation = "file:///Users/barreto/Development/iOS/opensource/Eureka/Eureka.playground#CharacterRangeLen=9&amp;CharacterRangeLoc=1567&amp;EndingColumnNumber=24&amp;EndingLineNumber=38&amp;StartingColumnNumber=15&amp;StartingLineNumber=38&amp;Timestamp=575824644.160136"
lockedSize = "{328, 416}"
selectedRepresentationIndex = "0"
shouldTrackSuperviewWidth = "NO">
</LoggerValueHistoryTimelineItem>
<LoggerValueHistoryTimelineItem
documentLocation = "file:///Users/barreto/Development/iOS/OpenSource/Eureka/Eureka.playground#CharacterRangeLen=19&amp;CharacterRangeLoc=1373&amp;EndingColumnNumber=151&amp;EndingLineNumber=32&amp;StartingColumnNumber=132&amp;StartingLineNumber=32&amp;Timestamp=521572280.074829"
documentLocation = "file:///Users/barreto/Development/iOS/opensource/Eureka/Eureka.playground#CharacterRangeLen=19&amp;CharacterRangeLoc=1373&amp;EndingColumnNumber=151&amp;EndingLineNumber=32&amp;StartingColumnNumber=132&amp;StartingLineNumber=32&amp;Timestamp=575824644.160224"
lockedSize = "{395, 526}"
selectedRepresentationIndex = "0"
shouldTrackSuperviewWidth = "NO">
</LoggerValueHistoryTimelineItem>
<LoggerValueHistoryTimelineItem
documentLocation = "file:///Users/barreto/Development/iOS/OpenSource/Eureka/Eureka.playground#CharacterRangeLen=0&amp;CharacterRangeLoc=3649&amp;EndingColumnNumber=12&amp;EndingLineNumber=77&amp;StartingColumnNumber=12&amp;StartingLineNumber=77&amp;Timestamp=521572280.074987"
documentLocation = "file:///Users/barreto/Development/iOS/opensource/Eureka/Eureka.playground#CharacterRangeLen=0&amp;CharacterRangeLoc=3649&amp;EndingColumnNumber=12&amp;EndingLineNumber=77&amp;StartingColumnNumber=12&amp;StartingLineNumber=77&amp;Timestamp=575824644.160311"
lockedSize = "{354, 450}"
selectedRepresentationIndex = "0"
shouldTrackSuperviewWidth = "NO">
</LoggerValueHistoryTimelineItem>
<LoggerValueHistoryTimelineItem
documentLocation = "file:///Users/barreto/Development/iOS/OpenSource/Eureka/Eureka.playground#CharacterRangeLen=0&amp;CharacterRangeLoc=1598&amp;EndingColumnNumber=1&amp;EndingLineNumber=39&amp;StartingColumnNumber=1&amp;StartingLineNumber=39&amp;Timestamp=521572280.075139"
documentLocation = "file:///Users/barreto/Development/iOS/opensource/Eureka/Eureka.playground#CharacterRangeLen=90&amp;CharacterRangeLoc=1598&amp;EndingColumnNumber=0&amp;EndingLineNumber=40&amp;StartingColumnNumber=1&amp;StartingLineNumber=39&amp;Timestamp=575824644.160396"
lockedSize = "{453, 531}"
selectedRepresentationIndex = "0"
shouldTrackSuperviewWidth = "NO">
</LoggerValueHistoryTimelineItem>
<LoggerValueHistoryTimelineItem
documentLocation = "file:///Users/barreto/Development/iOS/OpenSource/Eureka/Eureka.playground#CharacterRangeLen=0&amp;CharacterRangeLoc=152&amp;EndingColumnNumber=9&amp;EndingLineNumber=3&amp;StartingColumnNumber=9&amp;StartingLineNumber=3&amp;Timestamp=521572280.075305"
documentLocation = "file:///Users/barreto/Development/iOS/opensource/Eureka/Eureka.playground#CharacterRangeLen=0&amp;CharacterRangeLoc=152&amp;EndingColumnNumber=9&amp;EndingLineNumber=3&amp;StartingColumnNumber=9&amp;StartingLineNumber=3&amp;Timestamp=575824644.160482"
selectedRepresentationIndex = "0"
shouldTrackSuperviewWidth = "NO">
</LoggerValueHistoryTimelineItem>
<LoggerValueHistoryTimelineItem
documentLocation = "file:///Users/barreto/Development/iOS/OpenSource/Eureka/Eureka.playground#CharacterRangeLen=0&amp;CharacterRangeLoc=1641&amp;EndingColumnNumber=44&amp;EndingLineNumber=39&amp;StartingColumnNumber=44&amp;StartingLineNumber=39&amp;Timestamp=521572280.07545"
documentLocation = "file:///Users/barreto/Development/iOS/opensource/Eureka/Eureka.playground#CharacterRangeLen=0&amp;CharacterRangeLoc=1641&amp;EndingColumnNumber=44&amp;EndingLineNumber=39&amp;StartingColumnNumber=44&amp;StartingLineNumber=39&amp;Timestamp=575824644.160576"
lockedSize = "{566, 773}"
selectedRepresentationIndex = "0"
shouldTrackSuperviewWidth = "NO">
</LoggerValueHistoryTimelineItem>
<LoggerValueHistoryTimelineItem
documentLocation = "file:///Users/barreto/Development/iOS/OpenSource/Eureka/Eureka.playground#CharacterRangeLen=19&amp;CharacterRangeLoc=988&amp;EndingColumnNumber=88&amp;EndingLineNumber=28&amp;StartingColumnNumber=69&amp;StartingLineNumber=28&amp;Timestamp=521572280.075608"
documentLocation = "file:///Users/barreto/Development/iOS/opensource/Eureka/Eureka.playground#CharacterRangeLen=19&amp;CharacterRangeLoc=988&amp;EndingColumnNumber=88&amp;EndingLineNumber=28&amp;StartingColumnNumber=69&amp;StartingLineNumber=28&amp;Timestamp=575824644.160663"
lockedSize = "{177, 169}"
selectedRepresentationIndex = "0"
shouldTrackSuperviewWidth = "NO">
</LoggerValueHistoryTimelineItem>
<LoggerValueHistoryTimelineItem
documentLocation = "file:///Users/barreto/Development/iOS/OpenSource/Eureka/Eureka.playground#CharacterRangeLen=19&amp;CharacterRangeLoc=1621&amp;EndingColumnNumber=43&amp;EndingLineNumber=39&amp;StartingColumnNumber=24&amp;StartingLineNumber=39&amp;Timestamp=521572280.075747"
documentLocation = "file:///Users/barreto/Development/iOS/opensource/Eureka/Eureka.playground#CharacterRangeLen=19&amp;CharacterRangeLoc=1621&amp;EndingColumnNumber=43&amp;EndingLineNumber=39&amp;StartingColumnNumber=24&amp;StartingLineNumber=39&amp;Timestamp=575824644.160761"
selectedRepresentationIndex = "0"
shouldTrackSuperviewWidth = "NO">
</LoggerValueHistoryTimelineItem>
<LoggerValueHistoryTimelineItem
documentLocation = "file:///Users/barreto/Development/iOS/OpenSource/Eureka/Eureka.playground#CharacterRangeLen=19&amp;CharacterRangeLoc=1057&amp;EndingColumnNumber=157&amp;EndingLineNumber=28&amp;StartingColumnNumber=138&amp;StartingLineNumber=28&amp;Timestamp=521572280.075879"
documentLocation = "file:///Users/barreto/Development/iOS/opensource/Eureka/Eureka.playground#CharacterRangeLen=19&amp;CharacterRangeLoc=1057&amp;EndingColumnNumber=157&amp;EndingLineNumber=28&amp;StartingColumnNumber=138&amp;StartingLineNumber=28&amp;Timestamp=575824644.1608551"
selectedRepresentationIndex = "0"
shouldTrackSuperviewWidth = "NO">
</LoggerValueHistoryTimelineItem>
<LoggerValueHistoryTimelineItem
documentLocation = "file:///Users/barreto/Development/iOS/OpenSource/Eureka/Eureka.playground#CharacterRangeLen=19&amp;CharacterRangeLoc=2259&amp;EndingColumnNumber=103&amp;EndingLineNumber=50&amp;StartingColumnNumber=84&amp;StartingLineNumber=50&amp;Timestamp=521572280.076019"
documentLocation = "file:///Users/barreto/Development/iOS/opensource/Eureka/Eureka.playground#CharacterRangeLen=19&amp;CharacterRangeLoc=2259&amp;EndingColumnNumber=103&amp;EndingLineNumber=50&amp;StartingColumnNumber=84&amp;StartingLineNumber=50&amp;Timestamp=575824644.160948"
lockedSize = "{298, 389}"
selectedRepresentationIndex = "0"
shouldTrackSuperviewWidth = "NO">
</LoggerValueHistoryTimelineItem>
<LoggerValueHistoryTimelineItem
documentLocation = "file:///Users/barreto/Development/iOS/OpenSource/Eureka/Eureka.playground#CharacterRangeLen=19&amp;CharacterRangeLoc=1870&amp;EndingColumnNumber=21&amp;EndingLineNumber=43&amp;StartingColumnNumber=2&amp;StartingLineNumber=43&amp;Timestamp=521572280.076187"
documentLocation = "file:///Users/barreto/Development/iOS/opensource/Eureka/Eureka.playground#CharacterRangeLen=19&amp;CharacterRangeLoc=1870&amp;EndingColumnNumber=21&amp;EndingLineNumber=43&amp;StartingColumnNumber=2&amp;StartingLineNumber=43&amp;Timestamp=575824644.161056"
lockedSize = "{475, 564}"
selectedRepresentationIndex = "0"
shouldTrackSuperviewWidth = "NO">
</LoggerValueHistoryTimelineItem>
<LoggerValueHistoryTimelineItem
documentLocation = "file:///Users/barreto/Development/iOS/OpenSource/Eureka/Eureka.playground#CharacterRangeLen=19&amp;CharacterRangeLoc=1790&amp;EndingColumnNumber=5&amp;EndingLineNumber=42&amp;StartingColumnNumber=101&amp;StartingLineNumber=41&amp;Timestamp=521572280.07635"
documentLocation = "file:///Users/barreto/Development/iOS/opensource/Eureka/Eureka.playground#CharacterRangeLen=19&amp;CharacterRangeLoc=1790&amp;EndingColumnNumber=5&amp;EndingLineNumber=42&amp;StartingColumnNumber=101&amp;StartingLineNumber=41&amp;Timestamp=575824644.161153"
lockedSize = "{397, 516}"
selectedRepresentationIndex = "0"
shouldTrackSuperviewWidth = "NO">
Expand Down
6 changes: 3 additions & 3 deletions Eureka.podspec
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
Pod::Spec.new do |s|
s.name = 'Eureka'
s.version = '4.3.1'
s.version = '5.0.0'
s.license = 'MIT'
s.summary = 'Elegant iOS Forms in pure Swift'
s.homepage = 'https://github.com/xmartlabs/Eureka'
s.social_media_url = 'http://twitter.com/xmartlabs'
s.authors = { 'Martin Barreto' => 'martin@xmartlabs.com', 'Mathias Claassen' => 'mathias@xmartlabs.com' }
s.source = { :git => 'https://github.com/xmartlabs/Eureka.git', :tag => s.version }
s.ios.deployment_target = '8.0'
s.ios.deployment_target = '9.3'
s.ios.frameworks = 'UIKit', 'Foundation'
s.source_files = 'Source/**/*.swift'
s.resources = 'Source/Resources/Eureka.bundle'
s.requires_arc = true
s.swift_version = '4.2'
s.swift_version = '5.0'
end
25 changes: 13 additions & 12 deletions Eureka.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -451,27 +451,28 @@
isa = PBXProject;
attributes = {
LastSwiftUpdateCheck = 0700;
LastUpgradeCheck = 0930;
LastUpgradeCheck = 1020;
ORGANIZATIONNAME = Xmartlabs;
TargetAttributes = {
51729DEA1B9A4F5E004A00EB = {
CreatedOnToolsVersion = 7.0;
LastSwiftMigration = 0900;
LastSwiftMigration = 1020;
ProvisioningStyle = Automatic;
};
51729DF41B9A4F5E004A00EB = {
CreatedOnToolsVersion = 7.0;
LastSwiftMigration = 1000;
LastSwiftMigration = 1020;
ProvisioningStyle = Automatic;
};
};
};
buildConfigurationList = 51729DE51B9A4F5E004A00EB /* Build configuration list for PBXProject "Eureka" */;
compatibilityVersion = "Xcode 3.2";
developmentRegion = English;
developmentRegion = en;
hasScannedForEncodings = 0;
knownRegions = (
en,
Base,
);
mainGroup = 51729DE11B9A4F5E004A00EB;
productRefGroup = 51729DEC1B9A4F5E004A00EB /* Products */;
Expand Down Expand Up @@ -615,6 +616,7 @@
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
CLANG_CXX_LIBRARY = "libc++";
CLANG_ENABLE_MODULES = YES;
Expand Down Expand Up @@ -658,7 +660,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
IPHONEOS_DEPLOYMENT_TARGET = 9.3;
MTL_ENABLE_DEBUG_INFO = YES;
ONLY_ACTIVE_ARCH = YES;
SDKROOT = iphoneos;
Expand All @@ -674,6 +676,7 @@
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
CLANG_CXX_LIBRARY = "libc++";
CLANG_ENABLE_MODULES = YES;
Expand Down Expand Up @@ -711,7 +714,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
IPHONEOS_DEPLOYMENT_TARGET = 9.3;
MTL_ENABLE_DEBUG_INFO = NO;
SDKROOT = iphoneos;
SWIFT_SWIFT3_OBJC_INFERENCE = Off;
Expand Down Expand Up @@ -741,8 +744,7 @@
PRODUCT_NAME = "$(TARGET_NAME)";
SKIP_INSTALL = YES;
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
SWIFT_SWIFT3_OBJC_INFERENCE = Off;
SWIFT_VERSION = 4.2;
SWIFT_VERSION = 5.0;
};
name = Debug;
};
Expand All @@ -765,8 +767,7 @@
PRODUCT_NAME = "$(TARGET_NAME)";
SKIP_INSTALL = YES;
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
SWIFT_SWIFT3_OBJC_INFERENCE = Off;
SWIFT_VERSION = 4.2;
SWIFT_VERSION = 5.0;
};
name = Release;
};
Expand All @@ -781,7 +782,7 @@
PRODUCT_BUNDLE_IDENTIFIER = com.xmartlabs.EurekaTests;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
SWIFT_VERSION = 4.2;
SWIFT_VERSION = 5.0;
};
name = Debug;
};
Expand All @@ -797,7 +798,7 @@
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
SWIFT_VERSION = 4.2;
SWIFT_VERSION = 5.0;
};
name = Release;
};
Expand Down
2 changes: 1 addition & 1 deletion Eureka.xcodeproj/xcshareddata/xcschemes/Eureka.xcscheme
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "0930"
LastUpgradeVersion = "1020"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand Down

0 comments on commit 3cdd6d3

Please sign in to comment.