Swift 4.1 (#3370)

* Fixed misuse of "!" operator

* Updated projects for Xcode 9.3 and Swift 4.1
added a workspace to include all demos with the project to make it easier to test changes

* Fixes for Xcode 9.3

.travis.yml

@@ -1,12 +1,12 @@
 language: objective-c
-osx_image: xcode9
+osx_image: xcode9.3beta
 matrix:
   include:
-    - osx_image: xcode9
+    - osx_image: xcode9.3beta
       env: PLATFORM="iOS"
-    - osx_image: xcode9
+    - osx_image: xcode9.3beta
       env: PLATFORM="tvOS"
-    - osx_image: xcode9
+    - osx_image: xcode9.3beta
       env: PLATFORM="macOS"
 env:
   global:

Charts.xcodeproj/project.pbxproj

@@ -731,7 +731,7 @@
 			isa = PBXProject;
 			attributes = {
 				LastSwiftUpdateCheck = 0830;
-				LastUpgradeCheck = 0700;
+				LastUpgradeCheck = 0930;
 				TargetAttributes = {
 					A58A4ED274A941CA248EA921 = {
 						LastSwiftMigration = 0900;
@@ -1055,6 +1055,7 @@
 				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;
 				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
 				CLANG_WARN_EMPTY_BODY = YES;
@@ -1062,6 +1063,7 @@
 				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;
 				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
@@ -1084,6 +1086,7 @@
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				SDKROOT = macosx;
 				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
+				SWIFT_VERSION = 4.0;
 				TARGETED_DEVICE_FAMILY = "1,2,3,4";
 				VALIDATE_PRODUCT = YES;
 			};
@@ -1103,6 +1106,7 @@
 				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;
 				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
 				CLANG_WARN_EMPTY_BODY = YES;
@@ -1110,6 +1114,7 @@
 				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;
 				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
@@ -1140,6 +1145,7 @@
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = macosx;
 				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
+				SWIFT_VERSION = 4.0;
 				TARGETED_DEVICE_FAMILY = "1,2,3,4";
 			};
 			name = Debug;

Charts.xcodeproj/xcshareddata/xcschemes/Charts.xcscheme

@@ -1,49 +1,49 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0900"
+   LastUpgradeVersion = "0930"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
       buildImplicitDependencies = "YES">
       <BuildActionEntries>
          <BuildActionEntry
-            buildForAnalyzing = "YES"
             buildForTesting = "YES"
             buildForRunning = "YES"
             buildForProfiling = "YES"
-            buildForArchiving = "YES">
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
             <BuildableReference
-               BuildableIdentifier = 'primary'
-               BlueprintIdentifier = 'A58A4ED274A941CA248EA921'
-               BlueprintName = 'Charts'
-               ReferencedContainer = 'container:Charts.xcodeproj'
-               BuildableName = 'Charts.framework'>
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "A58A4ED274A941CA248EA921"
+               BuildableName = "Charts.framework"
+               BlueprintName = "Charts"
+               ReferencedContainer = "container:Charts.xcodeproj">
             </BuildableReference>
          </BuildActionEntry>
       </BuildActionEntries>
    </BuildAction>
    <TestAction
+      buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      shouldUseLaunchSchemeArgsEnv = "YES"
-      buildConfiguration = "Debug"
-      codeCoverageEnabled = "NO">
-      <AdditionalOptions>
-      </AdditionalOptions>
+      shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
          <TestableReference
             skipped = "NO">
             <BuildableReference
-               BuildableIdentifier = 'primary'
-               BlueprintIdentifier = 'F2749BD5443C1CB5FE2080C2'
-               BlueprintName = 'ChartsTests'
-               ReferencedContainer = 'container:Charts.xcodeproj'
-               BuildableName = 'ChartsTests.xctest'>
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "F2749BD5443C1CB5FE2080C2"
+               BuildableName = "ChartsTests.xctest"
+               BlueprintName = "ChartsTests"
+               ReferencedContainer = "container:Charts.xcodeproj">
             </BuildableReference>
          </TestableReference>
       </Testables>
+      <AdditionalOptions>
+      </AdditionalOptions>
    </TestAction>
    <LaunchAction
+      buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       launchStyle = "0"
@@ -51,24 +51,32 @@
       ignoresPersistentStateOnLaunch = "NO"
       debugDocumentVersioning = "YES"
       debugServiceExtension = "internal"
-      buildConfiguration = "Debug"
       allowLocationSimulation = "YES">
-      <AdditionalOptions>
-      </AdditionalOptions>
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "A58A4ED274A941CA248EA921"
+            BuildableName = "Charts.framework"
+            BlueprintName = "Charts"
+            ReferencedContainer = "container:Charts.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
       <EnvironmentVariables>
          <EnvironmentVariable
-            key = 'FB_REFERENCE_IMAGE_DIR'
-            value = '$(SOURCE_ROOT)/Tests/ReferenceImages'
-            isEnabled = 'YES'>
+            key = "FB_REFERENCE_IMAGE_DIR"
+            value = "$(SOURCE_ROOT)/Tests/ReferenceImages"
+            isEnabled = "YES">
          </EnvironmentVariable>
       </EnvironmentVariables>
+      <AdditionalOptions>
+      </AdditionalOptions>
    </LaunchAction>
    <ProfileAction
+      buildConfiguration = "Release"
+      shouldUseLaunchSchemeArgsEnv = "YES"
       savedToolIdentifier = ""
       useCustomWorkingDirectory = "NO"
-      debugDocumentVersioning = "YES"
-      buildConfiguration = "Release"
-      shouldUseLaunchSchemeArgsEnv = "YES">
+      debugDocumentVersioning = "YES">
    </ProfileAction>
    <AnalyzeAction
       buildConfiguration = "Debug">

Charts.xcodeproj/xcshareddata/xcschemes/ChartsTests.xcscheme

@@ -1,49 +1,50 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0900"
+   LastUpgradeVersion = "0930"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
       buildImplicitDependencies = "YES">
       <BuildActionEntries>
          <BuildActionEntry
-            buildForAnalyzing = "YES"
             buildForTesting = "YES"
             buildForRunning = "YES"
             buildForProfiling = "YES"
-            buildForArchiving = "YES">
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
             <BuildableReference
-               BuildableIdentifier = 'primary'
-               BlueprintIdentifier = 'F2749BD5443C1CB5FE2080C2'
-               BlueprintName = 'ChartsTests'
-               ReferencedContainer = 'container:Charts.xcodeproj'
-               BuildableName = 'ChartsTests.xctest'>
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "F2749BD5443C1CB5FE2080C2"
+               BuildableName = "ChartsTests.xctest"
+               BlueprintName = "ChartsTests"
+               ReferencedContainer = "container:Charts.xcodeproj">
             </BuildableReference>
          </BuildActionEntry>
       </BuildActionEntries>
    </BuildAction>
    <TestAction
+      buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      shouldUseLaunchSchemeArgsEnv = "YES"
-      buildConfiguration = "Debug"
-      codeCoverageEnabled = "YES">
-      <AdditionalOptions>
-      </AdditionalOptions>
+      codeCoverageEnabled = "YES"
+      shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
          <TestableReference
             skipped = "NO">
             <BuildableReference
-               BuildableIdentifier = 'primary'
-               BlueprintIdentifier = 'F2749BD5443C1CB5FE2080C2'
-               BlueprintName = 'ChartsTests'
-               ReferencedContainer = 'container:Charts.xcodeproj'
-               BuildableName = 'ChartsTests.xctest'>
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "F2749BD5443C1CB5FE2080C2"
+               BuildableName = "ChartsTests.xctest"
+               BlueprintName = "ChartsTests"
+               ReferencedContainer = "container:Charts.xcodeproj">
             </BuildableReference>
          </TestableReference>
       </Testables>
+      <AdditionalOptions>
+      </AdditionalOptions>
    </TestAction>
    <LaunchAction
+      buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       launchStyle = "0"
@@ -51,24 +52,32 @@
       ignoresPersistentStateOnLaunch = "NO"
       debugDocumentVersioning = "YES"
       debugServiceExtension = "internal"
-      buildConfiguration = "Debug"
       allowLocationSimulation = "YES">
-      <AdditionalOptions>
-      </AdditionalOptions>
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "F2749BD5443C1CB5FE2080C2"
+            BuildableName = "ChartsTests.xctest"
+            BlueprintName = "ChartsTests"
+            ReferencedContainer = "container:Charts.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
       <EnvironmentVariables>
          <EnvironmentVariable
-            key = 'FB_REFERENCE_IMAGE_DIR'
-            value = '$(SOURCE_ROOT)/Tests/ReferenceImages'
-            isEnabled = 'YES'>
+            key = "FB_REFERENCE_IMAGE_DIR"
+            value = "$(SOURCE_ROOT)/Tests/ReferenceImages"
+            isEnabled = "YES">
          </EnvironmentVariable>
       </EnvironmentVariables>
+      <AdditionalOptions>
+      </AdditionalOptions>
    </LaunchAction>
    <ProfileAction
+      buildConfiguration = "Release"
+      shouldUseLaunchSchemeArgsEnv = "YES"
       savedToolIdentifier = ""
       useCustomWorkingDirectory = "NO"
-      debugDocumentVersioning = "YES"
-      buildConfiguration = "Release"
-      shouldUseLaunchSchemeArgsEnv = "YES">
+      debugDocumentVersioning = "YES">
    </ProfileAction>
    <AnalyzeAction
       buildConfiguration = "Debug">

Charts.xcworkspace/contents.xcworkspacedata

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Workspace
+   version = "1.0">
+   <FileRef
+      location = "container:Charts.xcodeproj">
+   </FileRef>
+   <FileRef
+      location = "group:ChartsDemo-iOS/ChartsDemo-iOS.xcodeproj">
+   </FileRef>
+   <FileRef
+      location = "group:ChartsDemo-macOS/ChartsDemo-macOS.xcodeproj">
+   </FileRef>
+</Workspace>

Charts.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>

ChartsDemo/ChartsDemo.xcodeproj/project.pbxproj → ChartsDemo-iOS/ChartsDemo-iOS.xcodeproj/project.pbxproj

@@ -199,7 +199,7 @@
 		0439A3521C9FF95F00496F83 /* PiePolylineChartViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PiePolylineChartViewController.m; sourceTree = "<group>"; };
 		0471CBFB1CA1090A00E52DBC /* PiePolylineChartViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = PiePolylineChartViewController.xib; sourceTree = "<group>"; };
 		0630AE391D8126C0008859B0 /* Charts.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = Charts.xcodeproj; path = ../Charts.xcodeproj; sourceTree = "<group>"; };
-		225B361D1F6EB9A50005B3D5 /* ChartsDemo-Swift.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "ChartsDemo-Swift.app"; sourceTree = BUILT_PRODUCTS_DIR; };
+		225B361D1F6EB9A50005B3D5 /* ChartsDemo-iOS-Swift.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "ChartsDemo-iOS-Swift.app"; sourceTree = BUILT_PRODUCTS_DIR; };
 		225B361F1F6EB9A50005B3D5 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
 		225B362F1F6EB9EE0005B3D5 /* DemoBaseViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DemoBaseViewController.swift; sourceTree = "<group>"; };
 		225B36301F6EB9EE0005B3D5 /* DemoListViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DemoListViewController.swift; sourceTree = "<group>"; };
@@ -240,7 +240,7 @@
 		5B0CC7831ABB875400665592 /* PieChartViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PieChartViewController.m; sourceTree = "<group>"; };
 		5B0CC7841ABB875400665592 /* PieChartViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = PieChartViewController.xib; sourceTree = "<group>"; };
 		5B1B5DA91E911A15006D1375 /* RealmDemosViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; name = RealmDemosViewController.xib; path = XIBs/Demos/RealmDemosViewController.xib; sourceTree = SOURCE_ROOT; };
-		5B57BBAF1A9B26AA0036A6CC /* ChartsDemo.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = ChartsDemo.app; sourceTree = BUILT_PRODUCTS_DIR; };
+		5B57BBAF1A9B26AA0036A6CC /* ChartsDemo-iOS.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "ChartsDemo-iOS.app"; sourceTree = BUILT_PRODUCTS_DIR; };
 		5B57BBB31A9B26AA0036A6CC /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		5B57BBB41A9B26AA0036A6CC /* main.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = "<group>"; };
 		5B57BBB61A9B26AA0036A6CC /* AppDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = "<group>"; };
@@ -477,8 +477,8 @@
 		5B57BBB01A9B26AA0036A6CC /* Products */ = {
 			isa = PBXGroup;
 			children = (
-				5B57BBAF1A9B26AA0036A6CC /* ChartsDemo.app */,
-				225B361D1F6EB9A50005B3D5 /* ChartsDemo-Swift.app */,
+				5B57BBAF1A9B26AA0036A6CC /* ChartsDemo-iOS.app */,
+				225B361D1F6EB9A50005B3D5 /* ChartsDemo-iOS-Swift.app */,
 			);
 			name = Products;
 			sourceTree = "<group>";
@@ -607,9 +607,9 @@
 /* End PBXGroup section */
 
 /* Begin PBXNativeTarget section */
-		225B361C1F6EB9A50005B3D5 /* ChartsDemo-Swift */ = {
+		225B361C1F6EB9A50005B3D5 /* ChartsDemo-iOS-Swift */ = {
 			isa = PBXNativeTarget;
-			buildConfigurationList = 225B362C1F6EB9A50005B3D5 /* Build configuration list for PBXNativeTarget "ChartsDemo-Swift" */;
+			buildConfigurationList = 225B362C1F6EB9A50005B3D5 /* Build configuration list for PBXNativeTarget "ChartsDemo-iOS-Swift" */;
 			buildPhases = (
 				225B36191F6EB9A50005B3D5 /* Sources */,
 				225B361A1F6EB9A50005B3D5 /* Frameworks */,
@@ -621,14 +621,14 @@
 			dependencies = (
 				225B368F1F6EBBB00005B3D5 /* PBXTargetDependency */,
 			);
-			name = "ChartsDemo-Swift";
+			name = "ChartsDemo-iOS-Swift";
 			productName = "ChartsDemo-Swift";
-			productReference = 225B361D1F6EB9A50005B3D5 /* ChartsDemo-Swift.app */;
+			productReference = 225B361D1F6EB9A50005B3D5 /* ChartsDemo-iOS-Swift.app */;
 			productType = "com.apple.product-type.application";
 		};
-		5B57BBAE1A9B26AA0036A6CC /* ChartsDemo */ = {
+		5B57BBAE1A9B26AA0036A6CC /* ChartsDemo-iOS */ = {
 			isa = PBXNativeTarget;
-			buildConfigurationList = 5B57BBD21A9B26AA0036A6CC /* Build configuration list for PBXNativeTarget "ChartsDemo" */;
+			buildConfigurationList = 5B57BBD21A9B26AA0036A6CC /* Build configuration list for PBXNativeTarget "ChartsDemo-iOS" */;
 			buildPhases = (
 				5B57BBAB1A9B26AA0036A6CC /* Sources */,
 				5B57BBAC1A9B26AA0036A6CC /* Frameworks */,
@@ -640,9 +640,9 @@
 			dependencies = (
 				0630AE541D81271B008859B0 /* PBXTargetDependency */,
 			);
-			name = ChartsDemo;
+			name = "ChartsDemo-iOS";
 			productName = chartstest;
-			productReference = 5B57BBAF1A9B26AA0036A6CC /* ChartsDemo.app */;
+			productReference = 5B57BBAF1A9B26AA0036A6CC /* ChartsDemo-iOS.app */;
 			productType = "com.apple.product-type.application";
 		};
 /* End PBXNativeTarget section */
@@ -653,7 +653,7 @@
 			attributes = {
 				LastSwiftMigration = 0700;
 				LastSwiftUpdateCheck = 0700;
-				LastUpgradeCheck = 0900;
+				LastUpgradeCheck = 0930;
 				ORGANIZATIONNAME = dcg;
 				TargetAttributes = {
 					225B361C1F6EB9A50005B3D5 = {
@@ -666,7 +666,7 @@
 					};
 				};
 			};
-			buildConfigurationList = 5B57BBAA1A9B26AA0036A6CC /* Build configuration list for PBXProject "ChartsDemo" */;
+			buildConfigurationList = 5B57BBAA1A9B26AA0036A6CC /* Build configuration list for PBXProject "ChartsDemo-iOS" */;
 			compatibilityVersion = "Xcode 3.2";
 			developmentRegion = English;
 			hasScannedForEncodings = 0;
@@ -685,8 +685,8 @@
 			);
 			projectRoot = "";
 			targets = (
-				5B57BBAE1A9B26AA0036A6CC /* ChartsDemo */,
-				225B361C1F6EB9A50005B3D5 /* ChartsDemo-Swift */,
+				5B57BBAE1A9B26AA0036A6CC /* ChartsDemo-iOS */,
+				225B361C1F6EB9A50005B3D5 /* ChartsDemo-iOS-Swift */,
 			);
 		};
 /* End PBXProject section */
@@ -952,12 +952,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;
@@ -987,6 +989,7 @@
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = iphoneos;
+				SWIFT_VERSION = 4.0;
 			};
 			name = Debug;
 		};
@@ -1002,12 +1005,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;
@@ -1030,6 +1035,7 @@
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
 				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
+				SWIFT_VERSION = 4.0;
 				VALIDATE_PRODUCT = YES;
 			};
 			name = Release;
@@ -1045,7 +1051,7 @@
 				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = "com.dcg.$(PRODUCT_NAME:rfc1034identifier)";
-				PRODUCT_NAME = ChartsDemo;
+				PRODUCT_NAME = "ChartsDemo-iOS";
 				SUPPORTED_PLATFORMS = "iphonesimulator iphoneos appletvsimulator appletvos";
 				SWIFT_OBJC_BRIDGING_HEADER = "Supporting Files/ChartsDemo-Bridging-Header.h";
 				SWIFT_OBJC_INTERFACE_HEADER_NAME = "$(SWIFT_MODULE_NAME)-Swift.h";
@@ -1065,7 +1071,7 @@
 				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = "com.dcg.$(PRODUCT_NAME:rfc1034identifier)";
-				PRODUCT_NAME = ChartsDemo;
+				PRODUCT_NAME = "ChartsDemo-iOS";
 				SUPPORTED_PLATFORMS = "iphonesimulator iphoneos appletvsimulator appletvos";
 				SWIFT_OBJC_BRIDGING_HEADER = "Supporting Files/ChartsDemo-Bridging-Header.h";
 				SWIFT_OBJC_INTERFACE_HEADER_NAME = "$(SWIFT_MODULE_NAME)-Swift.h";
@@ -1076,7 +1082,7 @@
 /* End XCBuildConfiguration section */
 
 /* Begin XCConfigurationList section */
-		225B362C1F6EB9A50005B3D5 /* Build configuration list for PBXNativeTarget "ChartsDemo-Swift" */ = {
+		225B362C1F6EB9A50005B3D5 /* Build configuration list for PBXNativeTarget "ChartsDemo-iOS-Swift" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (
 				225B362D1F6EB9A50005B3D5 /* Debug */,
@@ -1085,7 +1091,7 @@
 			defaultConfigurationIsVisible = 0;
 			defaultConfigurationName = Release;
 		};
-		5B57BBAA1A9B26AA0036A6CC /* Build configuration list for PBXProject "ChartsDemo" */ = {
+		5B57BBAA1A9B26AA0036A6CC /* Build configuration list for PBXProject "ChartsDemo-iOS" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (
 				5B57BBD01A9B26AA0036A6CC /* Debug */,
@@ -1094,7 +1100,7 @@
 			defaultConfigurationIsVisible = 0;
 			defaultConfigurationName = Release;
 		};
-		5B57BBD21A9B26AA0036A6CC /* Build configuration list for PBXNativeTarget "ChartsDemo" */ = {
+		5B57BBD21A9B26AA0036A6CC /* Build configuration list for PBXNativeTarget "ChartsDemo-iOS" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (
 				5B57BBD31A9B26AA0036A6CC /* Debug */,

ChartsDemo/Objective-C/DemoBaseViewController.h → ChartsDemo-iOS/Objective-C/DemoBaseViewController.h

@@ -10,7 +10,7 @@
 //
 
 #import <UIKit/UIKit.h>
-#import "ChartsDemo-Swift.h"
+#import "ChartsDemo_iOS-Swift.h"
 
 @interface DemoBaseViewController : UIViewController
 {

ChartsDemo/Objective-C/Demos/AnotherBarChartViewController.m → ChartsDemo-iOS/Objective-C/Demos/AnotherBarChartViewController.m

@@ -10,7 +10,7 @@
 //
 
 #import "AnotherBarChartViewController.h"
-#import "ChartsDemo-Swift.h"
+#import "ChartsDemo_iOS-Swift.h"
 
 @interface AnotherBarChartViewController () <ChartViewDelegate>
 

ChartsDemo/Objective-C/Demos/BarChartViewController.m → ChartsDemo-iOS/Objective-C/Demos/BarChartViewController.m

@@ -10,7 +10,7 @@
 //
 
 #import "BarChartViewController.h"
-#import "ChartsDemo-Swift.h"
+#import "ChartsDemo_iOS-Swift.h"
 #import "DayAxisValueFormatter.h"
 
 @interface BarChartViewController () <ChartViewDelegate>

ChartsDemo/Objective-C/Demos/BubbleChartViewController.m → ChartsDemo-iOS/Objective-C/Demos/BubbleChartViewController.m

@@ -10,7 +10,7 @@
 //
 
 #import "BubbleChartViewController.h"
-#import "ChartsDemo-Swift.h"
+#import "ChartsDemo_iOS-Swift.h"
 
 @interface BubbleChartViewController () <ChartViewDelegate>
 

ChartsDemo/Objective-C/Demos/CandleStickChartViewController.m → ChartsDemo-iOS/Objective-C/Demos/CandleStickChartViewController.m

@@ -10,7 +10,7 @@
 //
 
 #import "CandleStickChartViewController.h"
-#import "ChartsDemo-Swift.h"
+#import "ChartsDemo_iOS-Swift.h"
 
 @interface CandleStickChartViewController () <ChartViewDelegate>
 

ChartsDemo/Objective-C/Demos/ColoredLineChartViewController.m → ChartsDemo-iOS/Objective-C/Demos/ColoredLineChartViewController.m

@@ -10,7 +10,7 @@
 //
 
 #import "ColoredLineChartViewController.h"
-#import "ChartsDemo-Swift.h"
+#import "ChartsDemo_iOS-Swift.h"
 
 @interface ColoredLineChartViewController () <ChartViewDelegate>
 

ChartsDemo/Objective-C/Demos/CombinedChartViewController.m → ChartsDemo-iOS/Objective-C/Demos/CombinedChartViewController.m

@@ -10,7 +10,7 @@
 //
 
 #import "CombinedChartViewController.h"
-#import "ChartsDemo-Swift.h"
+#import "ChartsDemo_iOS-Swift.h"
 
 #define ITEM_COUNT 12
 

ChartsDemo/Objective-C/Demos/CubicLineChartViewController.m → ChartsDemo-iOS/Objective-C/Demos/CubicLineChartViewController.m

@@ -10,7 +10,7 @@
 //
 
 #import "CubicLineChartViewController.h"
-#import "ChartsDemo-Swift.h"
+#import "ChartsDemo_iOS-Swift.h"
 
 @interface CubicLineSampleFillFormatter : NSObject <IChartFillFormatter>
 {

ChartsDemo/Objective-C/Demos/HalfPieChartViewController.m → ChartsDemo-iOS/Objective-C/Demos/HalfPieChartViewController.m

@@ -10,7 +10,7 @@
 //
 
 #import "HalfPieChartViewController.h"
-#import "ChartsDemo-Swift.h"
+#import "ChartsDemo_iOS-Swift.h"
 
 @interface HalfPieChartViewController () <ChartViewDelegate>
 

ChartsDemo/Objective-C/Demos/HorizontalBarChartViewController.m → ChartsDemo-iOS/Objective-C/Demos/HorizontalBarChartViewController.m

@@ -10,7 +10,7 @@
 //
 
 #import "HorizontalBarChartViewController.h"
-#import "ChartsDemo-Swift.h"
+#import "ChartsDemo_iOS-Swift.h"
 
 @interface HorizontalBarChartViewController () <ChartViewDelegate>
 

ChartsDemo/Objective-C/Demos/LineChart1ViewController.m → ChartsDemo-iOS/Objective-C/Demos/LineChart1ViewController.m

@@ -10,7 +10,7 @@
 //
 
 #import "LineChart1ViewController.h"
-#import "ChartsDemo-Swift.h"
+#import "ChartsDemo_iOS-Swift.h"
 
 @interface LineChart1ViewController () <ChartViewDelegate>
 

ChartsDemo/Objective-C/Demos/LineChart2ViewController.m → ChartsDemo-iOS/Objective-C/Demos/LineChart2ViewController.m

@@ -10,7 +10,7 @@
 //
 
 #import "LineChart2ViewController.h"
-#import "ChartsDemo-Swift.h"
+#import "ChartsDemo_iOS-Swift.h"
 
 @interface LineChart2ViewController () <ChartViewDelegate>
 

ChartsDemo/Objective-C/Demos/LineChartFilledViewController.m → ChartsDemo-iOS/Objective-C/Demos/LineChartFilledViewController.m

@@ -10,7 +10,7 @@
 //
 
 #import "LineChartFilledViewController.h"
-#import "ChartsDemo-Swift.h"
+#import "ChartsDemo_iOS-Swift.h"
 
 @interface LineChartFilledViewController () <ChartViewDelegate>
 
@@ -124,7 +124,7 @@
         set1.highlightColor = [UIColor colorWithRed:244/255.0 green:117/255.0 blue:117/255.0 alpha:1.0];
         set1.drawCircleHoleEnabled = NO;
         set1.fillFormatter = [ChartDefaultFillFormatter withBlock:^CGFloat(id<ILineChartDataSet>  _Nonnull dataSet, id<LineChartDataProvider>  _Nonnull dataProvider) {
-            return _chartView.leftAxis.axisMinimum;
+            return self.chartView.leftAxis.axisMinimum;
         }];
         
         set2 = [[LineChartDataSet alloc] initWithValues:yVals2 label:@"DataSet 2"];
@@ -139,7 +139,7 @@
         set2.highlightColor = [UIColor colorWithRed:244/255.0 green:117/255.0 blue:117/255.0 alpha:1.0];
         set2.drawCircleHoleEnabled = NO;
         set2.fillFormatter = [ChartDefaultFillFormatter withBlock:^CGFloat(id<ILineChartDataSet>  _Nonnull dataSet, id<LineChartDataProvider>  _Nonnull dataProvider) {
-            return _chartView.leftAxis.axisMaximum;
+            return self.chartView.leftAxis.axisMaximum;
         }];
         
         NSMutableArray *dataSets = [[NSMutableArray alloc] init];

ChartsDemo/Objective-C/Demos/LineChartTimeViewController.m → ChartsDemo-iOS/Objective-C/Demos/LineChartTimeViewController.m

@@ -10,7 +10,7 @@
 //
 
 #import "LineChartTimeViewController.h"
-#import "ChartsDemo-Swift.h"
+#import "ChartsDemo_iOS-Swift.h"
 #import "DateValueFormatter.h"
 
 @interface LineChartTimeViewController () <ChartViewDelegate>

ChartsDemo/Objective-C/Demos/MultipleBarChartViewController.m → ChartsDemo-iOS/Objective-C/Demos/MultipleBarChartViewController.m

@@ -10,7 +10,7 @@
 //
 
 #import "MultipleBarChartViewController.h"
-#import "ChartsDemo-Swift.h"
+#import "ChartsDemo_iOS-Swift.h"
 #import "IntAxisValueFormatter.h"
 
 @interface MultipleBarChartViewController () <ChartViewDelegate>

ChartsDemo/Objective-C/Demos/MultipleLinesChartViewController.m → ChartsDemo-iOS/Objective-C/Demos/MultipleLinesChartViewController.m

@@ -10,7 +10,7 @@
 //
 
 #import "MultipleLinesChartViewController.h"
-#import "ChartsDemo-Swift.h"
+#import "ChartsDemo_iOS-Swift.h"
 
 @interface MultipleLinesChartViewController () <ChartViewDelegate>
 

ChartsDemo/Objective-C/Demos/NegativeStackedBarChartViewController.m → ChartsDemo-iOS/Objective-C/Demos/NegativeStackedBarChartViewController.m

@@ -10,7 +10,7 @@
 //
 
 #import "NegativeStackedBarChartViewController.h"
-#import "ChartsDemo-Swift.h"
+#import "ChartsDemo_iOS-Swift.h"
 
 @interface NegativeStackedBarChartViewController () <ChartViewDelegate, IChartAxisValueFormatter>
 

ChartsDemo/Objective-C/Demos/PieChartViewController.m → ChartsDemo-iOS/Objective-C/Demos/PieChartViewController.m

@@ -10,7 +10,7 @@
 //
 
 #import "PieChartViewController.h"
-#import "ChartsDemo-Swift.h"
+#import "ChartsDemo_iOS-Swift.h"
 
 @interface PieChartViewController () <ChartViewDelegate>
 

ChartsDemo/Objective-C/Demos/PiePolylineChartViewController.m → ChartsDemo-iOS/Objective-C/Demos/PiePolylineChartViewController.m

@@ -7,7 +7,7 @@
 //
 
 #import "PiePolylineChartViewController.h"
-#import "ChartsDemo-Swift.h"
+#import "ChartsDemo_iOS-Swift.h"
 
 @interface PiePolylineChartViewController () <ChartViewDelegate>
 

ChartsDemo/Objective-C/Demos/PositiveNegativeBarChartViewController.m → ChartsDemo-iOS/Objective-C/Demos/PositiveNegativeBarChartViewController.m

@@ -10,7 +10,7 @@
 //
 
 #import "PositiveNegativeBarChartViewController.h"
-#import "ChartsDemo-Swift.h"
+#import "ChartsDemo_iOS-Swift.h"
 
 @interface PositiveNegativeBarChartViewController () <ChartViewDelegate, IChartAxisValueFormatter>
 {

ChartsDemo/Objective-C/Demos/RadarChartViewController.m → ChartsDemo-iOS/Objective-C/Demos/RadarChartViewController.m

@@ -10,17 +10,15 @@
 //
 
 #import "RadarChartViewController.h"
-#import "ChartsDemo-Swift.h"
+#import "ChartsDemo_iOS-Swift.h"
 
 @interface RadarChartViewController () <ChartViewDelegate, IChartAxisValueFormatter>
-{
-    NSArray<NSString *> *activities;
-    UIColor *originalBarBgColor;
-    UIColor *originalBarTintColor;
-    UIBarStyle originalBarStyle;
-}
 
 @property (nonatomic, strong) IBOutlet RadarChartView *chartView;
+@property (nonatomic, strong) NSArray<NSString *> *activities;
+@property (nonatomic, strong) UIColor *originalBarBgColor;
+@property (nonatomic, strong) UIColor *originalBarTintColor;
+@property (nonatomic) UIBarStyle originalBarStyle;
 
 @end
 
@@ -30,7 +28,7 @@
 {
     [super viewDidLoad];
     
-    activities = @[ @"Burger", @"Steak", @"Salad", @"Pasta", @"Pizza" ];
+    self.activities = @[ @"Burger", @"Steak", @"Salad", @"Pasta", @"Pizza" ];
     
     self.title = @"Radar Bar Chart";
     
@@ -98,9 +96,9 @@
     
     [UIView animateWithDuration:0.15 animations:^{
         UINavigationBar *navigationBar = self.navigationController.navigationBar;
-        originalBarBgColor = self.navigationController.navigationBar.barTintColor;
-        originalBarTintColor = self.navigationController.navigationBar.tintColor;
-        originalBarStyle = self.navigationController.navigationBar.barStyle;
+        self.originalBarBgColor = navigationBar.barTintColor;
+        self.originalBarTintColor = navigationBar.tintColor;
+        self.originalBarStyle = navigationBar.barStyle;
         
         navigationBar.barTintColor = self.view.backgroundColor;
         navigationBar.tintColor = UIColor.whiteColor;
@@ -114,9 +112,9 @@
     
     [UIView animateWithDuration:0.15 animations:^{
         UINavigationBar *navigationBar = self.navigationController.navigationBar;
-        navigationBar.barTintColor = originalBarBgColor;
-        navigationBar.tintColor = originalBarTintColor;
-        navigationBar.barStyle = originalBarStyle;
+        navigationBar.barTintColor = self.originalBarBgColor;
+        navigationBar.tintColor = self.originalBarTintColor;
+        navigationBar.barStyle = self.originalBarStyle;
     }];
 }
 
@@ -270,7 +268,7 @@
 - (NSString *)stringForValue:(double)value
                         axis:(ChartAxisBase *)axis
 {
-    return activities[(int) value % activities.count];
+    return self.activities[(int) value % self.activities.count];
 }
 
 @end

ChartsDemo/Objective-C/Demos/ScatterChartViewController.m → ChartsDemo-iOS/Objective-C/Demos/ScatterChartViewController.m

@@ -10,7 +10,7 @@
 //
 
 #import "ScatterChartViewController.h"
-#import "ChartsDemo-Swift.h"
+#import "ChartsDemo_iOS-Swift.h"
 
 @interface ScatterChartViewController () <ChartViewDelegate>
 

ChartsDemo/Objective-C/Demos/SinusBarChartViewController.m → ChartsDemo-iOS/Objective-C/Demos/SinusBarChartViewController.m

@@ -10,7 +10,7 @@
 //
 
 #import "SinusBarChartViewController.h"
-#import "ChartsDemo-Swift.h"
+#import "ChartsDemo_iOS-Swift.h"
 
 @interface SinusBarChartViewController () <ChartViewDelegate>
 

ChartsDemo/Objective-C/Demos/StackedBarChartViewController.m → ChartsDemo-iOS/Objective-C/Demos/StackedBarChartViewController.m

@@ -10,7 +10,7 @@
 //
 
 #import "StackedBarChartViewController.h"
-#import "ChartsDemo-Swift.h"
+#import "ChartsDemo_iOS-Swift.h"
 
 @interface StackedBarChartViewController () <ChartViewDelegate>
 

ChartsDemo/Objective-C/Formatters/DateValueFormatter.h → ChartsDemo-iOS/Objective-C/Formatters/DateValueFormatter.h

@@ -10,7 +10,7 @@
 //
 
 #import <UIKit/UIKit.h>
-#import "ChartsDemo-Swift.h"
+#import "ChartsDemo_iOS-Swift.h"
 
 @interface DateValueFormatter : NSObject <IChartAxisValueFormatter>
 

ChartsDemo/Objective-C/Formatters/DayAxisValueFormatter.h → ChartsDemo-iOS/Objective-C/Formatters/DayAxisValueFormatter.h

@@ -5,7 +5,7 @@
 //
 
 #import <UIKit/UIKit.h>
-#import "ChartsDemo-Swift.h"
+#import "ChartsDemo_iOS-Swift.h"
 
 @interface DayAxisValueFormatter : NSObject <IChartAxisValueFormatter>
 

ChartsDemo/Objective-C/Formatters/IntAxisValueFormatter.h → ChartsDemo-iOS/Objective-C/Formatters/IntAxisValueFormatter.h

@@ -5,7 +5,7 @@
 //
 
 #import <UIKit/UIKit.h>
-#import "ChartsDemo-Swift.h"
+#import "ChartsDemo_iOS-Swift.h"
 
 @interface IntAxisValueFormatter : NSObject <IChartAxisValueFormatter>