From adbde820c8763f6c3265aeee467520db6b76bbe3 Mon Sep 17 00:00:00 2001
From: Andrew Heard <andrewheard@google.com>
Date: Thu, 20 Jun 2024 11:04:55 -0400
Subject: [PATCH 1/3] [MLModelDownloader] Use FirebaseLogger instead of
 GULLoggerWrapper

---
 FirebaseCore/Extension/FIRLogger.h            |  4 +---
 .../Sources/DeviceLogger.swift                | 19 +++++--------------
 .../Tests/Unit/ModelDownloaderUnitTests.swift |  1 -
 Package.swift                                 |  2 +-
 4 files changed, 7 insertions(+), 19 deletions(-)

diff --git a/FirebaseCore/Extension/FIRLogger.h b/FirebaseCore/Extension/FIRLogger.h
index 41c5653669f..2e72099f17b 100644
--- a/FirebaseCore/Extension/FIRLogger.h
+++ b/FirebaseCore/Extension/FIRLogger.h
@@ -181,12 +181,10 @@ NS_SWIFT_NAME(FirebaseLogger)
 ///   three-character service identifier and a six digit integer message ID that is unique within
 ///   the service. An example of the message code is @"I-COR000001".
 ///   - message: Formatted string to be used as the log's message.
-///   - args: Arguments list obtained from calling `va_start`, used when message is a format string.
 + (void)logWithLevel:(FIRLoggerLevel)level
              service:(FIRLoggerService)service
                 code:(NSString *)code
-             message:(NSString *)message
-    __attribute__((__swift_name__("log(level:service:code:message:)")));
+             message:(NSString *)message NS_SWIFT_NAME(log(level:service:code:message:));
 
 @end
 
diff --git a/FirebaseMLModelDownloader/Sources/DeviceLogger.swift b/FirebaseMLModelDownloader/Sources/DeviceLogger.swift
index fc82b225414..06a040e1f59 100644
--- a/FirebaseMLModelDownloader/Sources/DeviceLogger.swift
+++ b/FirebaseMLModelDownloader/Sources/DeviceLogger.swift
@@ -13,11 +13,8 @@
 // limitations under the License.
 
 import Foundation
-#if SWIFT_PACKAGE
-  @_implementationOnly import GoogleUtilities_Logger
-#else
-  @_implementationOnly import GoogleUtilities
-#endif
+
+@_implementationOnly import FirebaseCoreExtension
 
 /// Enum of log messages.
 enum LoggerMessageCode: Int {
@@ -76,15 +73,9 @@ enum DeviceLogger {
   /// Log identifier.
   static let service = "[Firebase/MLModelDownloader]"
 
-  static func logEvent(level: GoogleLoggerLevel, message: String, messageCode: LoggerMessageCode) {
+  static func logEvent(level: FirebaseLoggerLevel, message: String,
+                       messageCode: LoggerMessageCode) {
     let code = String(format: "I-MLM%06d", messageCode.rawValue)
-    let args: [CVarArg] = []
-    GULLoggerWrapper.log(
-      with: level,
-      withService: DeviceLogger.service,
-      withCode: code,
-      withMessage: message,
-      withArgs: getVaList(args)
-    )
+    FirebaseLogger.log(level: level, service: DeviceLogger.service, code: code, message: message)
   }
 }
diff --git a/FirebaseMLModelDownloader/Tests/Unit/ModelDownloaderUnitTests.swift b/FirebaseMLModelDownloader/Tests/Unit/ModelDownloaderUnitTests.swift
index b7bec11c323..5bced9b6744 100644
--- a/FirebaseMLModelDownloader/Tests/Unit/ModelDownloaderUnitTests.swift
+++ b/FirebaseMLModelDownloader/Tests/Unit/ModelDownloaderUnitTests.swift
@@ -23,7 +23,6 @@
   @testable import FirebaseMLModelDownloader
   import XCTest
   #if SWIFT_PACKAGE
-    @_implementationOnly import GoogleUtilities_Logger
     @_implementationOnly import GoogleUtilities_UserDefaults
   #else
     @_implementationOnly import GoogleUtilities
diff --git a/Package.swift b/Package.swift
index 412d0e75876..663b26811ed 100644
--- a/Package.swift
+++ b/Package.swift
@@ -846,9 +846,9 @@ let package = Package(
       name: "FirebaseMLModelDownloader",
       dependencies: [
         "FirebaseCore",
+        "FirebaseCoreExtension",
         "FirebaseInstallations",
         .product(name: "GoogleDataTransport", package: "GoogleDataTransport"),
-        .product(name: "GULLogger", package: "GoogleUtilities"),
         .product(name: "GULUserDefaults", package: "GoogleUtilities"),
         .product(name: "SwiftProtobuf", package: "swift-protobuf"),
       ],

From 2f26719839f6aaf9285029396320047d75b7002d Mon Sep 17 00:00:00 2001
From: Andrew Heard <andrewheard@google.com>
Date: Thu, 20 Jun 2024 11:36:38 -0400
Subject: [PATCH 2/3] Switch deps in podspec

---
 FirebaseMLModelDownloader.podspec | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/FirebaseMLModelDownloader.podspec b/FirebaseMLModelDownloader.podspec
index 2edd034cc07..2a251373b88 100644
--- a/FirebaseMLModelDownloader.podspec
+++ b/FirebaseMLModelDownloader.podspec
@@ -37,10 +37,9 @@ Pod::Spec.new do |s|
 
   s.framework = 'Foundation'
   s.dependency 'FirebaseCore', '~> 10.0'
+  s.dependency 'FirebaseCoreExtension', '~> 10.29'
   s.dependency 'FirebaseInstallations', '~> 10.0'
   s.dependency 'GoogleDataTransport', '~> 9.2'
-  # TODO: Revisit this dependency
-  s.dependency 'GoogleUtilities/Logger', '~> 7.13'
   s.dependency 'GoogleUtilities/UserDefaults', '~> 7.13'
   s.dependency 'SwiftProtobuf', '~> 1.19'
 

From 8cae3ce3b6ffb7221cbb7b286ffef85e5b1d52e0 Mon Sep 17 00:00:00 2001
From: Andrew Heard <andrewheard@google.com>
Date: Thu, 20 Jun 2024 11:49:20 -0400
Subject: [PATCH 3/3] Revert NS_SWIFT_NAME

---
 FirebaseCore/Extension/FIRLogger.h | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/FirebaseCore/Extension/FIRLogger.h b/FirebaseCore/Extension/FIRLogger.h
index 2e72099f17b..00d3d038d8a 100644
--- a/FirebaseCore/Extension/FIRLogger.h
+++ b/FirebaseCore/Extension/FIRLogger.h
@@ -184,7 +184,8 @@ NS_SWIFT_NAME(FirebaseLogger)
 + (void)logWithLevel:(FIRLoggerLevel)level
              service:(FIRLoggerService)service
                 code:(NSString *)code
-             message:(NSString *)message NS_SWIFT_NAME(log(level:service:code:message:));
+             message:(NSString *)message
+    __attribute__((__swift_name__("log(level:service:code:message:)")));
 
 @end