Merge pull request #1 from ErnestMa/swift3

Swift3 support.
locationlabs · Dec 21, 2016 · 032473b · 032473b
2 parents 9b7fa4f + 6738273
commit 032473b
Show file tree

Hide file tree

Showing 30 changed files with 846 additions and 1,279 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,16 +1,16 @@
 # reference: http://www.objc.io/issue-6/travis-ci.html
 
 language: objective-c
-osx_image: xcode7.3
+osx_image: xcode8
 env:
   global:
-    - WORKSPACE=Medusa.xcworkspace
-    - SDK=iphonesimulator9.3
-    - DESTINATION="OS=9.3,name=iPhone 6S"
-    - SCHEME=Medusa
+    - WORKSPACE=Gorgon.xcworkspace
+    - SDK=iphonesimulator
+    - DESTINATION="OS=10.0,name=iPhone 6S"
+    - SCHEME=Gorgon
 script:
   - open -b com.apple.iphonesimulator # Workaround https://github.com/travis-ci/travis-ci/issues/3040
-  - xcodebuild -workspace $WORKSPACE -scheme $SCHEME -sdk $SDK -destination "$DESTINATION" -configuration Debug ONLY_ACTIVE_ARCH=NO clean test
+  - xcodebuild -workspace $WORKSPACE -scheme $SCHEME -sdk $SDK -destination "$DESTINATION" -configuration Debug ONLY_ACTIVE_ARCH=NO CODE_SIGNING_REQUIRED=NO CODE_SIGN_IDENTITY="" clean test
 notifications:
   email:
     on_success: never

diff --git a/Cartfile b/Cartfile
@@ -1 +1,2 @@
-github "Swinject/Swinject" ~> 1.1
+github "Swinject/Swinject" ~> 2.0.0-beta.2
+github "Swinject/SwinjectPropertyLoader" ~> 1.0.0-beta.2
diff --git a/Cartfile.private b/Cartfile.private
@@ -1,2 +1,2 @@
-github "Quick/Quick" ~> 0.9.2
-github "Quick/Nimble" ~> 4.1.0
+github "Quick/Quick" ~> 1.0.0
+github "Quick/Nimble" ~> 5.1.1
diff --git a/Gemfile b/Gemfile
@@ -1,4 +1,4 @@
 source 'https://rubygems.org'
 
-gem 'cocoapods', '~> 1.0.0'
+gem 'cocoapods', '~> 1.1.0'
 
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -1,32 +1,34 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    CFPropertyList (2.3.3)
-    activesupport (5.0.0.1)
-      concurrent-ruby (~> 1.0, >= 1.0.2)
+    CFPropertyList (2.3.4)
+    activesupport (4.2.7.1)
       i18n (~> 0.7)
+      json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
+      thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
     claide (1.0.1)
-    cocoapods (1.0.1)
-      activesupport (>= 4.0.2)
-      claide (>= 1.0.0, < 2.0)
-      cocoapods-core (= 1.0.1)
-      cocoapods-deintegrate (>= 1.0.0, < 2.0)
-      cocoapods-downloader (>= 1.0.0, < 2.0)
+    cocoapods (1.1.1)
+      activesupport (>= 4.0.2, < 5)
+      claide (>= 1.0.1, < 2.0)
+      cocoapods-core (= 1.1.1)
+      cocoapods-deintegrate (>= 1.0.1, < 2.0)
+      cocoapods-downloader (>= 1.1.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.0.0, < 2.0)
-      cocoapods-try (>= 1.0.0, < 2.0)
+      cocoapods-trunk (>= 1.1.1, < 2.0)
+      cocoapods-try (>= 1.1.0, < 2.0)
       colored (~> 1.2)
       escape (~> 0.0.4)
-      fourflusher (~> 0.3.0)
-      molinillo (~> 0.4.5)
+      fourflusher (~> 2.0.1)
+      gh_inspector (~> 1.0)
+      molinillo (~> 0.5.1)
       nap (~> 1.0)
-      xcodeproj (>= 1.1.0, < 2.0)
-    cocoapods-core (1.0.1)
-      activesupport (>= 4.0.2)
+      xcodeproj (>= 1.3.3, < 2.0)
+    cocoapods-core (1.1.1)
+      activesupport (>= 4.0.2, < 5)
       fuzzy_match (~> 2.0.4)
       nap (~> 1.0)
     cocoapods-deintegrate (1.0.1)
@@ -40,14 +42,15 @@ GEM
       netrc (= 0.7.8)
     cocoapods-try (1.1.0)
     colored (1.2)
-    concurrent-ruby (1.0.2)
     escape (0.0.4)
-    fourflusher (0.3.2)
+    fourflusher (2.0.1)
     fuzzy_match (2.0.4)
+    gh_inspector (1.0.2)
     i18n (0.7.0)
-    minitest (5.9.1)
-    molinillo (0.4.5)
-    nanaimo (0.2.2)
+    json (1.8.3)
+    minitest (5.10.1)
+    molinillo (0.5.4)
+    nanaimo (0.2.3)
     nap (1.1.0)
     netrc (0.7.8)
     thread_safe (0.3.5)
@@ -64,7 +67,7 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  cocoapods (~> 1.0.0)
+  cocoapods (~> 1.1.0)
 
 BUNDLED WITH
-   1.13.6
+   1.11.2
diff --git a/Medusa.podspec → Gorgon.podspec b/Medusa.podspec → Gorgon.podspec
@@ -1,7 +1,7 @@
 Pod::Spec.new do |s|
-  s.name                      = 'Medusa'
-  s.module_name               = 'Medusa'
-  s.version                   = '1.1.0'
+  s.name                      = 'Gorgon'
+  s.module_name               = 'Gorgon'
+  s.version                   = '2.0.0'
   s.summary                   = 'Application daemon framework for Single Responsibility Principle abstractions of the UIApplicationDelegate'
   s.homepage                  = 'http://www.locationlabs.com'
   s.license                   = 'APL2'
@@ -11,6 +11,7 @@ Pod::Spec.new do |s|
   s.source                    = { :git => 'https://github.com/locationlabs/Medusa.git', :tag => s.version }  
   s.source_files              = 'Sources/**/*.{h,swift}'
 
-  s.dependency 'Swinject', '~> 1.1'
+  s.dependency 'Swinject', '~> 2.0.0-beta.2'
+  s.dependency 'SwinjectPropertyLoader', '1.0.0-beta.2'
 
 end
diff --git a/Gorgon.xcodeproj/project.pbxproj b/Gorgon.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/Gorgon.xcworkspace/contents.xcworkspacedata b/Gorgon.xcworkspace/contents.xcworkspacedata
diff --git a/...oj/xcshareddata/xcschemes/Medusa.xcscheme → ...ce/xcshareddata/xcschemes/Gorgon.xcscheme b/...oj/xcshareddata/xcschemes/Medusa.xcscheme → ...ce/xcshareddata/xcschemes/Gorgon.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0730"
+   LastUpgradeVersion = "0810"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -15,9 +15,23 @@
             <BuildableReference
                BuildableIdentifier = "primary"
                BlueprintIdentifier = "903EDF061CC19DAA00AF813C"
-               BuildableName = "Medusa.framework"
-               BlueprintName = "Medusa"
-               ReferencedContainer = "container:Medusa.xcodeproj">
+               BuildableName = "Gorgon.framework"
+               BlueprintName = "Gorgon"
+               ReferencedContainer = "container:Gorgon.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "NO"
+            buildForProfiling = "NO"
+            buildForArchiving = "NO"
+            buildForAnalyzing = "NO">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "903EDF101CC19DAA00AF813C"
+               BuildableName = "GorgonTests.xctest"
+               BlueprintName = "GorgonTests"
+               ReferencedContainer = "container:Gorgon.xcodeproj">
             </BuildableReference>
          </BuildActionEntry>
       </BuildActionEntries>
@@ -33,19 +47,19 @@
             <BuildableReference
                BuildableIdentifier = "primary"
                BlueprintIdentifier = "903EDF101CC19DAA00AF813C"
-               BuildableName = "MedusaTests.xctest"
-               BlueprintName = "MedusaTests"
-               ReferencedContainer = "container:Medusa.xcodeproj">
+               BuildableName = "GorgonTests.xctest"
+               BlueprintName = "GorgonTests"
+               ReferencedContainer = "container:Gorgon.xcodeproj">
             </BuildableReference>
          </TestableReference>
       </Testables>
       <MacroExpansion>
          <BuildableReference
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "903EDF061CC19DAA00AF813C"
-            BuildableName = "Medusa.framework"
-            BlueprintName = "Medusa"
-            ReferencedContainer = "container:Medusa.xcodeproj">
+            BuildableName = "Gorgon.framework"
+            BlueprintName = "Gorgon"
+            ReferencedContainer = "container:Gorgon.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
       <AdditionalOptions>
@@ -65,9 +79,9 @@
          <BuildableReference
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "903EDF061CC19DAA00AF813C"
-            BuildableName = "Medusa.framework"
-            BlueprintName = "Medusa"
-            ReferencedContainer = "container:Medusa.xcodeproj">
+            BuildableName = "Gorgon.framework"
+            BlueprintName = "Gorgon"
+            ReferencedContainer = "container:Gorgon.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
       <AdditionalOptions>
@@ -83,9 +97,9 @@
          <BuildableReference
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "903EDF061CC19DAA00AF813C"
-            BuildableName = "Medusa.framework"
-            BlueprintName = "Medusa"
-            ReferencedContainer = "container:Medusa.xcodeproj">
+            BuildableName = "Gorgon.framework"
+            BlueprintName = "Gorgon"
+            ReferencedContainer = "container:Gorgon.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
    </ProfileAction>