Upgrade to Xcode 10.2 and Swift 5

justeat · May 3, 2019 · dd0b8e1 · dd0b8e1
1 parent dc458a4
commit dd0b8e1
Show file tree

Hide file tree

Showing 11 changed files with 92 additions and 331 deletions.
diff --git a/.xcode-version b/.xcode-version
@@ -0,0 +1 @@
+10.2
diff --git a/Example/JustPersist.xcodeproj/project.pbxproj b/Example/JustPersist.xcodeproj/project.pbxproj
diff --git a/Example/JustPersist.xcodeproj/xcshareddata/xcschemes/JustPersist-Example.xcscheme b/Example/JustPersist.xcodeproj/xcshareddata/xcschemes/JustPersist-Example.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1010"
+   LastUpgradeVersion = "1020"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -42,7 +42,7 @@
             buildForAnalyzing = "YES">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "09E4B9A839C7C0FCF8593621696E8496"
+               BlueprintIdentifier = "0E1D5C2D96243ECFA0E86C76F12A7378"
                BuildableName = "JustPersist.framework"
                BlueprintName = "JustPersist"
                ReferencedContainer = "container:Pods/Pods.xcodeproj">

diff --git a/Example/JustPersist.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings b/Example/JustPersist.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings
@@ -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>BuildSystemType</key>
+	<string>Original</string>
+</dict>
+</plist>
diff --git a/Example/Podfile b/Example/Podfile
@@ -8,12 +8,6 @@ target 'JustPersist_Example' do
   pod 'JustPersist/Skopelos', :path => '../'
   pod 'JustPersist/MagicalRecord', :path => '../'
 
-  target 'JustPersist_watchOS_Example Extension' do
-      platform :watchos, '3.0'
-      inherit! :search_paths
-
-  end
-
   target 'JustPersist_Tests' do
       inherit! :search_paths
 

diff --git a/Example/Podfile.lock b/Example/Podfile.lock
@@ -1,15 +1,15 @@
 PODS:
-  - JustPersist/Core (2.2.0)
-  - JustPersist/MagicalRecord (2.2.0):
+  - JustPersist/Core (2.5.0)
+  - JustPersist/MagicalRecord (2.5.0):
     - JustPersist/Core
     - MagicalRecord (~> 2.3.2)
-  - JustPersist/Skopelos (2.2.0):
+  - JustPersist/Skopelos (2.5.0):
     - JustPersist/Core
-    - Skopelos (~> 2.3.0)
+    - Skopelos (~> 2.4.0)
   - MagicalRecord (2.3.2):
     - MagicalRecord/Core (= 2.3.2)
   - MagicalRecord/Core (2.3.2)
-  - Skopelos (2.3.0)
+  - Skopelos (2.4.0)
 
 DEPENDENCIES:
   - JustPersist/MagicalRecord (from `../`)
@@ -25,10 +25,10 @@ EXTERNAL SOURCES:
     :path: "../"
 
 SPEC CHECKSUMS:
-  JustPersist: 3d2e8563acae8f94c26708d4edba8b25607a8d84
+  JustPersist: e44cb8090244c9f72617380d47681b710bdaf90a
   MagicalRecord: 53bed74b4323b930992a725be713e53b37d19755
-  Skopelos: 14729dc95d2764e4364015e2c1b075c49d396963
+  Skopelos: fec42040fad49a0fa2e52959e18178800e652aeb
 
-PODFILE CHECKSUM: acfed7b36ff8e44a0079cefd995ae918e8f70565
+PODFILE CHECKSUM: 5a9f15813f9b273556ce01c6b7137a3a6386420f
 
-COCOAPODS: 1.5.3
+COCOAPODS: 1.6.1
diff --git a/Gemfile b/Gemfile
@@ -1,6 +1,7 @@
-ruby '2.5.1'
+ruby '2.5.3'
 
 source 'https://rubygems.org'
 
-gem 'cocoapods', '~> 1.5.3'
-gem 'fastlane', '~> 2.108.0'
+gem 'cocoapods', '1.6.1'
+gem 'fastlane', '~> 2.112.0'
+gem 'xcode-install', '~> 2.5.0'
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -2,45 +2,45 @@ GEM
   remote: https://rubygems.org/
   specs:
     CFPropertyList (3.0.0)
-    activesupport (4.2.11)
+    activesupport (4.2.11.1)
       i18n (~> 0.7)
       minitest (~> 5.1)
       thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
-    addressable (2.5.2)
+    addressable (2.6.0)
       public_suffix (>= 2.0.2, < 4.0)
     atomos (0.1.3)
     babosa (1.0.2)
     claide (1.0.2)
-    cocoapods (1.5.3)
+    cocoapods (1.6.1)
       activesupport (>= 4.0.2, < 5)
       claide (>= 1.0.2, < 2.0)
-      cocoapods-core (= 1.5.3)
+      cocoapods-core (= 1.6.1)
       cocoapods-deintegrate (>= 1.0.2, < 2.0)
-      cocoapods-downloader (>= 1.2.0, < 2.0)
+      cocoapods-downloader (>= 1.2.2, < 2.0)
       cocoapods-plugins (>= 1.0.0, < 2.0)
       cocoapods-search (>= 1.0.0, < 2.0)
       cocoapods-stats (>= 1.0.0, < 2.0)
-      cocoapods-trunk (>= 1.3.0, < 2.0)
+      cocoapods-trunk (>= 1.3.1, < 2.0)
       cocoapods-try (>= 1.1.0, < 2.0)
       colored2 (~> 3.1)
       escape (~> 0.0.4)
-      fourflusher (~> 2.0.1)
+      fourflusher (>= 2.2.0, < 3.0)
       gh_inspector (~> 1.0)
-      molinillo (~> 0.6.5)
+      molinillo (~> 0.6.6)
       nap (~> 1.0)
-      ruby-macho (~> 1.1)
-      xcodeproj (>= 1.5.7, < 2.0)
-    cocoapods-core (1.5.3)
+      ruby-macho (~> 1.4)
+      xcodeproj (>= 1.8.1, < 2.0)
+    cocoapods-core (1.6.1)
       activesupport (>= 4.0.2, < 6)
       fuzzy_match (~> 2.0.4)
       nap (~> 1.0)
-    cocoapods-deintegrate (1.0.2)
+    cocoapods-deintegrate (1.0.4)
     cocoapods-downloader (1.2.2)
     cocoapods-plugins (1.0.0)
       nap
     cocoapods-search (1.0.0)
-    cocoapods-stats (1.0.0)
+    cocoapods-stats (1.1.0)
     cocoapods-trunk (1.3.1)
       nap (>= 0.8, < 2.0)
       netrc (~> 0.11)
@@ -49,24 +49,25 @@ GEM
     colored2 (3.1.2)
     commander-fastlane (4.4.6)
       highline (~> 1.7.2)
-    concurrent-ruby (1.1.3)
+    concurrent-ruby (1.1.5)
     declarative (0.0.10)
     declarative-option (0.1.0)
+    digest-crc (0.4.1)
     domain_name (0.5.20180417)
       unf (>= 0.0.5, < 1.0.0)
-    dotenv (2.5.0)
+    dotenv (2.7.2)
     emoji_regex (0.1.1)
     escape (0.0.4)
-    excon (0.62.0)
+    excon (0.64.0)
     faraday (0.15.4)
       multipart-post (>= 1.2, < 3)
     faraday-cookie_jar (0.0.6)
       faraday (>= 0.7.4)
       http-cookie (~> 1.0.0)
-    faraday_middleware (0.12.2)
+    faraday_middleware (0.13.1)
       faraday (>= 0.7.4, < 1.0)
     fastimage (2.1.5)
-    fastlane (2.108.0)
+    fastlane (2.112.0)
       CFPropertyList (>= 2.3, < 4.0.0)
       addressable (>= 2.3, < 3.0.0)
       babosa (>= 1.0.2, < 2.0.0)
@@ -82,6 +83,7 @@ GEM
       fastimage (>= 2.1.0, < 3.0.0)
       gh_inspector (>= 1.1.2, < 2.0.0)
       google-api-client (>= 0.21.2, < 0.24.0)
+      google-cloud-storage (>= 1.15.0, < 2.0.0)
       highline (>= 1.7.2, < 2.0.0)
       json (< 3.0.0)
       mini_magick (~> 4.5.1)
@@ -102,7 +104,7 @@ GEM
       xcodeproj (>= 1.6.0, < 2.0.0)
       xcpretty (~> 0.3.0)
       xcpretty-travis-formatter (>= 0.0.3)
-    fourflusher (2.0.1)
+    fourflusher (2.2.0)
     fuzzy_match (2.0.4)
     gh_inspector (1.1.3)
     google-api-client (0.23.9)
@@ -113,6 +115,15 @@ GEM
       representable (~> 3.0)
       retriable (>= 2.0, < 4.0)
       signet (~> 0.9)
+    google-cloud-core (1.3.0)
+      google-cloud-env (~> 1.0)
+    google-cloud-env (1.0.5)
+      faraday (~> 0.11)
+    google-cloud-storage (1.16.0)
+      digest-crc (~> 0.4)
+      google-api-client (~> 0.23)
+      google-cloud-core (~> 1.2)
+      googleauth (>= 0.6.2, < 0.10.0)
     googleauth (0.6.7)
       faraday (~> 0.12)
       jwt (>= 1.4, < 3.0)
@@ -126,12 +137,12 @@ GEM
     httpclient (2.8.3)
     i18n (0.9.5)
       concurrent-ruby (~> 1.0)
-    json (2.1.0)
+    json (2.2.0)
     jwt (2.1.0)
     memoist (0.16.0)
     mime-types (3.2.2)
       mime-types-data (~> 3.2015)
-    mime-types-data (3.2018.0812)
+    mime-types-data (3.2019.0331)
     mini_magick (4.5.1)
     minitest (5.11.3)
     molinillo (0.6.6)
@@ -142,16 +153,16 @@ GEM
     nap (1.1.0)
     naturally (2.2.0)
     netrc (0.11.0)
-    os (1.0.0)
-    plist (3.4.0)
+    os (1.0.1)
+    plist (3.5.0)
     public_suffix (2.0.5)
     representable (3.0.4)
       declarative (< 0.1.0)
       declarative-option (< 0.2.0)
       uber (< 0.2.0)
     retriable (3.1.2)
     rouge (2.0.7)
-    ruby-macho (1.3.1)
+    ruby-macho (1.4.0)
     rubyzip (1.2.2)
     security (0.1.3)
     signet (0.11.0)
@@ -167,19 +178,22 @@ GEM
     terminal-table (1.8.0)
       unicode-display_width (~> 1.1, >= 1.1.1)
     thread_safe (0.3.6)
-    tty-cursor (0.6.0)
+    tty-cursor (0.6.1)
     tty-screen (0.6.5)
-    tty-spinner (0.8.0)
-      tty-cursor (>= 0.5.0)
+    tty-spinner (0.9.0)
+      tty-cursor (~> 0.6.0)
     tzinfo (1.2.5)
       thread_safe (~> 0.1)
     uber (0.1.0)
     unf (0.1.4)
       unf_ext
-    unf_ext (0.0.7.5)
-    unicode-display_width (1.4.0)
+    unf_ext (0.0.7.6)
+    unicode-display_width (1.5.0)
     word_wrap (1.0.0)
-    xcodeproj (1.7.0)
+    xcode-install (2.5.0)
+      claide (>= 0.9.1, < 1.1.0)
+      fastlane (>= 2.1.0, < 3.0.0)
+    xcodeproj (1.8.2)
       CFPropertyList (>= 2.3.3, < 4.0)
       atomos (~> 0.1.3)
       claide (>= 1.0.2, < 2.0)
@@ -194,11 +208,12 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  cocoapods (~> 1.5.3)
-  fastlane (~> 2.108.0)
+  cocoapods (= 1.6.1)
+  fastlane (~> 2.112.0)
+  xcode-install (~> 2.5.0)
 
 RUBY VERSION
-   ruby 2.5.1p57
+   ruby 2.5.3p105
 
 BUNDLED WITH
-   1.16.2
+   1.16.6
diff --git a/JustPersist.podspec b/JustPersist.podspec
@@ -8,7 +8,7 @@
 
 Pod::Spec.new do |s|
   s.name             = 'JustPersist'
-  s.version          = '2.3.0'
+  s.version          = '2.5.0'
   s.summary          = 'JustPersist is the easiest and safest way to do persistence on iOS with Core Data support out of the box. It also allows you to migrate to any other persistence framework with minimal effort.'
 
   s.description      = "<<-DESC
@@ -25,7 +25,7 @@ At it's core, JustPersist is a persistence layer with a clear and simple interfa
   s.social_media_url = 'https://twitter.com/justeat_tech'
 
   s.ios.deployment_target = '10.0'
-  s.swift_version = '4.2'
+  s.swift_version = '5.0'
 
   s.frameworks = 'Foundation', 'CoreData'
 
@@ -37,7 +37,7 @@ At it's core, JustPersist is a persistence layer with a clear and simple interfa
 
   s.subspec 'Skopelos' do |ss|
     ss.dependency 'JustPersist/Core'
-    ss.dependency 'Skopelos', '~> 2.3.0'
+    ss.dependency 'Skopelos', '~> 2.4.0'
     ss.source_files = 'JustPersist/Classes/Wrappers/Skopelos/*'
   end
 

diff --git a/JustPersist/Classes/Wrappers/Skopelos/SkopelosClient.swift b/JustPersist/Classes/Wrappers/Skopelos/SkopelosClient.swift
@@ -20,7 +20,7 @@ class SkopelosClient: Skopelos {
 
     weak var delegate: SkopelosClientDelegate?
 
-    override func handle(error: NSError) {
+    func handle(error: NSError) {
         DispatchQueue.main.async {
             self.delegate?.handle(error)
         }

diff --git a/README.md b/README.md
@@ -2,7 +2,7 @@
 
 # JustPersist
 
-[![Build Status](https://www.bitrise.io/app/2a464ef14bd688df.svg?token=G_Hb4MMemkknV4YcCD4CsA&branch=develop)](https://www.bitrise.io/app/2a464ef14bd688df)
+[![Build Status](https://app.bitrise.io/app/2a464ef14bd688df/status.svg?token=G_Hb4MMemkknV4YcCD4CsA&branch=master)](https://app.bitrise.io/app/2a464ef14bd688df)
 [![Version](https://img.shields.io/cocoapods/v/JustPersist.svg?style=flat)](http://cocoapods.org/pods/JustPersist)
 [![License](https://img.shields.io/cocoapods/l/JustPersist.svg?style=flat)](http://cocoapods.org/pods/JustPersist)
 [![Platform](https://img.shields.io/cocoapods/p/JustPersist.svg?style=flat)](http://cocoapods.org/pods/JustPersist)