Bläddra i källkod

Fix resource loading in GoogleSignInSwift with CocoaPods use_frameworks! (#197)

mdmathias 3 år sedan
förälder
incheckning
2786deb7ae

+ 2 - 1
GoogleSignInSwift/Sources/GoogleSignInButtonBundleExtensions.swift

@@ -17,6 +17,7 @@
 #if !arch(arm) && !arch(i386)
 
 import Foundation
+import GoogleSignIn
 
 // MARK: - Bundle Extensions
 
@@ -40,7 +41,7 @@ extension Bundle {
       return Bundle(path: mainPath)
     }
 
-    let classBundle = Bundle(for: GoogleSignInButtonViewModel.self)
+    let classBundle = Bundle(for: GIDSignIn.self)
 
     if let classPath = classBundle.path(
       forResource: GoogleSignInBundleName,

+ 34 - 0
GoogleSignInSwift/Tests/Unit/GoogleSignInButtonExtensionsTests.swift

@@ -0,0 +1,34 @@
+/*
+ * Copyright 2022 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import XCTest
+import SwiftUI
+@testable import GoogleSignInSwift
+
+@available(iOS 13.0, macOS 10.15, *)
+class GoogleSignInButtonExtensionsTests: XCTestCase {
+
+  func testThatBundleExtensionReturnsImageIconURL() {
+    let googleIcon = Bundle.urlForGoogleResource(name: googleImageName, withExtension: "png")
+    XCTAssertNotNil(googleIcon)
+  }
+
+  func testThatBundleExtensionReturnsFontURL() {
+    let googleFont = Bundle.urlForGoogleResource(name: fontNameRobotoBold, withExtension: "ttf")
+    XCTAssertNotNil(googleFont)
+  }
+
+}