fix warnings and update to xcode 9.3 and bump version

SoySauceLab · Apr 12, 2018 · 54f1d95 · 54f1d95
1 parent e8af740
commit 54f1d95
Show file tree

Hide file tree

Showing 22 changed files with 36 additions and 44 deletions.
diff --git a/.swiftlint.yml b/.swiftlint.yml
@@ -16,6 +16,7 @@ identifier_name:
   min_length:
     error: 3
   excluded:
+    - i
     - id
     - at
     - to

diff --git a/Cartfile.resolved b/Cartfile.resolved
@@ -1,3 +1,3 @@
-github "Quick/Nimble" "v7.0.3"
+github "Quick/Nimble" "v7.1.0"
 github "Quick/Quick" "v1.2.0"
-github "lkzhao/YetAnotherAnimationLibrary" "1.1.0"
+github "lkzhao/YetAnotherAnimationLibrary" "1.2.0"
diff --git a/Carthage/Build/iOS/YetAnotherAnimationLibrary.framework.dSYM/Contents/Info.plist b/Carthage/Build/iOS/YetAnotherAnimationLibrary.framework.dSYM/Contents/Info.plist
diff --git a/...notherAnimationLibrary.framework.dSYM/Contents/Resources/DWARF/YetAnotherAnimationLibrary b/...notherAnimationLibrary.framework.dSYM/Contents/Resources/DWARF/YetAnotherAnimationLibrary
diff --git a/...Build/iOS/YetAnotherAnimationLibrary.framework/Headers/YetAnotherAnimationLibrary-Swift.h b/...Build/iOS/YetAnotherAnimationLibrary.framework/Headers/YetAnotherAnimationLibrary-Swift.h
diff --git a/Carthage/Build/iOS/YetAnotherAnimationLibrary.framework/Info.plist b/Carthage/Build/iOS/YetAnotherAnimationLibrary.framework/Info.plist
diff --git a/...herAnimationLibrary.framework/Modules/YetAnotherAnimationLibrary.swiftmodule/arm.swiftdoc b/...herAnimationLibrary.framework/Modules/YetAnotherAnimationLibrary.swiftmodule/arm.swiftdoc
diff --git a/...AnimationLibrary.framework/Modules/YetAnotherAnimationLibrary.swiftmodule/arm.swiftmodule b/...AnimationLibrary.framework/Modules/YetAnotherAnimationLibrary.swiftmodule/arm.swiftmodule
diff --git a/...rAnimationLibrary.framework/Modules/YetAnotherAnimationLibrary.swiftmodule/arm64.swiftdoc b/...rAnimationLibrary.framework/Modules/YetAnotherAnimationLibrary.swiftmodule/arm64.swiftdoc
diff --git a/...imationLibrary.framework/Modules/YetAnotherAnimationLibrary.swiftmodule/arm64.swiftmodule b/...imationLibrary.framework/Modules/YetAnotherAnimationLibrary.swiftmodule/arm64.swiftmodule
diff --git a/...erAnimationLibrary.framework/Modules/YetAnotherAnimationLibrary.swiftmodule/i386.swiftdoc b/...erAnimationLibrary.framework/Modules/YetAnotherAnimationLibrary.swiftmodule/i386.swiftdoc
diff --git a/...nimationLibrary.framework/Modules/YetAnotherAnimationLibrary.swiftmodule/i386.swiftmodule b/...nimationLibrary.framework/Modules/YetAnotherAnimationLibrary.swiftmodule/i386.swiftmodule
diff --git a/...AnimationLibrary.framework/Modules/YetAnotherAnimationLibrary.swiftmodule/x86_64.swiftdoc b/...AnimationLibrary.framework/Modules/YetAnotherAnimationLibrary.swiftmodule/x86_64.swiftdoc
diff --git a/...mationLibrary.framework/Modules/YetAnotherAnimationLibrary.swiftmodule/x86_64.swiftmodule b/...mationLibrary.framework/Modules/YetAnotherAnimationLibrary.swiftmodule/x86_64.swiftmodule
diff --git a/Carthage/Build/iOS/YetAnotherAnimationLibrary.framework/YetAnotherAnimationLibrary b/Carthage/Build/iOS/YetAnotherAnimationLibrary.framework/YetAnotherAnimationLibrary
diff --git a/CollectionKit.podspec b/CollectionKit.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name             = "CollectionKit"
-  s.version          = "1.2.1"
+  s.version          = "1.3.0"
   s.summary          = "A modern swift framework for building data-driven reusable collection view components."
 
   s.description      = <<-DESC

diff --git a/CollectionKit.xcodeproj/project.pbxproj b/CollectionKit.xcodeproj/project.pbxproj
@@ -559,7 +559,7 @@
 			isa = PBXProject;
 			attributes = {
 				LastSwiftUpdateCheck = 0820;
-				LastUpgradeCheck = 0900;
+				LastUpgradeCheck = 0930;
 				ORGANIZATIONNAME = lkzhao;
 				TargetAttributes = {
 					A3FC21C31C6EE5AA008566BB = {
@@ -789,12 +789,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;
@@ -842,12 +844,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;

diff --git a/CollectionKit.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/CollectionKit.xcodeproj/project.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/CollectionKit.xcodeproj/xcshareddata/xcschemes/CollectionKit.xcscheme b/CollectionKit.xcodeproj/xcshareddata/xcschemes/CollectionKit.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0900"
+   LastUpgradeVersion = "0930"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -26,9 +26,8 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      language = ""
-      shouldUseLaunchSchemeArgsEnv = "YES"
-      codeCoverageEnabled = "YES">
+      codeCoverageEnabled = "YES"
+      shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
          <TestableReference
             skipped = "NO">
@@ -57,7 +56,6 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      language = ""
       launchStyle = "0"
       useCustomWorkingDirectory = "NO"
       ignoresPersistentStateOnLaunch = "NO"

diff --git a/Examples/Supporting Files/Util.swift b/Examples/Supporting Files/Util.swift
@@ -69,8 +69,7 @@ extension CGRect {
     return CGRect(origin: .zero, size: size)
   }
   init(center: CGPoint, size: CGSize) {
-    self.origin = center - size / 2
-    self.size = size
+    self.init(origin: center - size / 2, size: size)
   }
 }
 

diff --git a/Sources/Extensions/Util.swift b/Sources/Extensions/Util.swift
@@ -118,8 +118,7 @@ extension CGRect {
     return CGRect(origin: .zero, size: size)
   }
   init(center: CGPoint, size: CGSize) {
-    self.origin = center - size / 2
-    self.size = size
+    self.init(origin: center - size / 2, size: size)
   }
   var transposed: CGRect {
     return CGRect(origin: origin.transposed, size: size.transposed)

diff --git a/Sources/Info.plist b/Sources/Info.plist
@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.2.1</string>
+	<string>1.3.0</string>
 	<key>CFBundleVersion</key>
 	<string>$(CURRENT_PROJECT_VERSION)</string>
 	<key>NSPrincipalClass</key>
-Original file line number
+Diff line change
@@ Expand Up / @@ -16,6 +16,7 @@ identifier_name: @@
       min_length:
         error: 3
       excluded:
+        - i
         - id
         - at
         - to
@@ Expand Down @@