From 5e785f894bb1918b6589bf4d953304415cb20a22 Mon Sep 17 00:00:00 2001 From: GeonH0 Date: Sun, 9 Jun 2024 22:20:26 +0900 Subject: [PATCH] =?UTF-8?q?Fix:=20Firebase=EA=B4=80=EB=A0=A8=20SDK=20?= =?UTF-8?q?=EC=82=AD=EC=A0=9C=20RxSwift=20=EA=B4=80=EB=A0=A8=20=ED=8C=A8?= =?UTF-8?q?=ED=82=A4=EC=A7=80=20=EC=84=A4=EC=B9=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../HomeCafeRecipes.xcodeproj/project.pbxproj | 23 +--- .../xcshareddata/swiftpm/Package.resolved | 116 +----------------- .../HomeCafeRecipes/AppDelegate.swift | 5 +- 3 files changed, 9 insertions(+), 135 deletions(-) diff --git a/HomeCafeRecipes/HomeCafeRecipes.xcodeproj/project.pbxproj b/HomeCafeRecipes/HomeCafeRecipes.xcodeproj/project.pbxproj index c11746b..f47c7eb 100644 --- a/HomeCafeRecipes/HomeCafeRecipes.xcodeproj/project.pbxproj +++ b/HomeCafeRecipes/HomeCafeRecipes.xcodeproj/project.pbxproj @@ -15,8 +15,6 @@ 1D2C16FD2BE532B800C04508 /* HomeCafeRecipesTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1D2C16FC2BE532B800C04508 /* HomeCafeRecipesTests.swift */; }; 1D2C17072BE532B800C04508 /* HomeCafeRecipesUITests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1D2C17062BE532B800C04508 /* HomeCafeRecipesUITests.swift */; }; 1D2C17092BE532B800C04508 /* HomeCafeRecipesUITestsLaunchTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1D2C17082BE532B800C04508 /* HomeCafeRecipesUITestsLaunchTests.swift */; }; - 1D2E033E2BE913E500294417 /* FirebaseAnalytics in Frameworks */ = {isa = PBXBuildFile; productRef = 1D2E033D2BE913E500294417 /* FirebaseAnalytics */; }; - 1DCB3D302BE9126E0036D305 /* GoogleService-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = 1DCB3D2F2BE9126E0036D305 /* GoogleService-Info.plist */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -49,7 +47,6 @@ 1D2C17022BE532B800C04508 /* HomeCafeRecipesUITests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = HomeCafeRecipesUITests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; 1D2C17062BE532B800C04508 /* HomeCafeRecipesUITests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HomeCafeRecipesUITests.swift; sourceTree = ""; }; 1D2C17082BE532B800C04508 /* HomeCafeRecipesUITestsLaunchTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HomeCafeRecipesUITestsLaunchTests.swift; sourceTree = ""; }; - 1DCB3D2F2BE9126E0036D305 /* GoogleService-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "GoogleService-Info.plist"; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -57,7 +54,6 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 1D2E033E2BE913E500294417 /* FirebaseAnalytics in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -101,7 +97,6 @@ 1D2C16E42BE532B700C04508 /* HomeCafeRecipes */ = { isa = PBXGroup; children = ( - 1DCB3D2F2BE9126E0036D305 /* GoogleService-Info.plist */, 1D2C16E52BE532B700C04508 /* AppDelegate.swift */, 1D2C16E72BE532B700C04508 /* SceneDelegate.swift */, 1D2C16E92BE532B700C04508 /* ViewController.swift */, @@ -146,7 +141,6 @@ ); name = HomeCafeRecipes; packageProductDependencies = ( - 1D2E033D2BE913E500294417 /* FirebaseAnalytics */, ); productName = HomeCafeRecipes; productReference = 1D2C16E22BE532B700C04508 /* HomeCafeRecipes.app */; @@ -221,7 +215,7 @@ ); mainGroup = 1D2C16D92BE532B700C04508; packageReferences = ( - 1DCB3D312BE913880036D305 /* XCRemoteSwiftPackageReference "firebase-ios-sdk" */, + 1D740B3F2C15E1EC0001B704 /* XCRemoteSwiftPackageReference "RxSwift" */, ); productRefGroup = 1D2C16E32BE532B700C04508 /* Products */; projectDirPath = ""; @@ -240,7 +234,6 @@ buildActionMask = 2147483647; files = ( 1D2C16F22BE532B800C04508 /* LaunchScreen.storyboard in Resources */, - 1DCB3D302BE9126E0036D305 /* GoogleService-Info.plist in Resources */, 1D2C16EF2BE532B800C04508 /* Assets.xcassets in Resources */, ); runOnlyForDeploymentPostprocessing = 0; @@ -607,23 +600,15 @@ /* End XCConfigurationList section */ /* Begin XCRemoteSwiftPackageReference section */ - 1DCB3D312BE913880036D305 /* XCRemoteSwiftPackageReference "firebase-ios-sdk" */ = { + 1D740B3F2C15E1EC0001B704 /* XCRemoteSwiftPackageReference "RxSwift" */ = { isa = XCRemoteSwiftPackageReference; - repositoryURL = "https://github.com/firebase/firebase-ios-sdk.git"; + repositoryURL = "https://github.com/ReactiveX/RxSwift"; requirement = { kind = upToNextMajorVersion; - minimumVersion = 10.25.0; + minimumVersion = 6.7.1; }; }; /* End XCRemoteSwiftPackageReference section */ - -/* Begin XCSwiftPackageProductDependency section */ - 1D2E033D2BE913E500294417 /* FirebaseAnalytics */ = { - isa = XCSwiftPackageProductDependency; - package = 1DCB3D312BE913880036D305 /* XCRemoteSwiftPackageReference "firebase-ios-sdk" */; - productName = FirebaseAnalytics; - }; -/* End XCSwiftPackageProductDependency section */ }; rootObject = 1D2C16DA2BE532B700C04508 /* Project object */; } diff --git a/HomeCafeRecipes/HomeCafeRecipes.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/HomeCafeRecipes/HomeCafeRecipes.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved index 6b7a363..939be2d 100644 --- a/HomeCafeRecipes/HomeCafeRecipes.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ b/HomeCafeRecipes/HomeCafeRecipes.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -1,120 +1,12 @@ { "pins" : [ { - "identity" : "abseil-cpp-binary", + "identity" : "rxswift", "kind" : "remoteSourceControl", - "location" : "https://github.com/google/abseil-cpp-binary.git", + "location" : "https://github.com/ReactiveX/RxSwift", "state" : { - "revision" : "748c7837511d0e6a507737353af268484e1745e2", - "version" : "1.2024011601.1" - } - }, - { - "identity" : "app-check", - "kind" : "remoteSourceControl", - "location" : "https://github.com/google/app-check.git", - "state" : { - "revision" : "7d2688de038d5484866d835acb47b379722d610e", - "version" : "10.19.0" - } - }, - { - "identity" : "firebase-ios-sdk", - "kind" : "remoteSourceControl", - "location" : "https://github.com/firebase/firebase-ios-sdk.git", - "state" : { - "revision" : "97940381e57703c07f31a8058d8f39ec53b7c272", - "version" : "10.25.0" - } - }, - { - "identity" : "googleappmeasurement", - "kind" : "remoteSourceControl", - "location" : "https://github.com/google/GoogleAppMeasurement.git", - "state" : { - "revision" : "16244d177c4e989f87b25e9db1012b382cfedc55", - "version" : "10.25.0" - } - }, - { - "identity" : "googledatatransport", - "kind" : "remoteSourceControl", - "location" : "https://github.com/google/GoogleDataTransport.git", - "state" : { - "revision" : "a637d318ae7ae246b02d7305121275bc75ed5565", - "version" : "9.4.0" - } - }, - { - "identity" : "googleutilities", - "kind" : "remoteSourceControl", - "location" : "https://github.com/google/GoogleUtilities.git", - "state" : { - "revision" : "8e5d57ed87057cd7b0e4e8f474d9e78f73eb85f7", - "version" : "7.13.2" - } - }, - { - "identity" : "grpc-binary", - "kind" : "remoteSourceControl", - "location" : "https://github.com/google/grpc-binary.git", - "state" : { - "revision" : "e9fad491d0673bdda7063a0341fb6b47a30c5359", - "version" : "1.62.2" - } - }, - { - "identity" : "gtm-session-fetcher", - "kind" : "remoteSourceControl", - "location" : "https://github.com/google/gtm-session-fetcher.git", - "state" : { - "revision" : "0382ca27f22fb3494cf657d8dc356dc282cd1193", - "version" : "3.4.1" - } - }, - { - "identity" : "interop-ios-for-google-sdks", - "kind" : "remoteSourceControl", - "location" : "https://github.com/google/interop-ios-for-google-sdks.git", - "state" : { - "revision" : "2d12673670417654f08f5f90fdd62926dc3a2648", - "version" : "100.0.0" - } - }, - { - "identity" : "leveldb", - "kind" : "remoteSourceControl", - "location" : "https://github.com/firebase/leveldb.git", - "state" : { - "revision" : "a0bc79961d7be727d258d33d5a6b2f1023270ba1", - "version" : "1.22.5" - } - }, - { - "identity" : "nanopb", - "kind" : "remoteSourceControl", - "location" : "https://github.com/firebase/nanopb.git", - "state" : { - "revision" : "b7e1104502eca3a213b46303391ca4d3bc8ddec1", - "version" : "2.30910.0" - } - }, - { - "identity" : "promises", - "kind" : "remoteSourceControl", - "location" : "https://github.com/google/promises.git", - "state" : { - "revision" : "540318ecedd63d883069ae7f1ed811a2df00b6ac", - "version" : "2.4.0" - } - }, - { - "identity" : "swift-protobuf", - "kind" : "remoteSourceControl", - "location" : "https://github.com/apple/swift-protobuf.git", - "state" : { - "revision" : "9f0c76544701845ad98716f3f6a774a892152bcb", - "version" : "1.26.0" + "revision" : "b06a8c8596e4c3e8e7788e08e720e3248563ce6a", + "version" : "6.7.1" } } ], diff --git a/HomeCafeRecipes/HomeCafeRecipes/AppDelegate.swift b/HomeCafeRecipes/HomeCafeRecipes/AppDelegate.swift index 3dee424..931735c 100644 --- a/HomeCafeRecipes/HomeCafeRecipes/AppDelegate.swift +++ b/HomeCafeRecipes/HomeCafeRecipes/AppDelegate.swift @@ -6,16 +6,13 @@ // import UIKit -import FirebaseCore + @main class AppDelegate: UIResponder, UIApplicationDelegate { - - func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool { // Override point for customization after application launch. - FirebaseApp.configure() return true }