diff --git a/Gemfile b/Gemfile index c0287142c..988929bce 100644 --- a/Gemfile +++ b/Gemfile @@ -1,6 +1,4 @@ source 'https://rubygems.org' -gem 'cocoapods' -gem 'cocoapods-core' gem 'xcodeproj' diff --git a/Gemfile.lock b/Gemfile.lock index 31a48881f..385eb7562 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -2,98 +2,11 @@ GEM remote: https://rubygems.org/ specs: CFPropertyList (3.0.9) - activesupport (7.1.6) - base64 - benchmark (>= 0.3) - bigdecimal - concurrent-ruby (~> 1.0, >= 1.0.2) - connection_pool (>= 2.2.5) - drb - i18n (>= 1.6, < 2) - logger (>= 1.4.2) - minitest (>= 5.1) - mutex_m - securerandom (>= 0.3) - tzinfo (~> 2.0) - addressable (2.8.8) - public_suffix (>= 2.0.2, < 8.0) - algoliasearch (1.27.5) - httpclient (~> 2.8, >= 2.8.3) - json (>= 1.5.1) atomos (0.1.3) - base64 (0.3.0) - benchmark (0.5.0) - bigdecimal (3.3.1) claide (1.1.0) - cocoapods (1.16.2) - addressable (~> 2.8) - claide (>= 1.0.2, < 2.0) - cocoapods-core (= 1.16.2) - cocoapods-deintegrate (>= 1.0.3, < 2.0) - cocoapods-downloader (>= 2.1, < 3.0) - cocoapods-plugins (>= 1.0.0, < 2.0) - cocoapods-search (>= 1.0.0, < 2.0) - cocoapods-trunk (>= 1.6.0, < 2.0) - cocoapods-try (>= 1.1.0, < 2.0) - colored2 (~> 3.1) - escape (~> 0.0.4) - fourflusher (>= 2.3.0, < 3.0) - gh_inspector (~> 1.0) - molinillo (~> 0.8.0) - nap (~> 1.0) - ruby-macho (>= 2.3.0, < 3.0) - xcodeproj (>= 1.27.0, < 2.0) - cocoapods-core (1.16.2) - activesupport (>= 5.0, < 8) - addressable (~> 2.8) - algoliasearch (~> 1.0) - concurrent-ruby (~> 1.1) - fuzzy_match (~> 2.0.4) - nap (~> 1.0) - netrc (~> 0.11) - public_suffix (~> 4.0) - typhoeus (~> 1.0) - cocoapods-deintegrate (1.0.5) - cocoapods-downloader (2.1) - cocoapods-plugins (1.0.0) - nap - cocoapods-search (1.0.1) - cocoapods-trunk (1.6.0) - nap (>= 0.8, < 2.0) - netrc (~> 0.11) - cocoapods-try (1.2.0) colored2 (3.1.2) - concurrent-ruby (1.3.5) - connection_pool (2.5.5) - drb (2.2.3) - escape (0.0.4) - ethon (0.18.0) - ffi (>= 1.15.0) - logger - ffi (1.17.2) - fourflusher (2.3.1) - fuzzy_match (2.0.4) - gh_inspector (1.1.3) - httpclient (2.9.0) - mutex_m - i18n (1.14.7) - concurrent-ruby (~> 1.0) - json (2.16.0) - logger (1.7.0) - minitest (5.26.1) - molinillo (0.8.0) - mutex_m (0.3.0) nanaimo (0.4.0) - nap (1.1.0) - netrc (0.11.0) - public_suffix (4.0.7) rexml (3.4.4) - ruby-macho (2.5.1) - securerandom (0.3.2) - typhoeus (1.4.1) - ethon (>= 0.9.0) - tzinfo (2.0.6) - concurrent-ruby (~> 1.0) xcodeproj (1.27.0) CFPropertyList (>= 2.3.3, < 4.0) atomos (~> 0.1.3) @@ -106,8 +19,6 @@ PLATFORMS ruby DEPENDENCIES - cocoapods - cocoapods-core xcodeproj BUNDLED WITH diff --git a/README.md b/README.md index fb796a03f..8d5b1cab6 100644 --- a/README.md +++ b/README.md @@ -6,12 +6,8 @@ for both Objective-C and Swift. For more information, see https://firebase.googl ## Samples You can open each of the following samples as an Xcode project, and run -them on a mobile device or a simulator. Simply install the pods and open -the .xcworkspace file to see the project in Xcode. -``` -$ pod install --repo-update -$ open your-project.xcworkspace -``` +them on a mobile device or a simulator. Simply open +the .xcodeproj file to see the project in Xcode. When doing so you need to add each sample app you wish to try to a Firebase project on the [Firebase console](https://console.firebase.google.com). You can add multiple sample apps to the same Firebase project. diff --git a/analytics/README.md b/analytics/README.md index 882c54c39..4d587e10c 100644 --- a/analytics/README.md +++ b/analytics/README.md @@ -16,9 +16,7 @@ Google Analytics for Firebase to log in-app events and set user properties. Ready? Let's get started! 🚀 Clone this project and `cd` into the `AnalyticsExample` directory. -Run `pod install`. This command will install all of the required cocoapods -for this quickstart and generate a `.xcworkspace` project. Go ahead and -open the `AnalyticsExample.xcworkspace` project. +Open the `AnalyticsExample.xcodeproj` project. ### Terminal commands to clone and open the project! ```terminal @@ -27,9 +25,7 @@ git clone https://github.com/firebase/quickstart-ios.git cd analytics/ -pod install --repo-update - -open AnalyticsExample.xcworkspace +open AnalyticsExample.xcodeproj ``` ## Connecting to the Firebase Console diff --git a/appdistribution/README.md b/appdistribution/README.md index 9947a2287..e1f7bdf42 100644 --- a/appdistribution/README.md +++ b/appdistribution/README.md @@ -8,9 +8,7 @@ about Firebase App Distribution [here](https://firebase.google.com/docs/app-dist Ready? Let's get started! 🚀 Clone this project and `cd` into the `AppDistributionExample` directory. -Run `pod install`. This command will install all of the required cocoapods -for this quickstart and generate a `.xcworkspace` project. Go ahead and -open the `AppDistributionExample.xcworkspace` project. +Open the `AppDistributionExample.xcodeproj` project. ### Terminal commands to clone and open the project! ```bash @@ -19,9 +17,7 @@ $ git clone https://github.com/firebase/quickstart-ios.git $ cd appdistribution/ -$ pod install - -$ open AppDistributionExample.xcworkspace +$ open AppDistributionExample.xcodeproj ``` diff --git a/authentication/README.md b/authentication/README.md index 8da6949af..983b50093 100644 --- a/authentication/README.md +++ b/authentication/README.md @@ -11,7 +11,7 @@ Firebase Auth offers multiple ways to authenticate users. In this quickstart, we Ready? Let's get started! 🏎💨 -Clone this project and `cd` into the `AuthenticationExample` directory. Run `pod install`. This command will install all of the required CocoaPods for this quickstart and generate a `.xcworkspace` project. Go ahead and open the `AuthenticationExample.xcworkspace` project. +Clone this project and `cd` into the `AuthenticationExample` directory. Open the `AuthenticationExample.xcodeproj` project. ### Terminal commands to clone and open the project! ```bash @@ -20,9 +20,7 @@ $ git clone https://github.com/firebase/quickstart-ios.git $ cd authentication/ -$ pod install --repo-update - -$ open AuthenticationExample.xcworkspace +$ open AuthenticationExample.xcodeproj ``` @@ -49,7 +47,7 @@ To enable sign in with each of the following identity providers, there are a few ### Google Sign In -We have already included the **`GoogleSignIn`** CocoaPod in the quickstart's `Podfile`. This CocoaPod is **required** for **Google Sign In**. +The **`GoogleSignIn`** dependency is required for **Google Sign In** and is included in the `Package.swift` file. #### Start by going to the [Firebase Console](https://console.firebase.google.com) and navigate to your project: @@ -150,7 +148,7 @@ See the [Getting Started with Yahoo Sign In guide](https://firebase.google.com/d ### Facebook -We have already included the **`FBSDKLoginKit`** CocoaPod in the quickstart's `Podfile`. This CocoaPod is **required** for **Sign In with Facebook**. +The **`FBSDKLoginKit`** dependency is required for **Sign In with Facebook** and is included in the `Package.swift` file. - Go to the [Facebook Developers Site](https://developers.facebook.com) and follow all instructions to set up a new iOS app. When asked for a bundle ID, use diff --git a/inappmessaging/README.md b/inappmessaging/README.md index f7ab9009e..6d81e8421 100644 --- a/inappmessaging/README.md +++ b/inappmessaging/README.md @@ -4,8 +4,7 @@ Firebase In-App messaging is a service allowing developers to send targeted messages to users. To learn more, take a look at [the docs](https://firebase.google.com/docs/ios/setup). ## Setup * [Add Firebase to your iOS app][setup-ios]. - * In the root of the project, run `pod install --repo-update`. - * Open the resulting `xcworkspace` and run the app on an iOS device or simulator. + * Open `InAppMessagingExample.xcodeproj` and run the app on an iOS device or simulator. ## Getting Started * Open the In-App Messaging tab of [Firebase Console][firebase-console]. diff --git a/messaging/README.md b/messaging/README.md index d4491e5fc..d46fe160b 100644 --- a/messaging/README.md +++ b/messaging/README.md @@ -22,7 +22,6 @@ Getting Started --------------- - Add APNS certs to your project in **Project Settings** > **Notifications** in the [console](https://console.firebase.google.com) -- Run `pod install --repo-update` - Copy in the GoogleServices-Info.plist to your project - Update the app Bundle ID in Xcode to match the Bundle ID of your APNs cert. - Run the sample on your iOS device. diff --git a/scripts/install_prereqs/mlmodelinterpreter.sh b/scripts/install_prereqs/mlmodelinterpreter.sh deleted file mode 100755 index 7b3017971..000000000 --- a/scripts/install_prereqs/mlmodelinterpreter.sh +++ /dev/null @@ -1,17 +0,0 @@ -# Copyright 2019 Google -# -# 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. - -ruby ../scripts/info_script.rb MLModelInterpreter -cp ../mock-GoogleService-Info.plist ./GoogleService-Info.plist -sed -i '' '/BUNDLE_IDBUNDLE_ID"; - }; EAF7CE2324B5F84700DE15AB = { isa = PBXGroup; children = ( EAF7CE2E24B5F84700DE15AB /* PasswordlessSwiftUI */, EAF7CE2D24B5F84700DE15AB /* Products */, - 4604AEB720361FDAABE17640 /* Pods */, ); sourceTree = ""; }; @@ -125,6 +119,9 @@ Base, ); mainGroup = EAF7CE2324B5F84700DE15AB; + packageReferences = ( + EA54C8E92ED75C0D008C21B4 /* XCRemoteSwiftPackageReference "firebase-ios-sdk" */, + ); productRefGroup = EAF7CE2D24B5F84700DE15AB /* Products */; projectDirPath = ""; projectRoot = ""; @@ -344,6 +341,25 @@ defaultConfigurationName = Release; }; /* End XCConfigurationList section */ + +/* Begin XCRemoteSwiftPackageReference section */ + EA54C8E92ED75C0D008C21B4 /* XCRemoteSwiftPackageReference "firebase-ios-sdk" */ = { + isa = XCRemoteSwiftPackageReference; + repositoryURL = "https://github.com/firebase/firebase-ios-sdk"; + requirement = { + kind = upToNextMajorVersion; + minimumVersion = 12.6.0; + }; + }; +/* End XCRemoteSwiftPackageReference section */ + +/* Begin XCSwiftPackageProductDependency section */ + EA54C8EA2ED75C0D008C21B4 /* FirebaseAuth */ = { + isa = XCSwiftPackageProductDependency; + package = EA54C8E92ED75C0D008C21B4 /* XCRemoteSwiftPackageReference "firebase-ios-sdk" */; + productName = FirebaseAuth; + }; +/* End XCSwiftPackageProductDependency section */ }; rootObject = EAF7CE2424B5F84700DE15AB /* Project object */; } diff --git a/swiftui/PasswordlessSwiftUI/Podfile b/swiftui/PasswordlessSwiftUI/Podfile deleted file mode 100644 index f8a9b30ec..000000000 --- a/swiftui/PasswordlessSwiftUI/Podfile +++ /dev/null @@ -1,11 +0,0 @@ -# Uncomment the next line to define a global platform for your project -platform :ios, '15.0' - -target 'PasswordlessSwiftUI' do - # Comment the next line if you don't want to use dynamic frameworks - use_frameworks! - - # Pods for PasswordlessSwiftUI - pod 'FirebaseAuth' - -end diff --git a/swiftui/PasswordlessSwiftUI/Podfile.lock b/swiftui/PasswordlessSwiftUI/Podfile.lock deleted file mode 100644 index 3c5854143..000000000 --- a/swiftui/PasswordlessSwiftUI/Podfile.lock +++ /dev/null @@ -1,73 +0,0 @@ -PODS: - - FirebaseAppCheckInterop (12.6.0) - - FirebaseAuth (12.6.0): - - FirebaseAppCheckInterop (~> 12.6.0) - - FirebaseAuthInterop (~> 12.6.0) - - FirebaseCore (~> 12.6.0) - - FirebaseCoreExtension (~> 12.6.0) - - GoogleUtilities/AppDelegateSwizzler (~> 8.1) - - GoogleUtilities/Environment (~> 8.1) - - GTMSessionFetcher/Core (< 6.0, >= 3.4) - - RecaptchaInterop (~> 101.0) - - FirebaseAuthInterop (12.6.0) - - FirebaseCore (12.6.0): - - FirebaseCoreInternal (~> 12.6.0) - - GoogleUtilities/Environment (~> 8.1) - - GoogleUtilities/Logger (~> 8.1) - - FirebaseCoreExtension (12.6.0): - - FirebaseCore (~> 12.6.0) - - FirebaseCoreInternal (12.6.0): - - "GoogleUtilities/NSData+zlib (~> 8.1)" - - GoogleUtilities/AppDelegateSwizzler (8.1.0): - - GoogleUtilities/Environment - - GoogleUtilities/Logger - - GoogleUtilities/Network - - GoogleUtilities/Privacy - - GoogleUtilities/Environment (8.1.0): - - GoogleUtilities/Privacy - - GoogleUtilities/Logger (8.1.0): - - GoogleUtilities/Environment - - GoogleUtilities/Privacy - - GoogleUtilities/Network (8.1.0): - - GoogleUtilities/Logger - - "GoogleUtilities/NSData+zlib" - - GoogleUtilities/Privacy - - GoogleUtilities/Reachability - - "GoogleUtilities/NSData+zlib (8.1.0)": - - GoogleUtilities/Privacy - - GoogleUtilities/Privacy (8.1.0) - - GoogleUtilities/Reachability (8.1.0): - - GoogleUtilities/Logger - - GoogleUtilities/Privacy - - GTMSessionFetcher/Core (5.0.0) - - RecaptchaInterop (101.0.0) - -DEPENDENCIES: - - FirebaseAuth - -SPEC REPOS: - trunk: - - FirebaseAppCheckInterop - - FirebaseAuth - - FirebaseAuthInterop - - FirebaseCore - - FirebaseCoreExtension - - FirebaseCoreInternal - - GoogleUtilities - - GTMSessionFetcher - - RecaptchaInterop - -SPEC CHECKSUMS: - FirebaseAppCheckInterop: e2178171b4145013c7c1a3cc464d1d446d3a1896 - FirebaseAuth: 613c463cb43545a7fd2cd99ade09b78ac472c544 - FirebaseAuthInterop: db06756ef028006d034b6004dc0c37c24f7828d4 - FirebaseCore: 0e38ad5d62d980a47a64b8e9301ffa311457be04 - FirebaseCoreExtension: 032fd6f8509e591fda8cb76f6651f20d926b121f - FirebaseCoreInternal: 69bf1306a05b8ac43004f6cc1f804bb7b05b229e - GoogleUtilities: 00c88b9a86066ef77f0da2fab05f65d7768ed8e1 - GTMSessionFetcher: 02d6e866e90bc236f48a703a041dfe43e6221a29 - RecaptchaInterop: 11e0b637842dfb48308d242afc3f448062325aba - -PODFILE CHECKSUM: 08c61ca66691400908ee13cd7bd0956d42a6728f - -COCOAPODS: 1.16.2 diff --git a/swiftui/PasswordlessSwiftUI/README.md b/swiftui/PasswordlessSwiftUI/README.md index a382fa05c..6a4b6bbe8 100644 --- a/swiftui/PasswordlessSwiftUI/README.md +++ b/swiftui/PasswordlessSwiftUI/README.md @@ -13,13 +13,12 @@ example of how to build modern apps with Firebase and SwiftUI. Getting this project up and running is similar to the other quickstarts found in this repo. The following steps will clone the project, -install its dependencies, and open the `.xcworkspace` project in Xcode. +and open the `.xcodeproj` project in Xcode. ```bash $ git clone https://github.com/firebase/quickstart-ios.git $ cd swiftui/PasswordlessSwiftUI/ -$ pod install --repo-update -$ open PasswordlessSwiftUI.xcworkspace +$ open PasswordlessSwiftUI.xcodeproj ``` # Finished Demo