Skip to content

Commit

Permalink
Merge pull request #62 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 Sep 26, 2018
2 parents 3edb1c0 + d20fb39 commit ba4f5b8
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 9 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
12 changes: 6 additions & 6 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
osx_image: xcode9.3
osx_image: xcode10
language: objective-c
sudo: required
env:
global:
- PROJECT="Then.xcodeproj"
- SCHEME="Then-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="Then"
matrix:
- SDK="$IOS_SDK" DESTINATION="platform=iOS Simulator,name=iPhone 8,OS=11.3"
- SDK="$IOS_SDK" DESTINATION="platform=iOS Simulator,name=iPhone 8,OS=12.0"
- SDK="$MACOS_SDK" DESTINATION="arch=x86_64"
- SDK="$TVOS_SDK" DESTINATION="OS=11.3,name=Apple TV 4K"
- SDK="$TVOS_SDK" DESTINATION="OS=12.0,name=Apple TV 4K"

install:
- eval "$(curl -sL https://gist.githubusercontent.com/kylef/5c0475ff02b7c7671d2a/raw/9f442512a46d7a2af7b850d65a7e9bd31edfb09b/swiftenv-install.sh)"
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 @@
# Then

![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/Then.svg)](https://cocoapods.org/pods/Then)
[![Build Status](https://travis-ci.org/devxoul/Then.svg?branch=master)](https://travis-ci.org/devxoul/Then)
[![Carthage compatible](https://img.shields.io/badge/Carthage-compatible-4BC51D.svg?style=flat)](https://github.com/Carthage/Carthage)
Expand Down

0 comments on commit ba4f5b8

Please sign in to comment.