Swift 4.1

asynchrony · Mar 30, 2018 · 0e4113f · 0e4113f
1 parent 4502081
commit 0e4113f
Show file tree

Hide file tree

Showing 18 changed files with 76 additions and 32 deletions.
diff --git a/ReLax.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/ReLax.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>IDEDidComputeMac32BitWarning</key>
+	<true/>
+</dict>
+</plist>
diff --git a/ReLax/ReLax.xcodeproj/project.pbxproj b/ReLax/ReLax.xcodeproj/project.pbxproj
@@ -173,7 +173,7 @@
 			isa = PBXProject;
 			attributes = {
 				LastSwiftUpdateCheck = 0820;
-				LastUpgradeCheck = 0900;
+				LastUpgradeCheck = 0930;
 				ORGANIZATIONNAME = Asynchrony;
 				TargetAttributes = {
 					4D72CD6B1E690A99005D8769 = {
@@ -253,13 +253,15 @@
 				CLANG_WARN_BOOL_CONVERSION = YES;
 				CLANG_WARN_COMMA = YES;
 				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
 				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
 				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
 				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
 				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
@@ -313,13 +315,15 @@
 				CLANG_WARN_BOOL_CONVERSION = YES;
 				CLANG_WARN_COMMA = YES;
 				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
 				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
 				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
 				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
 				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
@@ -372,7 +376,6 @@
 				SDKROOT = appletvos;
 				SKIP_INSTALL = YES;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
-				SWIFT_SWIFT3_OBJC_INFERENCE = On;
 				SWIFT_VERSION = 4.0;
 				TARGETED_DEVICE_FAMILY = 3;
 				TVOS_DEPLOYMENT_TARGET = 9.0;
@@ -397,7 +400,6 @@
 				PROVISIONING_PROFILE_SPECIFIER = "";
 				SDKROOT = appletvos;
 				SKIP_INSTALL = YES;
-				SWIFT_SWIFT3_OBJC_INFERENCE = On;
 				SWIFT_VERSION = 4.0;
 				TARGETED_DEVICE_FAMILY = 3;
 				TVOS_DEPLOYMENT_TARGET = 9.0;

diff --git a/ReLax/ReLax.xcodeproj/xcshareddata/xcschemes/ReLax.xcscheme b/ReLax/ReLax.xcodeproj/xcshareddata/xcschemes/ReLax.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0900"
+   LastUpgradeVersion = "0930"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -26,7 +26,6 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      language = ""
       shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
          <TestableReference
@@ -56,7 +55,6 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      language = ""
       launchStyle = "0"
       useCustomWorkingDirectory = "NO"
       ignoresPersistentStateOnLaunch = "NO"

diff --git a/ReLax/ReLax/DataHelpers.swift b/ReLax/ReLax/DataHelpers.swift
@@ -3,8 +3,8 @@ import Foundation
 func uint32Data(_ int: UInt) -> Data {
     let intData = UnsafeMutablePointer<UInt>.allocate(capacity: 4)
     defer {
-        intData.deinitialize()
-        intData.deallocate(capacity: 4)
+        intData.deinitialize(count: 4)
+        intData.deallocate()
     }
     intData.initialize(to: int)
     return Data(bytes: intData, count: 4)
@@ -13,8 +13,8 @@ func uint32Data(_ int: UInt) -> Data {
 func int32Data(_ int: Int) -> Data {
     let intData = UnsafeMutablePointer<Int>.allocate(capacity: 4)
     defer {
-        intData.deinitialize()
-        intData.deallocate(capacity: 4)
+        intData.deinitialize(count: 4)
+        intData.deallocate()
     }
     intData.initialize(to: int)
     return Data(bytes: intData, count: 4)
@@ -23,8 +23,8 @@ func int32Data(_ int: Int) -> Data {
 func byteSwappedInt32Data(_ int: Int) -> Data {
     let intData = UnsafeMutablePointer<UInt32>.allocate(capacity: 4)
     defer {
-        intData.deinitialize()
-        intData.deallocate(capacity: 4)
+        intData.deinitialize(count: 4)
+        intData.deallocate()
     }
     intData.initialize(to: UInt32(int).byteSwapped)
     return Data(bytes: intData, count: 4)
@@ -33,8 +33,8 @@ func byteSwappedInt32Data(_ int: Int) -> Data {
 func byteSwappedInt16Data(_ int: Int) -> Data {
     let intData = UnsafeMutablePointer<UInt16>.allocate(capacity: 2)
     defer {
-        intData.deinitialize()
-        intData.deallocate(capacity: 2)
+        intData.deinitialize(count: 2)
+        intData.deallocate()
     }
     intData.initialize(to: UInt16(int).byteSwapped)
     return Data(bytes: intData, count: 2)
@@ -43,8 +43,8 @@ func byteSwappedInt16Data(_ int: Int) -> Data {
 func int16Data(_ int: Int) -> Data {
     let intData = UnsafeMutablePointer<UInt16>.allocate(capacity: 2)
     defer {
-        intData.deinitialize()
-        intData.deallocate(capacity: 2)
+        intData.deinitialize(count: 2)
+        intData.deallocate()
     }
     intData.initialize(to: UInt16(int))
     return Data(bytes: intData, count: 2)
@@ -68,8 +68,8 @@ func uuidData() -> Data {
     let uuid = NSUUID()
     let uuidBytes = UnsafeMutablePointer<UInt8>.allocate(capacity: 16)
     defer {
-        uuidBytes.deinitialize()
-        uuidBytes.deallocate(capacity: 16)
+        uuidBytes.deinitialize(count: 16)
+        uuidBytes.deallocate()
     }
     uuid.getBytes(uuidBytes)
     let data = Data(bytes: uuidBytes, count: 16)

diff --git a/...dassets/App Icon - Large.imagestack/Layer1.imagestacklayer/Content.imageset/Contents.json b/...dassets/App Icon - Large.imagestack/Layer1.imagestacklayer/Content.imageset/Contents.json
@@ -4,6 +4,10 @@
       "idiom" : "tv",
       "filename" : "relax-layer04.png",
       "scale" : "1x"
+    },
+    {
+      "idiom" : "tv",
+      "scale" : "2x"
     }
   ],
   "info" : {

diff --git a/...dassets/App Icon - Large.imagestack/Layer2.imagestacklayer/Content.imageset/Contents.json b/...dassets/App Icon - Large.imagestack/Layer2.imagestacklayer/Content.imageset/Contents.json
@@ -4,6 +4,10 @@
       "idiom" : "tv",
       "filename" : "relax-layer03.png",
       "scale" : "1x"
+    },
+    {
+      "idiom" : "tv",
+      "scale" : "2x"
     }
   ],
   "info" : {

diff --git a/...dassets/App Icon - Large.imagestack/Layer3.imagestacklayer/Content.imageset/Contents.json b/...dassets/App Icon - Large.imagestack/Layer3.imagestacklayer/Content.imageset/Contents.json
@@ -4,6 +4,10 @@
       "idiom" : "tv",
       "filename" : "relax-layer02.png",
       "scale" : "1x"
+    },
+    {
+      "idiom" : "tv",
+      "scale" : "2x"
     }
   ],
   "info" : {

diff --git a/...dassets/App Icon - Large.imagestack/Layer4.imagestacklayer/Content.imageset/Contents.json b/...dassets/App Icon - Large.imagestack/Layer4.imagestacklayer/Content.imageset/Contents.json
@@ -4,6 +4,10 @@
       "idiom" : "tv",
       "filename" : "relax-layer01.png",
       "scale" : "1x"
+    },
+    {
+      "idiom" : "tv",
+      "scale" : "2x"
     }
   ],
   "info" : {

diff --git a/...dassets/App Icon - Small.imagestack/Layer1.imagestacklayer/Content.imageset/Contents.json b/...dassets/App Icon - Small.imagestack/Layer1.imagestacklayer/Content.imageset/Contents.json
@@ -4,6 +4,10 @@
       "idiom" : "tv",
       "filename" : "relax-layer042.png",
       "scale" : "1x"
+    },
+    {
+      "idiom" : "tv",
+      "scale" : "2x"
     }
   ],
   "info" : {

diff --git a/...dassets/App Icon - Small.imagestack/Layer2.imagestacklayer/Content.imageset/Contents.json b/...dassets/App Icon - Small.imagestack/Layer2.imagestacklayer/Content.imageset/Contents.json
@@ -4,6 +4,10 @@
       "idiom" : "tv",
       "filename" : "relax-layer032.png",
       "scale" : "1x"
+    },
+    {
+      "idiom" : "tv",
+      "scale" : "2x"
     }
   ],
   "info" : {

diff --git a/...dassets/App Icon - Small.imagestack/Layer3.imagestacklayer/Content.imageset/Contents.json b/...dassets/App Icon - Small.imagestack/Layer3.imagestacklayer/Content.imageset/Contents.json
@@ -4,6 +4,10 @@
       "idiom" : "tv",
       "filename" : "relax-layer022.png",
       "scale" : "1x"
+    },
+    {
+      "idiom" : "tv",
+      "scale" : "2x"
     }
   ],
   "info" : {

diff --git a/...dassets/App Icon - Small.imagestack/Layer4.imagestacklayer/Content.imageset/Contents.json b/...dassets/App Icon - Small.imagestack/Layer4.imagestacklayer/Content.imageset/Contents.json
@@ -4,6 +4,10 @@
       "idiom" : "tv",
       "filename" : "relax-layer012.png",
       "scale" : "1x"
+    },
+    {
+      "idiom" : "tv",
+      "scale" : "2x"
     }
   ],
   "info" : {

diff --git a/...mple/Assets.xcassets/Brand Assets.brandassets/Top Shelf Image Wide.imageset/Contents.json b/...mple/Assets.xcassets/Brand Assets.brandassets/Top Shelf Image Wide.imageset/Contents.json
@@ -3,6 +3,10 @@
     {
       "idiom" : "tv",
       "scale" : "1x"
+    },
+    {
+      "idiom" : "tv",
+      "scale" : "2x"
     }
   ],
   "info" : {

diff --git a/ReLaxExample/Assets.xcassets/Brand Assets.brandassets/Top Shelf Image.imageset/Contents.json b/ReLaxExample/Assets.xcassets/Brand Assets.brandassets/Top Shelf Image.imageset/Contents.json
@@ -3,6 +3,10 @@
     {
       "idiom" : "tv",
       "scale" : "1x"
+    },
+    {
+      "idiom" : "tv",
+      "scale" : "2x"
     }
   ],
   "info" : {

diff --git a/ReLaxExample/ReLaxExample.xcodeproj/project.pbxproj b/ReLaxExample/ReLaxExample.xcodeproj/project.pbxproj
@@ -251,7 +251,7 @@
 			isa = PBXProject;
 			attributes = {
 				LastSwiftUpdateCheck = 0810;
-				LastUpgradeCheck = 0900;
+				LastUpgradeCheck = 0930;
 				ORGANIZATIONNAME = Asynchrony;
 				TargetAttributes = {
 					4D1CC1BB1E6DB9530056E465 = {
@@ -366,7 +366,6 @@
 				SDKROOT = appletvos;
 				SKIP_INSTALL = YES;
 				SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
-				SWIFT_SWIFT3_OBJC_INFERENCE = On;
 				SWIFT_VERSION = 4.0;
 				TVOS_DEPLOYMENT_TARGET = 10.0;
 			};
@@ -386,7 +385,6 @@
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SDKROOT = appletvos;
 				SKIP_INSTALL = YES;
-				SWIFT_SWIFT3_OBJC_INFERENCE = On;
 				SWIFT_VERSION = 4.0;
 				TVOS_DEPLOYMENT_TARGET = 10.0;
 				VALIDATE_PRODUCT = YES;
@@ -406,12 +404,14 @@
 				CLANG_WARN_BOOL_CONVERSION = YES;
 				CLANG_WARN_COMMA = YES;
 				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
 				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
 				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
 				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
 				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
@@ -459,12 +459,14 @@
 				CLANG_WARN_BOOL_CONVERSION = YES;
 				CLANG_WARN_COMMA = YES;
 				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
 				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
 				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
 				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
 				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
@@ -509,7 +511,6 @@
 				PROVISIONING_PROFILE_SPECIFIER = "";
 				SDKROOT = appletvos;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
-				SWIFT_SWIFT3_OBJC_INFERENCE = On;
 				SWIFT_VERSION = 4.0;
 				TARGETED_DEVICE_FAMILY = 3;
 				TVOS_DEPLOYMENT_TARGET = 9.0;
@@ -532,7 +533,6 @@
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
 				SDKROOT = appletvos;
-				SWIFT_SWIFT3_OBJC_INFERENCE = On;
 				SWIFT_VERSION = 4.0;
 				TARGETED_DEVICE_FAMILY = 3;
 				TVOS_DEPLOYMENT_TARGET = 9.0;

diff --git a/ReLaxExample/ReLaxExample.xcodeproj/xcshareddata/xcschemes/ReLaxExample.xcscheme b/ReLaxExample/ReLaxExample.xcodeproj/xcshareddata/xcschemes/ReLaxExample.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0900"
+   LastUpgradeVersion = "0930"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -26,7 +26,6 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      language = ""
       shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
       </Testables>
@@ -46,7 +45,6 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      language = ""
       launchStyle = "0"
       useCustomWorkingDirectory = "NO"
       ignoresPersistentStateOnLaunch = "NO"

diff --git a/ReLaxExample/ReLaxExample.xcodeproj/xcshareddata/xcschemes/ReLaxTopShelfExample.xcscheme b/ReLaxExample/ReLaxExample.xcodeproj/xcshareddata/xcschemes/ReLaxTopShelfExample.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0900"
+   LastUpgradeVersion = "0930"
    wasCreatedForAppExtension = "YES"
    version = "2.0">
    <BuildAction
@@ -41,7 +41,6 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      language = ""
       shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
       </Testables>
@@ -61,7 +60,6 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = ""
       selectedLauncherIdentifier = "Xcode.IDEFoundation.Launcher.PosixSpawn"
-      language = ""
       launchStyle = "0"
       useCustomWorkingDirectory = "NO"
       ignoresPersistentStateOnLaunch = "NO"