Merge pull request #1016 from firebase/mc/packaging

fix spm/cocoapods issues
firebase · Jan 13, 2022 · 59b8527 · 59b8527
2 parents dc04d2a + d536c7d
commit 59b8527
Show file tree

Hide file tree

Showing 24 changed files with 256 additions and 140 deletions.
diff --git a/.github/workflows/anonymousauth.yml b/.github/workflows/anonymousauth.yml
@@ -54,7 +54,7 @@ jobs:
           xcodebuild -list
       - name: Build
         run: |
-          xcodebuild -scheme FirebaseAnonymousAuthUI -sdk iphonesimulator
+          xcodebuild -scheme FirebaseAnonymousAuthUI -sdk iphonesimulator  -destination 'platform=iOS Simulator,OS=latest,name=iPhone 13 Pro'
   pod:
     name: pod lib lint
     runs-on: macOS-latest

diff --git a/.github/workflows/auth.yml b/.github/workflows/auth.yml
@@ -50,7 +50,7 @@ jobs:
           xcodebuild -list
       - name: Build
         run: |
-          xcodebuild -scheme FirebaseAuthUI -sdk iphonesimulator
+          xcodebuild -scheme FirebaseAuthUI -sdk iphonesimulator -destination 'platform=iOS Simulator,OS=latest,name=iPhone 13 Pro'
   pod:
     name: pod lib lint
     runs-on: macOS-latest

diff --git a/.github/workflows/database.yml b/.github/workflows/database.yml
@@ -50,7 +50,7 @@ jobs:
           xcodebuild -list
       - name: Build
         run: |
-          xcodebuild -scheme FirebaseDatabaseUI -sdk iphonesimulator
+          xcodebuild -scheme FirebaseDatabaseUI -sdk iphonesimulator  -destination 'platform=iOS Simulator,OS=latest,name=iPhone 13 Pro'
   pod:
     name: pod lib lint
     runs-on: macOS-latest

diff --git a/.github/workflows/emailauth.yml b/.github/workflows/emailauth.yml
@@ -54,7 +54,7 @@ jobs:
           xcodebuild -list
       - name: Build
         run: |
-          xcodebuild -scheme FirebaseEmailAuthUI -sdk iphonesimulator
+          xcodebuild -scheme FirebaseEmailAuthUI -sdk iphonesimulator  -destination 'platform=iOS Simulator,OS=latest,name=iPhone 13 Pro'
   pod:
     name: pod lib lint
     runs-on: macOS-latest

diff --git a/.github/workflows/facebookauth.yml b/.github/workflows/facebookauth.yml
@@ -54,7 +54,7 @@ jobs:
           xcodebuild -list
       - name: Build
         run: |
-          xcodebuild -scheme FirebaseFacebookAuthUI -sdk iphonesimulator
+          xcodebuild -scheme FirebaseFacebookAuthUI -sdk iphonesimulator  -destination 'platform=iOS Simulator,OS=latest,name=iPhone 13 Pro'
   pod:
     name: pod lib lint
     runs-on: macOS-latest

diff --git a/.github/workflows/firestore.yml b/.github/workflows/firestore.yml
@@ -50,7 +50,7 @@ jobs:
           xcodebuild -list
       - name: Build
         run: |
-          xcodebuild -scheme FirebaseFirestoreUI -sdk iphonesimulator
+          xcodebuild -scheme FirebaseFirestoreUI -sdk iphonesimulator  -destination 'platform=iOS Simulator,OS=latest,name=iPhone 13 Pro'
   pod:
     name: pod lib lint
     runs-on: macOS-latest

diff --git a/.github/workflows/googleauth.yml b/.github/workflows/googleauth.yml
@@ -52,7 +52,7 @@ jobs:
           xcodebuild -list
       - name: Build
         run: |
-          xcodebuild -scheme FirebaseGoogleAuthUI -sdk iphonesimulator
+          xcodebuild -scheme FirebaseGoogleAuthUI -sdk iphonesimulator  -destination 'platform=iOS Simulator,OS=latest,name=iPhone 13 Pro'
   pod:
     name: pod lib lint
     runs-on: macOS-latest

diff --git a/.github/workflows/oauth.yml b/.github/workflows/oauth.yml
@@ -54,7 +54,7 @@ jobs:
           xcodebuild -list
       - name: Build
         run: |
-          xcodebuild -scheme FirebaseOAuthUI -sdk iphonesimulator
+          xcodebuild -scheme FirebaseOAuthUI -sdk iphonesimulator  -destination 'platform=iOS Simulator,OS=latest,name=iPhone 13 Pro'
   pod:
     name: pod lib lint
     runs-on: macOS-latest

diff --git a/.github/workflows/phoneauth.yml b/.github/workflows/phoneauth.yml
@@ -54,7 +54,7 @@ jobs:
           xcodebuild -list
       - name: Build
         run: |
-          xcodebuild -scheme FirebasePhoneAuthUI -sdk iphonesimulator
+          xcodebuild -scheme FirebasePhoneAuthUI -sdk iphonesimulator  -destination 'platform=iOS Simulator,OS=latest,name=iPhone 13 Pro'
   pod:
     name: pod lib lint
     runs-on: macOS-latest

diff --git a/.github/workflows/storage.yml b/.github/workflows/storage.yml
@@ -50,7 +50,7 @@ jobs:
           xcodebuild -list
       - name: Build
         run: |
-          xcodebuild -scheme FirebaseStorageUI -sdk iphonesimulator
+          xcodebuild -scheme FirebaseStorageUI -sdk iphonesimulator -destination 'platform=iOS Simulator,OS=latest,name=iPhone 13 Pro'
   pod:
     name: pod lib lint
     runs-on: macOS-latest

diff --git a/FirebaseAnonymousAuthUI.podspec b/FirebaseAnonymousAuthUI.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name         = 'FirebaseAnonymousAuthUI'
-  s.version      = '12.0.0'
+  s.version      = '12.1.1'
   s.summary      = 'Provides anonymous auth support for FirebaseAuthUI.'
   s.homepage     = 'https://github.com/firebase/FirebaseUI-iOS'
   s.license      = { :type => 'Apache 2.0', :file => 'LICENSE' }

diff --git a/FirebaseAuthUI.podspec b/FirebaseAuthUI.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name         = 'FirebaseAuthUI'
-  s.version      = '12.1.0'
+  s.version      = '12.1.1'
   s.summary      = 'A prebuilt authentication UI flow for Firebase Auth.'
   s.homepage     = 'https://github.com/firebase/FirebaseUI-iOS'
   s.license      = { :type => 'Apache 2.0', :file => 'LICENSE' }

diff --git a/FirebaseDatabaseUI.podspec b/FirebaseDatabaseUI.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name         = 'FirebaseDatabaseUI'
-  s.version      = '12.0.0'
+  s.version      = '12.1.1'
   s.summary      = 'Prebuilt data sources and UI bindings for Firebase Database.'
   s.homepage     = 'https://github.com/firebase/FirebaseUI-iOS'
   s.license      = { :type => 'Apache 2.0', :file => 'LICENSE' }

diff --git a/FirebaseEmailAuthUI.podspec b/FirebaseEmailAuthUI.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name         = 'FirebaseEmailAuthUI'
-  s.version      = '12.0.0'
+  s.version      = '12.1.1'
   s.summary      = 'An email authentication provider for FirebaseAuthUI.'
   s.homepage     = 'https://github.com/firebase/FirebaseUI-iOS'
   s.license      = { :type => 'Apache 2.0', :file => 'LICENSE' }

diff --git a/FirebaseFacebookAuthUI.podspec b/FirebaseFacebookAuthUI.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name         = 'FirebaseFacebookAuthUI'
-  s.version      = '12.1.0'
+  s.version      = '12.1.1'
   s.summary      = 'A Facebook auth provider for FirebaseAuthUI.'
   s.homepage     = 'https://github.com/firebase/FirebaseUI-iOS'
   s.license      = { :type => 'Apache 2.0', :file => 'LICENSE' }
@@ -22,7 +22,7 @@ Pod::Spec.new do |s|
   s.dependency 'FirebaseAuth'
   s.dependency 'FirebaseCore'
   s.dependency 'FirebaseAuthUI'
-  s.dependency 'FBSDKLoginKit', '~> 11.0'
+  s.dependency 'FBSDKLoginKit', '>= 11.0', '< 13.0'
   s.dependency 'FBSDKCoreKit_Basics'
   s.resource_bundles = {
     'FirebaseFacebookAuthUI' => ['FirebaseFacebookAuthUI/Sources/{Resources,Strings}/*.{png,lproj}']

diff --git a/FirebaseFirestoreUI.podspec b/FirebaseFirestoreUI.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name         = 'FirebaseFirestoreUI'
-  s.version      = '12.0.0'
+  s.version      = '12.1.1'
   s.summary      = 'Data libraries and UI bindings for Firestore.'
   s.homepage     = 'https://github.com/firebase/FirebaseUI-iOS'
   s.license      = { :type => 'Apache 2.0', :file => 'LICENSE' }

diff --git a/FirebaseGoogleAuthUI.podspec b/FirebaseGoogleAuthUI.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name         = 'FirebaseGoogleAuthUI'
-  s.version      = '12.0.0'
+  s.version      = '12.1.1'
   s.summary      = 'Google authentication for FirebaseAuthUI.'
   s.homepage     = 'https://github.com/firebase/FirebaseUI-iOS'
   s.license      = { :type => 'Apache 2.0', :file => 'LICENSE' }

diff --git a/FirebaseOAuthUI.podspec b/FirebaseOAuthUI.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name         = 'FirebaseOAuthUI'
-  s.version      = '12.0.2'
+  s.version      = '12.1.1'
   s.summary      = 'A collection of OAuth providers for FirebaseAuthUI.'
   s.homepage     = 'https://github.com/firebase/FirebaseUI-iOS'
   s.license      = { :type => 'Apache 2.0', :file => 'LICENSE' }

diff --git a/FirebasePhoneAuthUI.podspec b/FirebasePhoneAuthUI.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name         = 'FirebasePhoneAuthUI'
-  s.version      = '12.0.0'
+  s.version      = '12.1.1'
   s.summary      = 'A phone auth provider for FirebaseAuthUI.'
   s.homepage     = 'https://github.com/firebase/FirebaseUI-iOS'
   s.license      = { :type => 'Apache 2.0', :file => 'LICENSE' }

diff --git a/FirebaseStorageUI.podspec b/FirebaseStorageUI.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name         = 'FirebaseStorageUI'
-  s.version      = '12.0.0'
+  s.version      = '12.1.1'
   s.summary      = 'UI binding libraries for Firebase.'
   s.homepage     = 'https://github.com/firebase/FirebaseUI-iOS'
   s.license      = { :type => 'Apache 2.0', :file => 'LICENSE' }

diff --git a/FirebaseUI.podspec b/FirebaseUI.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name         = 'FirebaseUI'
-  s.version      = '12.0.2'
+  s.version      = '12.1.1'
   s.summary      = 'UI binding libraries for Firebase.'
   s.homepage     = 'https://github.com/firebase/FirebaseUI-iOS'
   s.license      = { :type => 'Apache 2.0', :file => 'LICENSE' }

diff --git a/Package.swift b/Package.swift
@@ -67,7 +67,7 @@ let package = Package(
     .package(
       name: "Facebook", 
       url: "https://github.com/facebook/facebook-ios-sdk.git",
-      from: "11.0.0"
+      "11.0.0"..<"13.0.0"
     ),
     .package(
       name: "Firebase", 
@@ -134,12 +134,6 @@ let package = Package(
       resources: [
         .process("Resources"),
         .process("Strings"),
-        .process("AccountManagement/FUIAccountSettingsViewController.xib"),
-        .process("AccountManagement/FUIInputTableViewCell.xib"),
-        .process("AccountManagement/FUIPasswordTableViewCell.xib"),
-        .process("FUIAuthPickerViewController.xib"),
-        .process("FUIAuthTableViewCell.xib"),
-        .process("FUIStaticContentTableViewController.xib"),
       ],
       publicHeadersPath: "Public",
       cSettings: [
@@ -232,9 +226,6 @@ let package = Package(
       resources: [
         .process("Resources"),
         .process("Strings"),
-        .process("CountryCode/FUICountryTableViewController.xib"),
-        .process("FUIPhoneEntryViewController.xib"),
-        .process("FUIPhoneVerificationViewController.xib"),
       ],
       publicHeadersPath: "Public",
       cSettings: [