tvOS fixes for Swift 3

Minlison · Aug 24, 2016 · 580a1d9 · 580a1d9
1 parent 2721704
commit 580a1d9
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/Podfile.lock b/Podfile.lock
@@ -1,15 +1,15 @@
 PODS:
-  - R.swift.Library (2.3.0)
+  - R.swift.Library (3.0.0.beta.1)
 
 DEPENDENCIES:
   - R.swift.Library (from `./R.swift.Library`)
 
 EXTERNAL SOURCES:
   R.swift.Library:
-    :path: "./R.swift.Library"
+    :path: ./R.swift.Library
 
 SPEC CHECKSUMS:
-  R.swift.Library: 75df6abfd22492c852136c4d7b6a9ca21664772a
+  R.swift.Library: a95a41bdd4420dd27c2c2c709b0f35d0b2b05224
 
 PODFILE CHECKSUM: 7cd35a355bad243c7a21d1bbcec5bf669a3e93b7
 

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", "~> 2.3.0"
+  spec.dependency "R.swift.Library", "~> 3.0.0.beta.1"
 
   spec.preserve_paths = "rswift"
 

diff --git a/R.swift/version.swift b/R.swift/version.swift
@@ -8,4 +8,4 @@
 
 import Foundation
 
-let version = "2.5.0"
+let version = "3.0.0.beta.1"
diff --git a/ResourceApp/ResourceAppTests-tvOS/ResourceAppTests_tvOS.swift b/ResourceApp/ResourceAppTests-tvOS/ResourceAppTests_tvOS.swift
@@ -16,14 +16,14 @@ class ResourceAppTests_tvOS: XCTestCase {
   ]
 
   func testWarningsAreLogged() {
-    guard let logURL = NSBundle(forClass: ResourceAppTests_tvOS.self).URLForResource("rswift-tv", withExtension: "log") else {
+    guard let logURL = Bundle(for: ResourceAppTests_tvOS.self).url(forResource: "rswift-tv", withExtension: "log") else {
       XCTFail("File rswift.log not found")
       return
     }
 
     do {
-      let logContent = try String(contentsOfURL: logURL)
-      let logLines = logContent.componentsSeparatedByString("\n")
+      let logContent = try String(contentsOf: logURL)
+      let logLines = logContent.components(separatedBy: "\n")
 
       for warning in expectedWarnings {
         XCTAssertTrue(logLines.contains(warning), "Warning is not logged: '\(warning)'")
Original file line number	Diff line number	Diff line change
Expand Up		@@ -8,4 +8,4 @@

		import Foundation

		let version = "2.5.0"
		let version = "3.0.0.beta.1"