Skip to content

Commit

Permalink
Merge pull request devxoul#7 from murselturk/swift4.2
Browse files Browse the repository at this point in the history
Use Xcode 10 and Swift 4.2
  • Loading branch information
devxoul authored Oct 31, 2018
2 parents 62affe2 + b05a613 commit 095ab81
Show file tree
Hide file tree
Showing 6 changed files with 14 additions and 14 deletions.
2 changes: 1 addition & 1 deletion .swift-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
4.1
4.2
10 changes: 5 additions & 5 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
osx_image: xcode9.3
osx_image: xcode10
language: objective-c
sudo: required
env:
global:
- PROJECT="ReusableKit.xcodeproj"
- SCHEME="ReusableKit-Package"
- IOS_SDK="iphonesimulator11.3"
- MACOS_SDK="macosx10.13"
- TVOS_SDK="appletvsimulator11.3"
- IOS_SDK="iphonesimulator12.0"
- MACOS_SDK="macosx10.14"
- TVOS_SDK="appletvsimulator12.0"
- FRAMEWORK="ReusableKit"
matrix:
- SDK="$IOS_SDK" DESTINATION="platform=iOS Simulator,name=iPhone 8,OS=11.3"
- SDK="$IOS_SDK" DESTINATION="platform=iOS Simulator,name=iPhone XS,OS=12.0"

install:
- eval "$(curl -sL https://gist.githubusercontent.com/kylef/5c0475ff02b7c7671d2a/raw/9f442512a46d7a2af7b850d65a7e9bd31edfb09b/swiftenv-install.sh)"
Expand Down
4 changes: 2 additions & 2 deletions Package.resolved
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
"repositoryURL": "https://github.com/ReactiveX/RxSwift.git",
"state": {
"branch": null,
"revision": "faeb158ce76d355f3f9242fdd0258a9face62f37",
"version": "4.2.0"
"revision": "0df62b4d562f8620d4b795b18e4adf0b631527a1",
"version": "4.3.1"
}
}
]
Expand Down
2 changes: 1 addition & 1 deletion Package.swift
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// swift-tools-version:4.0
// swift-tools-version:4.2

import PackageDescription

Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# ReusableKit

![Swift](https://img.shields.io/badge/Swift-4.1-orange.svg)
![Swift](https://img.shields.io/badge/Swift-4.2-orange.svg)
[![CocoaPods](http://img.shields.io/cocoapods/v/ReusableKit.svg)](https://cocoapods.org/pods/ReusableKit)
[![Build Status](https://travis-ci.org/devxoul/ReusableKit.svg)](https://travis-ci.org/devxoul/ReusableKit)
[![Codecov](https://img.shields.io/codecov/c/github/devxoul/ReusableKit.svg)](https://codecov.io/gh/devxoul/ReusableKit)
Expand Down
8 changes: 4 additions & 4 deletions Sources/ReusableKit/UICollectionView+ReusableKit.swift
Original file line number Diff line number Diff line change
Expand Up @@ -7,16 +7,16 @@ public enum SupplementaryViewKind: String {

public init?(rawValue: String) {
switch rawValue {
case UICollectionElementKindSectionHeader: self = .header
case UICollectionElementKindSectionFooter: self = .footer
case UICollectionView.elementKindSectionHeader: self = .header
case UICollectionView.elementKindSectionFooter: self = .footer
default: return nil
}
}

public var rawValue: String {
switch self {
case .header: return UICollectionElementKindSectionHeader
case .footer: return UICollectionElementKindSectionFooter
case .header: return UICollectionView.elementKindSectionHeader
case .footer: return UICollectionView.elementKindSectionFooter
}
}
}
Expand Down

0 comments on commit 095ab81

Please sign in to comment.