Update ResourceApp for Xcode 10 / Cocoapods update

iStorry · Jun 23, 2018 · dc51bad · dc51bad
1 parent 3110c46
commit dc51bad
Show file tree

Hide file tree

Showing 8 changed files with 29 additions and 9 deletions.
diff --git a/Podfile b/Podfile
@@ -10,12 +10,17 @@ abstract_target 'Shared' do
   # pod 'R.swift.Library', :path => '../R.swift.Library' # for development
 
   target 'ResourceApp' do
+    platform :ios, '9.0'
+
     pod 'SWRevealViewController'
   end
   target 'ResourceAppTests' do
+    platform :ios, '9.0'
+
     pod 'SWRevealViewController'
   end
-  target 'ResourceApp-tvOS'
-
+  target 'ResourceApp-tvOS' do
+    platform :tvos, '9.0'
+  end
 end
 
diff --git a/Podfile.lock b/Podfile.lock
@@ -7,7 +7,7 @@ DEPENDENCIES:
   - SWRevealViewController
 
 SPEC REPOS:
-  https://github.com/CocoaPods/Specs.git:
+  https://github.com/cocoapods/specs.git:
     - SWRevealViewController
 
 EXTERNAL SOURCES:
@@ -23,6 +23,6 @@ SPEC CHECKSUMS:
   R.swift.Library: cb1ffb8ad84a275486e72b834e6d4bf48b59d11b
   SWRevealViewController: 6d3fd97f70112fd7cef9de14df4260eacce4c63a
 
-PODFILE CHECKSUM: 640b6894921f1b87a1f681177c36809540607ed8
+PODFILE CHECKSUM: 60ef58c3328649cce6ac12481f40d26d722e5079
 
-COCOAPODS: 1.5.0
+COCOAPODS: 1.5.3
diff --git a/R.swift.podspec b/R.swift.podspec
@@ -26,7 +26,7 @@ Pod::Spec.new do |spec|
   spec.ios.deployment_target     = '8.0'
   spec.tvos.deployment_target    = '9.0'
 
-  spec.dependency "R.swift.Library", "~> 4.0.0"
+  spec.dependency "R.swift.Library", "~> 5.0.0.alpha.1"
 
   spec.preserve_paths = "rswift"
 

diff --git a/ResourceApp/ResourceApp.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/ResourceApp/ResourceApp.xcodeproj/project.xcworkspace/contents.xcworkspacedata
diff --git a/ResourceApp/ResourceApp.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/ResourceApp/ResourceApp.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/ResourceApp/ResourceApp.xcodeproj/xcshareddata/xcschemes/ResourceApp-tvOS.xcscheme b/ResourceApp/ResourceApp.xcodeproj/xcshareddata/xcschemes/ResourceApp-tvOS.xcscheme
@@ -29,7 +29,8 @@
       shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
          <TestableReference
-            skipped = "NO">
+            skipped = "NO"
+            testExecutionOrdering = "random">
             <BuildableReference
                BuildableIdentifier = "primary"
                BlueprintIdentifier = "DEF559AA1CA48892009B8C51"

diff --git a/ResourceApp/ResourceApp.xcodeproj/xcshareddata/xcschemes/ResourceApp.xcscheme b/ResourceApp/ResourceApp.xcodeproj/xcshareddata/xcschemes/ResourceApp.xcscheme
@@ -30,7 +30,6 @@
       <Testables>
          <TestableReference
             skipped = "NO"
-            parallelizable = "YES"
             testExecutionOrdering = "random">
             <BuildableReference
                BuildableIdentifier = "primary"

diff --git a/Sources/rswift/Rswift.swift b/Sources/rswift/Rswift.swift
@@ -10,6 +10,6 @@
 import Foundation
 
 struct Rswift {
-  static let version = "4.0.0"
+  static let version = "5.0.0.alpha.1"
   static let resourceFileName = "R.generated.swift"
 }