Skip to content

Commit

Permalink
Swift 5 update attempt
Browse files Browse the repository at this point in the history
  • Loading branch information
Mazyod committed Jun 24, 2019
1 parent 8e7cbf1 commit 017225a
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 15 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
14 changes: 3 additions & 11 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,22 +1,14 @@
language: objective-c
osx_image: xcode9.3
osx_image: xcode10.2
env:
global:
- LC_CTYPE=en_US.UTF-8
- LANG=en_US.UTF-8
- WORKSPACE=Notificationz.xcworkspace
- IOS_FRAMEWORK_SCHEME="Notificationz-ios"
- OSX_FRAMEWORK_SCHEME="Notificationz-osx"
- TVOS_FRAMEWORK_SCHEME="Notificationz-tvos"
- WATCHOS_FRAMEWORK_SCHEME="Notificationz-watchos"
- IOS_SDK=iphonesimulator11.3
- OSX_SDK=macosx10.13
- TVOS_SDK=appletvsimulator11.3
- WATCHOS_SDK=watchsimulator4.3
- IOS_SDK=iphonesimulator12.2
matrix:
- DESTINATION="OS=10.1,name=iPhone 6S" SCHEME="$IOS_FRAMEWORK_SCHEME" SDK="$IOS_SDK" RUN_TESTS="YES"
- DESTINATION="OS=11.3,name=iPhone 6S" SCHEME="$IOS_FRAMEWORK_SCHEME" SDK="$IOS_SDK" RUN_TESTS="YES"
- DESTINATION="arch=x86_64" SCHEME="$OSX_FRAMEWORK_SCHEME" SDK="$OSX_SDK" RUN_TESTS="NO"
- DESTINATION="OS=12.2,name=iPhone 6S" SCHEME="$IOS_FRAMEWORK_SCHEME" SDK="$IOS_SDK" RUN_TESTS="YES"
before_install:
- gem install xcpretty --no-rdoc --no-ri --no-document --quiet
script:
Expand Down
5 changes: 3 additions & 2 deletions Notificationz/Notificationz.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -381,6 +381,7 @@
developmentRegion = English;
hasScannedForEncodings = 0;
knownRegions = (
English,
en,
);
mainGroup = 8237429D1BFBAF52001143ED;
Expand Down Expand Up @@ -592,7 +593,7 @@
SDKROOT = iphoneos;
SWIFT_COMPILATION_MODE = singlefile;
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
SWIFT_VERSION = 4.2;
SWIFT_VERSION = 5.0;
TARGETED_DEVICE_FAMILY = "1,2";
VERSIONING_SYSTEM = "apple-generic";
VERSION_INFO_PREFIX = "";
Expand Down Expand Up @@ -645,7 +646,7 @@
SDKROOT = iphoneos;
SWIFT_COMPILATION_MODE = wholemodule;
SWIFT_OPTIMIZATION_LEVEL = "-O";
SWIFT_VERSION = 4.2;
SWIFT_VERSION = 5.0;
TARGETED_DEVICE_FAMILY = "1,2";
VALIDATE_PRODUCT = YES;
VERSIONING_SYSTEM = "apple-generic";
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<a alt="Travis CI" href="https://travis-ci.org/SwiftKitz/Notificationz">
<img alt="Version" src="https://travis-ci.org/SwiftKitz/Notificationz.svg?branch=master" />
</a>
<img alt="Swift" src="https://img.shields.io/badge/swift-4.1-orange.svg" />
<img alt="Swift" src="https://img.shields.io/badge/swift-5.0-orange.svg" />
<img alt="Platforms" src="https://img.shields.io/badge/platform-ios%20%7C%20osx%20%7C%20watchos%20%7C%20tvos-lightgrey.svg" />
<a alt="Carthage Compatible" href="https://github.com/SwiftKitz/Notificationz#carthage">
<img alt="Carthage" src="https://img.shields.io/badge/Carthage-compatible-4BC51D.svg?style=flat" />
Expand Down

0 comments on commit 017225a

Please sign in to comment.