Skip to content
This repository was archived by the owner on Mar 10, 2022. It is now read-only.

Commit a51930d

Browse files
author
Jakob Mygind
authored
Merge pull request #22 from nodes-ios/swift4_2update
Update to swift4.2
2 parents 6e27c29 + 3a74e68 commit a51930d

4 files changed

Lines changed: 48 additions & 16 deletions

File tree

‎.travis.yml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
language: swift
2-
osx_image: xcode8.1
2+
osx_image: xcode10.1
33
branches:
44
only:
55
- master
@@ -9,10 +9,10 @@ env:
99
- PROJECT_NAME="Noted.xcodeproj"
1010
- IOS_FRAMEWORK_SCHEME="Noted"
1111

12-
- IOS_SDK=iphonesimulator10.1
13-
12+
- IOS_SDK=iphonesimulator12.1
13+
1414
matrix:
15-
- DESTINATION="OS=10.1,name=iPhone 6S Plus" SCHEME="$IOS_FRAMEWORK_SCHEME" SDK="$IOS_SDK" RUN_TESTS="YES"
15+
- DESTINATION="OS=12.1,name=iPhone 6S Plus" SCHEME="$IOS_FRAMEWORK_SCHEME" SDK="$IOS_SDK" RUN_TESTS="YES"
1616

1717
script:
1818
- set -o pipefail
@@ -26,4 +26,4 @@ script:
2626

2727
- xcodebuild -project "$PROJECT_NAME" -scheme "$SCHEME" -sdk "$SDK" -destination "$DESTINATION" -configuration Release ONLY_ACTIVE_ARCH=NO build | xcpretty;
2828
after_success:
29-
- bash <(curl -s https://codecov.io/bash)
29+
- bash <(curl -s https://codecov.io/bash)

‎Noted.xcodeproj/project.pbxproj‎

Lines changed: 40 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -188,16 +188,19 @@
188188
isa = PBXProject;
189189
attributes = {
190190
LastSwiftUpdateCheck = 0720;
191-
LastUpgradeCheck = 0800;
191+
LastUpgradeCheck = 1010;
192192
ORGANIZATIONNAME = Nodes;
193193
TargetAttributes = {
194194
272F1E111C6A4A250098F620 = {
195195
CreatedOnToolsVersion = 7.2.1;
196-
LastSwiftMigration = 0800;
196+
DevelopmentTeam = M92A6H7EPZ;
197+
LastSwiftMigration = 1010;
198+
ProvisioningStyle = Automatic;
197199
};
198200
272F1E1B1C6A4A250098F620 = {
199201
CreatedOnToolsVersion = 7.2.1;
200-
LastSwiftMigration = 0800;
202+
DevelopmentTeam = M92A6H7EPZ;
203+
LastSwiftMigration = 1010;
201204
};
202205
};
203206
};
@@ -278,14 +281,22 @@
278281
CLANG_CXX_LIBRARY = "libc++";
279282
CLANG_ENABLE_MODULES = YES;
280283
CLANG_ENABLE_OBJC_ARC = YES;
284+
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
281285
CLANG_WARN_BOOL_CONVERSION = YES;
286+
CLANG_WARN_COMMA = YES;
282287
CLANG_WARN_CONSTANT_CONVERSION = YES;
288+
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
283289
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
284290
CLANG_WARN_EMPTY_BODY = YES;
285291
CLANG_WARN_ENUM_CONVERSION = YES;
286292
CLANG_WARN_INFINITE_RECURSION = YES;
287293
CLANG_WARN_INT_CONVERSION = YES;
294+
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
295+
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
296+
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
288297
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
298+
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
299+
CLANG_WARN_STRICT_PROTOTYPES = YES;
289300
CLANG_WARN_SUSPICIOUS_MOVE = YES;
290301
CLANG_WARN_UNREACHABLE_CODE = YES;
291302
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
@@ -328,14 +339,22 @@
328339
CLANG_CXX_LIBRARY = "libc++";
329340
CLANG_ENABLE_MODULES = YES;
330341
CLANG_ENABLE_OBJC_ARC = YES;
342+
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
331343
CLANG_WARN_BOOL_CONVERSION = YES;
344+
CLANG_WARN_COMMA = YES;
332345
CLANG_WARN_CONSTANT_CONVERSION = YES;
346+
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
333347
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
334348
CLANG_WARN_EMPTY_BODY = YES;
335349
CLANG_WARN_ENUM_CONVERSION = YES;
336350
CLANG_WARN_INFINITE_RECURSION = YES;
337351
CLANG_WARN_INT_CONVERSION = YES;
352+
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
353+
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
354+
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
338355
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
356+
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
357+
CLANG_WARN_STRICT_PROTOTYPES = YES;
339358
CLANG_WARN_SUSPICIOUS_MOVE = YES;
340359
CLANG_WARN_UNREACHABLE_CODE = YES;
341360
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
@@ -369,8 +388,11 @@
369388
buildSettings = {
370389
APPLICATION_EXTENSION_API_ONLY = YES;
371390
CLANG_ENABLE_MODULES = YES;
391+
CODE_SIGN_IDENTITY = "iPhone Developer";
372392
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
393+
CODE_SIGN_STYLE = Automatic;
373394
DEFINES_MODULE = YES;
395+
DEVELOPMENT_TEAM = M92A6H7EPZ;
374396
DYLIB_COMPATIBILITY_VERSION = 1;
375397
DYLIB_CURRENT_VERSION = 1;
376398
DYLIB_INSTALL_NAME_BASE = "@rpath";
@@ -380,9 +402,11 @@
380402
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
381403
PRODUCT_BUNDLE_IDENTIFIER = com.nodes.Noted;
382404
PRODUCT_NAME = "$(TARGET_NAME)";
405+
PROVISIONING_PROFILE_SPECIFIER = "";
383406
SKIP_INSTALL = YES;
384407
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
385-
SWIFT_VERSION = 3.0;
408+
SWIFT_SWIFT3_OBJC_INFERENCE = Default;
409+
SWIFT_VERSION = 4.2;
386410
};
387411
name = Debug;
388412
};
@@ -391,8 +415,11 @@
391415
buildSettings = {
392416
APPLICATION_EXTENSION_API_ONLY = YES;
393417
CLANG_ENABLE_MODULES = YES;
418+
CODE_SIGN_IDENTITY = "iPhone Developer";
394419
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
420+
CODE_SIGN_STYLE = Automatic;
395421
DEFINES_MODULE = YES;
422+
DEVELOPMENT_TEAM = M92A6H7EPZ;
396423
DYLIB_COMPATIBILITY_VERSION = 1;
397424
DYLIB_CURRENT_VERSION = 1;
398425
DYLIB_INSTALL_NAME_BASE = "@rpath";
@@ -402,32 +429,38 @@
402429
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
403430
PRODUCT_BUNDLE_IDENTIFIER = com.nodes.Noted;
404431
PRODUCT_NAME = "$(TARGET_NAME)";
432+
PROVISIONING_PROFILE_SPECIFIER = "";
405433
SKIP_INSTALL = YES;
406-
SWIFT_VERSION = 3.0;
434+
SWIFT_SWIFT3_OBJC_INFERENCE = Default;
435+
SWIFT_VERSION = 4.2;
407436
};
408437
name = Release;
409438
};
410439
272F1E2A1C6A4A250098F620 /* Debug */ = {
411440
isa = XCBuildConfiguration;
412441
buildSettings = {
413442
CLANG_ENABLE_CODE_COVERAGE = NO;
443+
DEVELOPMENT_TEAM = M92A6H7EPZ;
414444
INFOPLIST_FILE = NotedTests/Info.plist;
415445
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
416446
PRODUCT_BUNDLE_IDENTIFIER = com.nodes.NotedTests;
417447
PRODUCT_NAME = "$(TARGET_NAME)";
418-
SWIFT_VERSION = 3.0;
448+
SWIFT_SWIFT3_OBJC_INFERENCE = Default;
449+
SWIFT_VERSION = 4.2;
419450
};
420451
name = Debug;
421452
};
422453
272F1E2B1C6A4A250098F620 /* Release */ = {
423454
isa = XCBuildConfiguration;
424455
buildSettings = {
425456
CLANG_ENABLE_CODE_COVERAGE = NO;
457+
DEVELOPMENT_TEAM = M92A6H7EPZ;
426458
INFOPLIST_FILE = NotedTests/Info.plist;
427459
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
428460
PRODUCT_BUNDLE_IDENTIFIER = com.nodes.NotedTests;
429461
PRODUCT_NAME = "$(TARGET_NAME)";
430-
SWIFT_VERSION = 3.0;
462+
SWIFT_SWIFT3_OBJC_INFERENCE = Default;
463+
SWIFT_VERSION = 4.2;
431464
};
432465
name = Release;
433466
};

‎Noted.xcodeproj/xcshareddata/xcschemes/Noted.xcscheme‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "0800"
3+
LastUpgradeVersion = "1010"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"
@@ -26,8 +26,7 @@
2626
buildConfiguration = "Debug"
2727
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
2828
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
29-
shouldUseLaunchSchemeArgsEnv = "YES"
30-
codeCoverageEnabled = "NO">
29+
shouldUseLaunchSchemeArgsEnv = "YES">
3130
<Testables>
3231
<TestableReference
3332
skipped = "NO">

‎Noted/Classes/Noted.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ public class Noted {
2121
notedQueue.sync {
2222
values = self._observers.allObjects
2323
}
24-
return values.flatMap({ $0 as? NoteObserver })
24+
return values.compactMap({ $0 as? NoteObserver })
2525
}
2626

2727
public init() {}

0 commit comments

Comments
 (0)