Feature/swift4 (#11)

* Perform automatic source migration to Swift4

* Automatic updates for project files

* Remove deprecated string functions in favor of Swift 4 methods

* Update the podspec and documentation

* Clean up existing warnings

* Bump version number to 1.2.0

Author: gca3020

CHANGELOG.md

@@ -1,3 +1,7 @@
+## v1.1.1 (June 23, 2018)
+
+* Additional updates for Swift 4, cleaning up the project and deprecated usages.
+
 ## v1.1.0 (June 19, 2018)
 
 * Update pods to support Swift 4 versions of dependencies.

Example/GABoardGameGeek.xcodeproj/project.pbxproj

@@ -141,12 +141,12 @@
 			isa = PBXProject;
 			attributes = {
 				LastSwiftUpdateCheck = 0720;
-				LastUpgradeCheck = 0820;
+				LastUpgradeCheck = 0940;
 				ORGANIZATIONNAME = CocoaPods;
 				TargetAttributes = {
 					607FACE41AFB9204008FA782 = {
 						CreatedOnToolsVersion = 6.3.1;
-						LastSwiftMigration = 0820;
+						LastSwiftMigration = 0940;
 						TestTargetID = 607FACCF1AFB9204008FA782;
 					};
 				};
@@ -252,14 +252,22 @@
 				CLANG_CXX_LIBRARY = "libc++";
 				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_OBJC_ARC = YES;
+				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
 				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;
+				CLANG_WARN_STRICT_PROTOTYPES = YES;
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
@@ -299,14 +307,22 @@
 				CLANG_CXX_LIBRARY = "libc++";
 				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_OBJC_ARC = YES;
+				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
 				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;
+				CLANG_WARN_STRICT_PROTOTYPES = YES;
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
@@ -335,7 +351,7 @@
 			isa = XCBuildConfiguration;
 			baseConfigurationReference = 9DBE8ADBA401567C3671C127 /* Pods-GABoardGameGeek_Tests.debug.xcconfig */;
 			buildSettings = {
-				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
+				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = "$(inherited)";
 				FRAMEWORK_SEARCH_PATHS = "$(inherited)";
 				GCC_PREPROCESSOR_DEFINITIONS = (
 					"DEBUG=1",
@@ -345,21 +361,23 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_VERSION = 3.0;
+				SWIFT_SWIFT3_OBJC_INFERENCE = Default;
+				SWIFT_VERSION = 4.0;
 			};
 			name = Debug;
 		};
 		607FACF41AFB9204008FA782 /* Release */ = {
 			isa = XCBuildConfiguration;
 			baseConfigurationReference = 3CD75A01818909122282EE04 /* Pods-GABoardGameGeek_Tests.release.xcconfig */;
 			buildSettings = {
-				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
+				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = "$(inherited)";
 				FRAMEWORK_SEARCH_PATHS = "$(inherited)";
 				INFOPLIST_FILE = Tests/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_VERSION = 3.0;
+				SWIFT_SWIFT3_OBJC_INFERENCE = Default;
+				SWIFT_VERSION = 4.0;
 			};
 			name = Release;
 		};

Example/GABoardGameGeek.xcodeproj/xcshareddata/xcschemes/GABoardGameGeek-Example.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0820"
+   LastUpgradeVersion = "0940"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -40,8 +40,8 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      shouldUseLaunchSchemeArgsEnv = "YES"
-      codeCoverageEnabled = "YES">
+      codeCoverageEnabled = "YES"
+      shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
          <TestableReference
             skipped = "NO">

Example/Podfile

@@ -1,4 +1,7 @@
 use_frameworks!
+
+platform :ios, '9.0'
+
 target 'GABoardGameGeek_Tests' do
   pod 'GABoardGameGeek', :path => '../'
 

Example/Podfile.lock

@@ -1,6 +1,6 @@
 PODS:
   - Alamofire (4.7.2)
-  - GABoardGameGeek (1.0.0):
+  - GABoardGameGeek (1.2.0):
     - Alamofire
     - SWXMLHash
   - Nimble (7.1.2)
@@ -43,12 +43,12 @@ EXTERNAL SOURCES:
 
 SPEC CHECKSUMS:
   Alamofire: e4fa87002c137ba2d8d634d2c51fabcda0d5c223
-  GABoardGameGeek: c3939bf394df20648cef010e57690e69274a3a82
+  GABoardGameGeek: 75611b3474f4dbc6f02226c6e55d7390a4a96fd7
   Nimble: 3835ba9f459daa6b347f8a8e110aaae8ca1920a8
   OHHTTPStubs: 1e21c7d2c084b8153fc53d48400d8919d2d432d0
   Quick: 03278013f71aa05fe9ecabc94fbcc6835f1ee76f
   SWXMLHash: f4522438189f72b41e39676d19469a8969d60dd1
 
-PODFILE CHECKSUM: 54474ed4c073938fd2dbb3036f9e72cce6b2fad8
+PODFILE CHECKSUM: c1d49c01375be0edda60080b38a7b403428e213a
 
 COCOAPODS: 1.5.3

GABoardGameGeek.podspec

@@ -20,6 +20,7 @@ to deal with the complexities of parsing and error-checking the XML.
   s.tvos.deployment_target = '9.0'
 
   s.source_files = 'GABoardGameGeek/Classes/**/*'
+  s.swift_version = '4.0'
 
   s.dependency 'Alamofire'
   s.dependency 'SWXMLHash'

GABoardGameGeek/Classes/Utils.swift

@@ -30,10 +30,10 @@ internal extension String {
      - returns: A substring that can be sorted alphabetically.
      */
     func getSortString(_ sortIndex: Int) -> String {
-        if sortIndex <= 1 || sortIndex > self.characters.count {
+        if sortIndex <= 1 || sortIndex > self.count {
             return self
         } else {
-            return self.substring(from: self.characters.index(self.startIndex, offsetBy: sortIndex - 1))
+            return String(self[self.index(self.startIndex, offsetBy: sortIndex - 1)...]);
         }
     }
 }

LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2016 Geoff Amey <gca3020@users.noreply.github.com>
+Copyright (c) 2018 Geoff Amey <gca3020@users.noreply.github.com>
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

README.md

@@ -20,7 +20,7 @@ BoardGameGeek XMLAPI2 Swift Framework for interacting with games and collections
 ## Requirements
 
 - iOS 8.0+, macOS 10.10+, tvOS 9.0+, watchOS 2.0+
-- Xcode 8.1+
+- Xcode 9.0+
 - Swift 4.0
 
 ## Dependencies