Skip to content

Commit 86e3f61

Browse files
author
Pavel Sharanda
committed
Xcode 10.2 and Swift 5 support
1 parent bb96aee commit 86e3f61

File tree

7 files changed

+17
-24
lines changed

7 files changed

+17
-24
lines changed

‎Easing.xcodeproj/project.pbxproj‎

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -347,45 +347,46 @@
347347
isa = PBXProject;
348348
attributes = {
349349
LastSwiftUpdateCheck = 0720;
350-
LastUpgradeCheck = 0930;
350+
LastUpgradeCheck = 1020;
351351
ORGANIZATIONNAME = Easing;
352352
TargetAttributes = {
353353
52D6D97B1BEFF229002C0205 = {
354354
CreatedOnToolsVersion = 7.1;
355-
LastSwiftMigration = 1000;
355+
LastSwiftMigration = 1020;
356356
};
357357
52D6D9851BEFF229002C0205 = {
358358
CreatedOnToolsVersion = 7.1;
359-
LastSwiftMigration = 1000;
359+
LastSwiftMigration = 1020;
360360
};
361361
52D6D9E11BEFFF6E002C0205 = {
362362
CreatedOnToolsVersion = 7.1;
363-
LastSwiftMigration = 1000;
363+
LastSwiftMigration = 1020;
364364
};
365365
52D6D9EF1BEFFFBE002C0205 = {
366366
CreatedOnToolsVersion = 7.1;
367-
LastSwiftMigration = 1000;
367+
LastSwiftMigration = 1020;
368368
};
369369
52D6DA0E1BF000BD002C0205 = {
370370
CreatedOnToolsVersion = 7.1;
371-
LastSwiftMigration = 1000;
371+
LastSwiftMigration = 1020;
372372
};
373373
DD7502791C68FCFC006590AF = {
374374
CreatedOnToolsVersion = 7.2.1;
375-
LastSwiftMigration = 1000;
375+
LastSwiftMigration = 1020;
376376
};
377377
DD75028C1C690C7A006590AF = {
378378
CreatedOnToolsVersion = 7.2.1;
379-
LastSwiftMigration = 1000;
379+
LastSwiftMigration = 1020;
380380
};
381381
};
382382
};
383383
buildConfigurationList = 52D6D9761BEFF229002C0205 /* Build configuration list for PBXProject "Easing" */;
384384
compatibilityVersion = "Xcode 6.3";
385-
developmentRegion = English;
385+
developmentRegion = en;
386386
hasScannedForEncodings = 0;
387387
knownRegions = (
388388
en,
389+
Base,
389390
);
390391
mainGroup = 52D6D9721BEFF229002C0205;
391392
productRefGroup = 52D6D97D1BEFF229002C0205 /* Products */;
@@ -549,6 +550,7 @@
549550
isa = XCBuildConfiguration;
550551
buildSettings = {
551552
ALWAYS_SEARCH_USER_PATHS = NO;
553+
CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
552554
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
553555
CLANG_CXX_LIBRARY = "libc++";
554556
CLANG_ENABLE_MODULES = YES;
@@ -608,6 +610,7 @@
608610
isa = XCBuildConfiguration;
609611
buildSettings = {
610612
ALWAYS_SEARCH_USER_PATHS = NO;
613+
CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
611614
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
612615
CLANG_CXX_LIBRARY = "libc++";
613616
CLANG_ENABLE_MODULES = YES;
@@ -676,7 +679,6 @@
676679
PRODUCT_NAME = Easing;
677680
SKIP_INSTALL = YES;
678681
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
679-
SWIFT_SWIFT3_OBJC_INFERENCE = Default;
680682
SWIFT_VERSION = 4.0;
681683
};
682684
name = Debug;
@@ -700,7 +702,6 @@
700702
PRODUCT_NAME = Easing;
701703
SKIP_INSTALL = YES;
702704
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
703-
SWIFT_SWIFT3_OBJC_INFERENCE = Default;
704705
SWIFT_VERSION = 4.0;
705706
};
706707
name = Release;
@@ -715,7 +716,6 @@
715716
PRODUCT_BUNDLE_IDENTIFIER = "com.Easing.Easing-iOS-Tests";
716717
PRODUCT_NAME = "$(TARGET_NAME)";
717718
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
718-
SWIFT_SWIFT3_OBJC_INFERENCE = Default;
719719
SWIFT_VERSION = 4.0;
720720
};
721721
name = Debug;
@@ -730,7 +730,6 @@
730730
PRODUCT_BUNDLE_IDENTIFIER = "com.Easing.Easing-iOS-Tests";
731731
PRODUCT_NAME = "$(TARGET_NAME)";
732732
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
733-
SWIFT_SWIFT3_OBJC_INFERENCE = Default;
734733
SWIFT_VERSION = 4.0;
735734
};
736735
name = Release;

‎Easing.xcodeproj/project.xcworkspace/xcuserdata/psharanda.xcuserdatad/UserInterfaceState.xcuserstate‎

-2.58 KB
Binary file not shown.

‎Easing.xcodeproj/xcshareddata/xcschemes/Easing-iOS.xcscheme‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "0930"
3+
LastUpgradeVersion = "1020"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

‎Easing.xcodeproj/xcshareddata/xcschemes/Easing-macOS.xcscheme‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "0930"
3+
LastUpgradeVersion = "1020"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

‎Easing.xcodeproj/xcshareddata/xcschemes/Easing-tvOS.xcscheme‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "0930"
3+
LastUpgradeVersion = "1020"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

‎Easing.xcodeproj/xcshareddata/xcschemes/Easing-watchOS.xcscheme‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "0930"
3+
LastUpgradeVersion = "1020"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

‎Sources/CubicBezierInterpolator.swift‎

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -173,16 +173,10 @@ struct CubicBezierCalculator {
173173

174174
}
175175

176-
private struct SampleKey: Hashable {
176+
private struct SampleKey: Equatable, Hashable {
177177
let x1: Double
178178
let x2: Double
179179
let number: Int
180180

181-
var hashValue: Int {
182-
return (31 &* x1.hashValue) &+ x2.hashValue
183-
}
184181
}
185182

186-
private func ==(left: SampleKey, right: SampleKey) -> Bool {
187-
return (left.x1 == right.x1) && (left.x2 == right.x2) && (left.number == right.number)
188-
}

0 commit comments

Comments
 (0)