Skip to content

Commit e2a6940

Browse files
authored
Merge pull request #145 from devxoul/swift-5.0
Let's Swift 5.0 🚀
2 parents 1b7a666 + 1e2db5b commit e2a6940

File tree

4 files changed

+6
-12
lines changed

4 files changed

+6
-12
lines changed

.swift-version

Lines changed: 0 additions & 1 deletion
This file was deleted.

.travis.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
os: osx
2-
osx_image: xcode9
2+
osx_image: xcode10.2
33
sudo: false
44
language: objective-c
55

66
env:
7-
- SDK="iphoneos11.0"
7+
- SDK="iphoneos12.2"
88

99
script:
1010
- xcodebuild clean build -sdk $SDK -configuration Debug CODE_SIGN_IDENTITY="" CODE_SIGNING_REQUIRED=NO

README.md

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,12 @@ Toaster
22
=======
33

44
[![Build Status](https://travis-ci.org/devxoul/Toaster.svg?branch=master)](https://travis-ci.org/devxoul/Toaster)
5-
![Swift](https://img.shields.io/badge/Swift-3.0-orange.svg)
5+
![Swift](https://img.shields.io/badge/Swift-5.0-orange.svg)
66
[![CocoaPods](http://img.shields.io/cocoapods/v/Toaster.svg?style=flat)](http://cocoapods.org/?q=name%3AToaster%20author%3Adevxoul)
77
[![Carthage compatible](https://img.shields.io/badge/Carthage-compatible-4BC51D.svg?style=flat)](https://github.com/Carthage/Carthage)
88

99
Android-like toast with very simple interface. (formerly JLToast)
1010

11-
Toaster is written in Swift 3.0. If you're looking for Swift 2 compatible version, see the [JLToast 1.4.2](https://github.com/devxoul/JLToast/tree/1.4.2).
12-
1311

1412
Features
1513
--------

Toaster.xcodeproj/project.pbxproj

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -259,6 +259,7 @@
259259
developmentRegion = English;
260260
hasScannedForEncodings = 0;
261261
knownRegions = (
262+
English,
262263
en,
263264
Base,
264265
);
@@ -408,6 +409,7 @@
408409
ONLY_ACTIVE_ARCH = YES;
409410
SDKROOT = iphoneos;
410411
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
412+
SWIFT_VERSION = 5.0;
411413
TARGETED_DEVICE_FAMILY = "1,2";
412414
VERSIONING_SYSTEM = "apple-generic";
413415
VERSION_INFO_PREFIX = "";
@@ -458,6 +460,7 @@
458460
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
459461
MTL_ENABLE_DEBUG_INFO = NO;
460462
SDKROOT = iphoneos;
463+
SWIFT_VERSION = 5.0;
461464
TARGETED_DEVICE_FAMILY = "1,2";
462465
VALIDATE_PRODUCT = YES;
463466
VERSIONING_SYSTEM = "apple-generic";
@@ -482,7 +485,6 @@
482485
PRODUCT_NAME = "$(TARGET_NAME)";
483486
SKIP_INSTALL = YES;
484487
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
485-
SWIFT_VERSION = 4.0;
486488
};
487489
name = Debug;
488490
};
@@ -503,7 +505,6 @@
503505
PRODUCT_NAME = "$(TARGET_NAME)";
504506
SKIP_INSTALL = YES;
505507
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
506-
SWIFT_VERSION = 4.0;
507508
};
508509
name = Release;
509510
};
@@ -517,7 +518,6 @@
517518
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
518519
PRODUCT_BUNDLE_IDENTIFIER = kr.xoul.ToasterDemo;
519520
PRODUCT_NAME = "$(TARGET_NAME)";
520-
SWIFT_VERSION = 4.0;
521521
};
522522
name = Debug;
523523
};
@@ -532,7 +532,6 @@
532532
PRODUCT_BUNDLE_IDENTIFIER = kr.xoul.ToasterDemo;
533533
PRODUCT_NAME = "$(TARGET_NAME)";
534534
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
535-
SWIFT_VERSION = 4.0;
536535
};
537536
name = Release;
538537
};
@@ -553,7 +552,6 @@
553552
PRODUCT_BUNDLE_IDENTIFIER = com.loisdiqual.ToasterTests;
554553
PRODUCT_NAME = "$(TARGET_NAME)";
555554
SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
556-
SWIFT_VERSION = 4.0;
557555
TARGETED_DEVICE_FAMILY = "1,2";
558556
};
559557
name = Debug;
@@ -575,7 +573,6 @@
575573
PRODUCT_BUNDLE_IDENTIFIER = com.loisdiqual.ToasterTests;
576574
PRODUCT_NAME = "$(TARGET_NAME)";
577575
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
578-
SWIFT_VERSION = 4.0;
579576
TARGETED_DEVICE_FAMILY = "1,2";
580577
};
581578
name = Release;

0 commit comments

Comments
 (0)