Skip to content

Commit 8ec26c7

Browse files
authored
Merge pull request #11 from tattn/swift5
Swift5 support!
2 parents e2d3efc + 6751eb5 commit 8ec26c7

4 files changed

Lines changed: 9 additions & 10 deletions

File tree

.swift-version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
4.2
1+
5.0

.travis.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
language: objective-c
22
os: osx
3-
osx_image: xcode10
3+
osx_image: xcode10.2
44

55
env:
66
global:
@@ -26,7 +26,7 @@ matrix:
2626

2727
script:
2828
- set -o pipefail
29-
- xcodebuild $ACTION -project $PROJECT -scheme $SCHEME -sdk $SDK -destination 'name=iPhone XS,OS=12.0' -configuration $CONFIG ENABLE_TESTABILITY=YES | xcpretty
29+
- xcodebuild $ACTION -project $PROJECT -scheme $SCHEME -sdk $SDK -destination 'name=iPhone XS,OS=12.2' -configuration $CONFIG ENABLE_TESTABILITY=YES | xcpretty
3030

3131
notifications:
3232
email: false

MoreCodable.podspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Pod::Spec.new do |s|
22
s.name = 'MoreCodable'
3-
s.version = '0.2.0'
3+
s.version = '1.0.0'
44
s.summary = 'MoreCodable expands the possibilities of Codable.'
55

66
s.description = <<-DESC

MoreCodable.xcodeproj/project.pbxproj

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -218,12 +218,12 @@
218218
TargetAttributes = {
219219
24A4FF3E20302322001618E1 = {
220220
CreatedOnToolsVersion = 9.2;
221-
LastSwiftMigration = 1000;
221+
LastSwiftMigration = 1020;
222222
ProvisioningStyle = Automatic;
223223
};
224224
24A4FF5320302490001618E1 = {
225225
CreatedOnToolsVersion = 9.2;
226-
LastSwiftMigration = 1000;
226+
LastSwiftMigration = 1020;
227227
ProvisioningStyle = Automatic;
228228
};
229229
};
@@ -234,6 +234,7 @@
234234
hasScannedForEncodings = 0;
235235
knownRegions = (
236236
en,
237+
Base,
237238
);
238239
mainGroup = 24A4FF3520302321001618E1;
239240
productRefGroup = 24A4FF4020302322001618E1 /* Products */;
@@ -370,6 +371,7 @@
370371
SDKROOT = iphoneos;
371372
SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
372373
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
374+
SWIFT_VERSION = 5.0;
373375
VERSIONING_SYSTEM = "apple-generic";
374376
VERSION_INFO_PREFIX = "";
375377
};
@@ -424,6 +426,7 @@
424426
MTL_ENABLE_DEBUG_INFO = NO;
425427
SDKROOT = iphoneos;
426428
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
429+
SWIFT_VERSION = 5.0;
427430
VALIDATE_PRODUCT = YES;
428431
VERSIONING_SYSTEM = "apple-generic";
429432
VERSION_INFO_PREFIX = "";
@@ -447,7 +450,6 @@
447450
PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
448451
SKIP_INSTALL = YES;
449452
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
450-
SWIFT_VERSION = 4.2;
451453
TARGETED_DEVICE_FAMILY = "1,2";
452454
};
453455
name = Debug;
@@ -468,7 +470,6 @@
468470
PRODUCT_BUNDLE_IDENTIFIER = com.github.tattn.MoreCodable;
469471
PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
470472
SKIP_INSTALL = YES;
471-
SWIFT_VERSION = 4.2;
472473
TARGETED_DEVICE_FAMILY = "1,2";
473474
};
474475
name = Release;
@@ -482,7 +483,6 @@
482483
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
483484
PRODUCT_BUNDLE_IDENTIFIER = com.github.tattn.MoreCodableTests;
484485
PRODUCT_NAME = "$(TARGET_NAME)";
485-
SWIFT_VERSION = 4.2;
486486
TARGETED_DEVICE_FAMILY = "1,2";
487487
};
488488
name = Debug;
@@ -496,7 +496,6 @@
496496
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
497497
PRODUCT_BUNDLE_IDENTIFIER = com.github.tattn.MoreCodableTests;
498498
PRODUCT_NAME = "$(TARGET_NAME)";
499-
SWIFT_VERSION = 4.2;
500499
TARGETED_DEVICE_FAMILY = "1,2";
501500
};
502501
name = Release;

0 commit comments

Comments
 (0)