[api/swift-3] A few improvements

modo-studio · Sep 24, 2016 · cf7fb86 · cf7fb86
1 parent d1890b0
commit cf7fb86
Show file tree

Hide file tree

Showing 282 changed files with 1,232 additions and 81,065 deletions.
diff --git a/Example/Podfile b/Example/Podfile
@@ -0,0 +1,17 @@
+use_frameworks!
+
+target 'SugarRecord_Example' do
+  pod 'SnapKit'
+  pod 'SugarRecord', :path => "../"
+  pod 'SugarRecord/CoreData', :path => "../"
+  pod 'SugarRecord/CoreData+iCloud', :path => "../"
+  pod 'SugarRecord/Realm', :path => "../"
+
+  target 'SugarRecord_Tests' do
+    inherit! :search_paths
+    pod 'Quick', "~> 0.10"
+    pod 'Nimble', '~> 5.0'
+    pod "OHHTTPStubs"
+    pod 'OHHTTPStubs/Swift'
+  end
+end
diff --git a/Examples/Pods/Manifest.lock → Example/Podfile.lock b/Examples/Pods/Manifest.lock → Example/Podfile.lock
@@ -15,59 +15,51 @@ PODS:
   - OHHTTPStubs/OHPathHelpers (5.2.1)
   - OHHTTPStubs/Swift (5.2.1):
     - OHHTTPStubs/Core
-  - Quick (0.9.3)
+  - Quick (0.10.0)
   - Realm (1.1.0):
     - Realm/Headers (= 1.1.0)
   - Realm/Headers (1.1.0)
   - RealmSwift (1.1.0):
     - Realm (= 1.1.0)
   - Result (3.0.0)
   - SnapKit (3.0.1)
-  - SugarRecord (2.3.1):
-    - SugarRecord/CoreData (= 2.3.1)
-    - SugarRecord/CoreData+iCloud (= 2.3.1)
-    - SugarRecord/Realm (= 2.3.1)
-  - SugarRecord/CoreData (2.3.1):
+  - SugarRecord (3.0.0-alpha.1):
+    - SugarRecord/CoreData (= 3.0.0-alpha.1)
+    - SugarRecord/CoreData+iCloud (= 3.0.0-alpha.1)
+    - SugarRecord/Realm (= 3.0.0-alpha.1)
+  - SugarRecord/CoreData (3.0.0-alpha.1):
     - Result (~> 3.0)
-  - SugarRecord/CoreData+iCloud (2.3.1):
+  - SugarRecord/CoreData+iCloud (3.0.0-alpha.1):
     - Result (~> 3.0)
-  - SugarRecord/Realm (2.3.1):
+  - SugarRecord/Realm (3.0.0-alpha.1):
     - RealmSwift (~> 1.1)
     - Result (~> 3.0)
 
 DEPENDENCIES:
   - Nimble (~> 5.0)
   - OHHTTPStubs
   - OHHTTPStubs/Swift
-  - Quick (from `https://github.com/quick/quick.git`, branch `swift-3.0`)
+  - Quick (~> 0.10)
   - SnapKit
   - SugarRecord (from `../`)
   - SugarRecord/CoreData (from `../`)
   - SugarRecord/CoreData+iCloud (from `../`)
   - SugarRecord/Realm (from `../`)
 
 EXTERNAL SOURCES:
-  Quick:
-    :branch: swift-3.0
-    :git: https://github.com/quick/quick.git
   SugarRecord:
     :path: "../"
 
-CHECKOUT OPTIONS:
-  Quick:
-    :commit: 36ebbc75e093c7553a5145ed5dd21484364cd78d
-    :git: https://github.com/quick/quick.git
-
 SPEC CHECKSUMS:
   Nimble: 56fc9f5020effa2206de22c3dd910f4fb011b92f
   OHHTTPStubs: 3a42f25c00563b71355ac73112ba2324e9e6cef4
-  Quick: 31fb576b6cbb6b028cc5e0016e4366accbb346f5
+  Quick: 5d290df1c69d5ee2f0729956dcf0fd9a30447eaa
   Realm: ceecf1a4540c4ce9efe196fe73fa9855bce05bd8
   RealmSwift: 838058b2db95b12cb86bd0cf209df642c33fb60a
   Result: 1b3e431f37cbcd3ad89c6aa9ab0ae55515fae3b6
   SnapKit: f818b8326d45b4e1c777d0ab27b5c0a3624bfdeb
-  SugarRecord: 7c972754f31c77561828534c3779166f4334ebd6
+  SugarRecord: 13f9d029c077dea63c7f7240dd401ac4af15a84c
 
-PODFILE CHECKSUM: dd311db187c6a1e0623852ea09855f7131cbe784
+PODFILE CHECKSUM: c28325f8c0994a48bbc35011f2de3d55cca790a4
 
 COCOAPODS: 1.1.0.rc.2
diff --git a/Example/SugarRecord.xcodeproj/project.pbxproj b/Example/SugarRecord.xcodeproj/project.pbxproj
diff --git a/...ject.xcworkspace/contents.xcworkspacedata → ...ject.xcworkspace/contents.xcworkspacedata b/...ject.xcworkspace/contents.xcworkspacedata → ...ject.xcworkspace/contents.xcworkspacedata
diff --git a/.../xcshareddata/xcschemes/Examples.xcscheme → ...ta/xcschemes/SugarRecord-Example.xcscheme b/.../xcshareddata/xcschemes/Examples.xcscheme → ...ta/xcschemes/SugarRecord-Example.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0800"
+   LastUpgradeVersion = "0720"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -14,10 +14,24 @@
             buildForAnalyzing = "YES">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "23C453141D7789A900483DB4"
-               BuildableName = "Examples.app"
-               BlueprintName = "Examples"
-               ReferencedContainer = "container:Examples.xcodeproj">
+               BlueprintIdentifier = "607FACCF1AFB9204008FA782"
+               BuildableName = "SugarRecord_Example.app"
+               BlueprintName = "SugarRecord_Example"
+               ReferencedContainer = "container:SugarRecord.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "NO"
+            buildForArchiving = "NO"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "607FACE41AFB9204008FA782"
+               BuildableName = "SugarRecord_Tests.xctest"
+               BlueprintName = "SugarRecord_Tests"
+               ReferencedContainer = "container:SugarRecord.xcodeproj">
             </BuildableReference>
          </BuildActionEntry>
       </BuildActionEntries>
@@ -28,14 +42,24 @@
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
+         <TestableReference
+            skipped = "NO">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "607FACE41AFB9204008FA782"
+               BuildableName = "SugarRecord_Tests.xctest"
+               BlueprintName = "SugarRecord_Tests"
+               ReferencedContainer = "container:SugarRecord.xcodeproj">
+            </BuildableReference>
+         </TestableReference>
       </Testables>
       <MacroExpansion>
          <BuildableReference
             BuildableIdentifier = "primary"
-            BlueprintIdentifier = "23C453141D7789A900483DB4"
-            BuildableName = "Examples.app"
-            BlueprintName = "Examples"
-            ReferencedContainer = "container:Examples.xcodeproj">
+            BlueprintIdentifier = "607FACCF1AFB9204008FA782"
+            BuildableName = "SugarRecord_Example.app"
+            BlueprintName = "SugarRecord_Example"
+            ReferencedContainer = "container:SugarRecord.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
       <AdditionalOptions>
@@ -55,10 +79,10 @@
          runnableDebuggingMode = "0">
          <BuildableReference
             BuildableIdentifier = "primary"
-            BlueprintIdentifier = "23C453141D7789A900483DB4"
-            BuildableName = "Examples.app"
-            BlueprintName = "Examples"
-            ReferencedContainer = "container:Examples.xcodeproj">
+            BlueprintIdentifier = "607FACCF1AFB9204008FA782"
+            BuildableName = "SugarRecord_Example.app"
+            BlueprintName = "SugarRecord_Example"
+            ReferencedContainer = "container:SugarRecord.xcodeproj">
          </BuildableReference>
       </BuildableProductRunnable>
       <AdditionalOptions>
@@ -74,10 +98,10 @@
          runnableDebuggingMode = "0">
          <BuildableReference
             BuildableIdentifier = "primary"
-            BlueprintIdentifier = "23C453141D7789A900483DB4"
-            BuildableName = "Examples.app"
-            BlueprintName = "Examples"
-            ReferencedContainer = "container:Examples.xcodeproj">
+            BlueprintIdentifier = "607FACCF1AFB9204008FA782"
+            BuildableName = "SugarRecord_Example.app"
+            BlueprintName = "SugarRecord_Example"
+            ReferencedContainer = "container:SugarRecord.xcodeproj">
          </BuildableReference>
       </BuildableProductRunnable>
    </ProfileAction>

diff --git a/...roj/xcshareddata/xcschemes/Tests.xcscheme → ...data/xcschemes/SugarRecord_Tests.xcscheme b/...roj/xcshareddata/xcschemes/Tests.xcscheme → ...data/xcschemes/SugarRecord_Tests.xcscheme
@@ -16,10 +16,10 @@
             skipped = "NO">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "23EA8C971D6E1550008333A4"
-               BuildableName = "Tests.xctest"
-               BlueprintName = "Tests"
-               ReferencedContainer = "container:Examples.xcodeproj">
+               BlueprintIdentifier = "607FACE41AFB9204008FA782"
+               BuildableName = "SugarRecord_Tests.xctest"
+               BlueprintName = "SugarRecord_Tests"
+               ReferencedContainer = "container:SugarRecord.xcodeproj">
             </BuildableReference>
          </TestableReference>
       </Testables>

diff --git a/...ples.xcworkspace/contents.xcworkspacedata → ...cord.xcworkspace/contents.xcworkspacedata b/...ples.xcworkspace/contents.xcworkspacedata → ...cord.xcworkspace/contents.xcworkspacedata
diff --git a/Examples/Examples/Info.plist → Example/SugarRecord/Info.plist b/Examples/Examples/Info.plist → Example/SugarRecord/Info.plist
@@ -32,7 +32,6 @@
 	<array>
 		<string>UIInterfaceOrientationPortrait</string>
 		<string>UIInterfaceOrientationLandscapeLeft</string>
-		<string>UIInterfaceOrientationLandscapeRight</string>
 	</array>
 </dict>
 </plist>
diff --git a/...xcassets/AppIcon.appiconset/Contents.json → ...xcassets/AppIcon.appiconset/Contents.json b/...xcassets/AppIcon.appiconset/Contents.json → ...xcassets/AppIcon.appiconset/Contents.json
diff --git a/...c.xcdatamodeld/Basic.xcdatamodel/contents → ...c.xcdatamodeld/Basic.xcdatamodel/contents b/...c.xcdatamodeld/Basic.xcdatamodel/contents → ...c.xcdatamodeld/Basic.xcdatamodel/contents
diff --git a/...urces/Storyboards/LaunchScreen.storyboard → ...urces/Storyboards/LaunchScreen.storyboard b/...urces/Storyboards/LaunchScreen.storyboard → ...urces/Storyboards/LaunchScreen.storyboard
diff --git a/...les/Examples/Source/App/AppDelegate.swift → .../SugarRecord/Source/App/AppDelegate.swift b/...les/Examples/Source/App/AppDelegate.swift → .../SugarRecord/Source/App/AppDelegate.swift
diff --git a/...es/CoreData/Basic/CoreDataBasicView.swift → ...es/CoreData/Basic/CoreDataBasicView.swift b/...es/CoreData/Basic/CoreDataBasicView.swift → ...es/CoreData/Basic/CoreDataBasicView.swift
@@ -7,9 +7,9 @@ class CoreDataBasicView: UIViewController, UITableViewDelegate, UITableViewDataS
 
     // MARK: - Attributes
     lazy var db: CoreDataDefaultStorage = {
-        let store = CoreData.Store.Named("cd_basic")
+        let store = CoreDataStore.named("cd_basic")
         let bundle = Bundle(for: CoreDataBasicView.classForCoder())
-        let model = CoreData.ObjectModel.Merged([bundle])
+        let model = CoreDataObjectModel.merged([bundle])
         let defaultStorage = try! CoreDataDefaultStorage(store: store, model: model)
         return defaultStorage
     }()
@@ -123,6 +123,6 @@ class CoreDataBasicView: UIViewController, UITableViewDelegate, UITableViewDataS
     // MARK: - Private
 
     fileprivate func updateData() {
-        self.entities = try! db.fetch(Request<BasicObject>()).map(CoreDataBasicEntity.init)
+        self.entities = try! db.fetch(FetchRequest<BasicObject>()).map(CoreDataBasicEntity.init)
     }
 }
diff --git a/...xamples/CoreData/Models/BasicObject.swift → ...xamples/CoreData/Models/BasicObject.swift b/...xamples/CoreData/Models/BasicObject.swift → ...xamples/CoreData/Models/BasicObject.swift
diff --git a/...CoreData/Models/CoreDataBasicEntity.swift → ...CoreData/Models/CoreDataBasicEntity.swift b/...CoreData/Models/CoreDataBasicEntity.swift → ...CoreData/Models/CoreDataBasicEntity.swift
diff --git a/...Examples/Realm/Basic/RealmBasicView.swift → ...Examples/Realm/Basic/RealmBasicView.swift b/...Examples/Realm/Basic/RealmBasicView.swift → ...Examples/Realm/Basic/RealmBasicView.swift
@@ -122,6 +122,6 @@ class RealmBasicView: UIViewController, UITableViewDelegate, UITableViewDataSour
     // MARK: - Private
 
     fileprivate func updateData() {
-        self.entities = try! db.fetch(Request<RealmBasicObject>()).map(RealmBasicEntity.init)
+        self.entities = try! db.fetch(FetchRequest<RealmBasicObject>()).map(RealmBasicEntity.init)
     }
 }
diff --git a/...mples/Realm/Models/RealmBasicEntity.swift → ...mples/Realm/Models/RealmBasicEntity.swift b/...mples/Realm/Models/RealmBasicEntity.swift → ...mples/Realm/Models/RealmBasicEntity.swift
diff --git a/...mples/Realm/Models/RealmBasicObject.swift → ...mples/Realm/Models/RealmBasicObject.swift b/...mples/Realm/Models/RealmBasicObject.swift → ...mples/Realm/Models/RealmBasicObject.swift
diff --git a/...s/Examples/Source/Helpers/Directory.swift → ...ugarRecord/Source/Helpers/Directory.swift b/...s/Examples/Source/Helpers/Directory.swift → ...ugarRecord/Source/Helpers/Directory.swift
diff --git a/...ples/Examples/Source/Helpers/Random.swift → ...e/SugarRecord/Source/Helpers/Random.swift b/...ples/Examples/Source/Helpers/Random.swift → ...e/SugarRecord/Source/Helpers/Random.swift
diff --git a/...Examples/Source/Main/ViewController.swift → ...arRecord/Source/Main/ViewController.swift b/...Examples/Source/Main/ViewController.swift → ...arRecord/Source/Main/ViewController.swift
diff --git a/Examples/iOS/Info.plist → Example/Tests/Info.plist b/Examples/iOS/Info.plist → Example/Tests/Info.plist