Major Refactor

MountainBuffalo · Feb 6, 2018 · 10cc599 · 10cc599
1 parent a0f6ddc
commit 10cc599
Show file tree

Hide file tree

Showing 27 changed files with 1,202 additions and 378 deletions.
diff --git a/.swift-version b/.swift-version
@@ -1 +1 @@
-3.1
+4.0
diff --git a/.travis.yml b/.travis.yml
@@ -1,16 +1,16 @@
 language: objective-c
-osx_image: xcode8.3
+osx_image: xcode9.2
 env:
   global:
   - WORKSPACE=Cacher.xcworkspace
   - IOS_FRAMEWORK_SCHEME="Cacher"
-  - IOS_SDK=iphonesimulator10.3
+  - IOS_SDK=iphonesimulator11.2
   - TVOS_FRAMEWORK_SCHEME="Cacher-tvOS"
-  - TVOS_SDK=appletvsimulator10.2
+  - TVOS_SDK=appletvsimulator11.2
 
-  matrix: 
-    - DESTINATION="OS=10.3.1,name=iPhone 7 Plus"     SCHEME="$IOS_FRAMEWORK_SCHEME"     SDK="$IOS_SDK"    EXAMPLE_SCHEME="$IOS_EXAMPLE_SCHEME"
-    - DESTINATION="OS=10.2,name=Apple TV 1080p"     SCHEME="$TVOS_FRAMEWORK_SCHEME"     SDK="$TVOS_SDK"    EXAMPLE_SCHEME="$IOS_EXAMPLE_SCHEME"
+  matrix:
+    - DESTINATION="OS=11.2,name=iPhone 7 Plus"     SCHEME="$IOS_FRAMEWORK_SCHEME"     SDK="$IOS_SDK"    EXAMPLE_SCHEME="$IOS_EXAMPLE_SCHEME"
+    - DESTINATION="OS=11.2,name=Apple TV"    SCHEME="$TVOS_FRAMEWORK_SCHEME"     SDK="$TVOS_SDK"    EXAMPLE_SCHEME="$IOS_EXAMPLE_SCHEME"
 
 script:
   - set -o pipefail

diff --git a/Cacher-Mac/Cacher.h b/Cacher-Mac/Cacher.h
@@ -15,5 +15,3 @@ FOUNDATION_EXPORT double CacherVersionNumber;
 FOUNDATION_EXPORT const unsigned char CacherVersionString[];
 
 // In this header, you should import all the public headers of your framework using statements like #import <Cacher/PublicHeader.h>
-
-#import <Cacher/NSString+Hash.h>
diff --git a/Cacher-Mac/NSImage+Utility.swift b/Cacher-Mac/NSImage+Utility.swift
@@ -12,11 +12,11 @@ public typealias UIImage = NSImage
 
 extension NSBitmapImageRep {
     var png: Data? {
-        return representation(using: .PNG, properties: [:])
+        return representation(using: .png, properties: [:])
 
     }
     func jpeg(compressionFactor: CGFloat) -> Data? {
-        return representation(using: .JPEG, properties: [NSImageCompressionFactor: compressionFactor])
+        return representation(using: .jpeg, properties: [NSImageCompressionFactor: compressionFactor])
     }
 }
 extension Data {

diff --git a/Cacher-watchOS/Cacher.h b/Cacher-watchOS/Cacher.h
@@ -15,5 +15,3 @@ FOUNDATION_EXPORT double CacherVersionNumber;
 FOUNDATION_EXPORT const unsigned char CacherVersionString[];
 
 // In this header, you should import all the public headers of your framework using statements like #import <Cacher/PublicHeader.h>
-
-#import <Cacher/NSString+Hash.h>
diff --git a/Cacher.xcodeproj/project.pbxproj b/Cacher.xcodeproj/project.pbxproj
diff --git a/Cacher.xcodeproj/xcshareddata/xcschemes/Cacher-macOS.xcscheme b/Cacher.xcodeproj/xcshareddata/xcschemes/Cacher-macOS.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0830"
+   LastUpgradeVersion = "0920"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -26,6 +26,7 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      language = ""
       shouldUseLaunchSchemeArgsEnv = "YES"
       codeCoverageEnabled = "YES">
       <Testables>
@@ -56,6 +57,7 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      language = ""
       launchStyle = "0"
       useCustomWorkingDirectory = "NO"
       ignoresPersistentStateOnLaunch = "NO"

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

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

diff --git a/Cacher.xcodeproj/xcshareddata/xcschemes/Cacher.xcscheme b/Cacher.xcodeproj/xcshareddata/xcschemes/Cacher.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0830"
+   LastUpgradeVersion = "0920"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -26,6 +26,7 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      language = ""
       shouldUseLaunchSchemeArgsEnv = "YES"
       codeCoverageEnabled = "YES">
       <Testables>
@@ -56,6 +57,7 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      language = ""
       launchStyle = "0"
       useCustomWorkingDirectory = "NO"
       ignoresPersistentStateOnLaunch = "NO"
Original file line number	Diff line number	Diff line change
Expand Up		@@ -15,5 +15,3 @@ FOUNDATION_EXPORT double CacherVersionNumber;
		FOUNDATION_EXPORT const unsigned char CacherVersionString[];

		// In this header, you should import all the public headers of your framework using statements like #import <Cacher/PublicHeader.h>

		#import <Cacher/NSString+Hash.h>