Skip to content

Commit 0074c79

Browse files
authored
Update CI to use CocoaPods 1.6.0 (#2360)
1 parent 10f50bf commit 0074c79

File tree

2 files changed

+30
-38
lines changed

2 files changed

+30
-38
lines changed

Example/Firebase.xcodeproj/project.pbxproj

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -5760,7 +5760,7 @@
57605760
DEBUG_INFORMATION_FORMAT = dwarf;
57615761
DEVELOPMENT_TEAM = 4ANB9W7R3P;
57625762
GCC_C_LANGUAGE_STANDARD = gnu11;
5763-
INFOPLIST_FILE = $SRCROOT/DynamicLinks/FDLBuilderTestAppObjC/Info.plist;
5763+
INFOPLIST_FILE = "$SRCROOT/DynamicLinks/FDLBuilderTestAppObjC/Info.plist";
57645764
IPHONEOS_DEPLOYMENT_TARGET = 11.4;
57655765
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
57665766
MTL_ENABLE_DEBUG_INFO = YES;
@@ -5794,7 +5794,7 @@
57945794
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
57955795
DEVELOPMENT_TEAM = 4ANB9W7R3P;
57965796
GCC_C_LANGUAGE_STANDARD = gnu11;
5797-
INFOPLIST_FILE = $SRCROOT/DynamicLinks/FDLBuilderTestAppObjC/Info.plist;
5797+
INFOPLIST_FILE = "$SRCROOT/DynamicLinks/FDLBuilderTestAppObjC/Info.plist";
57985798
IPHONEOS_DEPLOYMENT_TARGET = 11.4;
57995799
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
58005800
MTL_ENABLE_DEBUG_INFO = NO;
@@ -6458,6 +6458,7 @@
64586458
buildSettings = {
64596459
ASSETCATALOG_COMPILER_APPICON_NAME = "App Icon & Top Shelf Image";
64606460
ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
6461+
BUNDLE_LOADER = "$(TEST_HOST)";
64616462
CLANG_ANALYZER_NONNULL = YES;
64626463
CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
64636464
CLANG_CXX_LANGUAGE_STANDARD = "gnu++14";
@@ -6482,11 +6483,6 @@
64826483
INFOPLIST_FILE = "$(SRCROOT)/Auth/App/iOS/Auth-Info.plist";
64836484
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
64846485
MTL_ENABLE_DEBUG_INFO = YES;
6485-
OTHER_LDFLAGS = (
6486-
"$(inherited)",
6487-
"-framework",
6488-
FirebaseAuth,
6489-
);
64906486
PRODUCT_BUNDLE_IDENTIFIER = "com.google.Auth-Example-tvOS";
64916487
PRODUCT_NAME = "$(TARGET_NAME)";
64926488
SDKROOT = appletvos;
@@ -6501,6 +6497,7 @@
65016497
buildSettings = {
65026498
ASSETCATALOG_COMPILER_APPICON_NAME = "App Icon & Top Shelf Image";
65036499
ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
6500+
BUNDLE_LOADER = "$(TEST_HOST)";
65046501
CLANG_ANALYZER_NONNULL = YES;
65056502
CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
65066503
CLANG_CXX_LANGUAGE_STANDARD = "gnu++14";
@@ -6526,11 +6523,6 @@
65266523
INFOPLIST_FILE = "$(SRCROOT)/Auth/App/iOS/Auth-Info.plist";
65276524
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
65286525
MTL_ENABLE_DEBUG_INFO = NO;
6529-
OTHER_LDFLAGS = (
6530-
"$(inherited)",
6531-
"-framework",
6532-
FirebaseAuth,
6533-
);
65346526
PRODUCT_BUNDLE_IDENTIFIER = "com.google.Auth-Example-tvOS";
65356527
PRODUCT_NAME = "$(TARGET_NAME)";
65366528
SDKROOT = appletvos;

Gemfile.lock

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,82 +1,82 @@
11
GIT
22
remote: https://github.com/CocoaPods/CocoaPods.git
3-
revision: 10b69dbd9b991442646944f118f569d855652b26
3+
revision: 984af0b1c31000b30455b276bcac21d424003f40
44
specs:
5-
cocoapods (1.5.3)
5+
cocoapods (1.6.0)
66
activesupport (>= 4.0.2, < 5)
77
claide (>= 1.0.2, < 2.0)
8-
cocoapods-core (= 1.5.3)
8+
cocoapods-core (= 1.6.0)
99
cocoapods-deintegrate (>= 1.0.2, < 2.0)
10-
cocoapods-downloader (>= 1.2.1, < 2.0)
10+
cocoapods-downloader (>= 1.2.2, < 2.0)
1111
cocoapods-plugins (>= 1.0.0, < 2.0)
1212
cocoapods-search (>= 1.0.0, < 2.0)
1313
cocoapods-stats (>= 1.0.0, < 2.0)
14-
cocoapods-trunk (>= 1.3.0, < 2.0)
14+
cocoapods-trunk (>= 1.3.1, < 2.0)
1515
cocoapods-try (>= 1.1.0, < 2.0)
1616
colored2 (~> 3.1)
1717
escape (~> 0.0.4)
18-
fourflusher (~> 2.0.1)
18+
fourflusher (>= 2.2.0, < 3.0)
1919
gh_inspector (~> 1.0)
20-
molinillo (~> 0.6.5)
20+
molinillo (~> 0.6.6)
2121
nap (~> 1.0)
22-
ruby-macho (~> 1.2)
23-
xcodeproj (>= 1.5.8, < 2.0)
22+
ruby-macho (~> 1.3, >= 1.3.1)
23+
xcodeproj (>= 1.8.0, < 2.0)
2424

2525
GIT
2626
remote: https://github.com/CocoaPods/Core.git
27-
revision: 577c69f38fdb56cbdb883b44681ca2b224cad746
27+
revision: 887e2804a091eec4bc43f9db8285d8e07905418d
2828
specs:
29-
cocoapods-core (1.5.3)
29+
cocoapods-core (1.6.0)
3030
activesupport (>= 4.0.2, < 6)
3131
fuzzy_match (~> 2.0.4)
3232
nap (~> 1.0)
3333

3434
GIT
3535
remote: https://github.com/CocoaPods/Xcodeproj.git
36-
revision: cadb238767d09942a1c5eba90a3112034438ba23
36+
revision: 47492ac78703be3e44d2bcc0c2343dcfa92d26f4
3737
specs:
38-
xcodeproj (1.5.9)
38+
xcodeproj (1.8.0)
3939
CFPropertyList (>= 2.3.3, < 4.0)
40-
atomos (~> 0.1.2)
40+
atomos (~> 0.1.3)
4141
claide (>= 1.0.2, < 2.0)
4242
colored2 (~> 3.1)
43-
nanaimo (~> 0.2.5)
43+
nanaimo (~> 0.2.6)
4444

4545
GEM
4646
remote: https://rubygems.org/
4747
specs:
4848
CFPropertyList (3.0.0)
49-
activesupport (4.2.10)
49+
activesupport (4.2.11)
5050
i18n (~> 0.7)
5151
minitest (~> 5.1)
5252
thread_safe (~> 0.3, >= 0.3.4)
5353
tzinfo (~> 1.1)
54-
atomos (0.1.2)
54+
atomos (0.1.3)
5555
claide (1.0.2)
5656
cocoapods-deintegrate (1.0.2)
57-
cocoapods-downloader (1.2.1)
57+
cocoapods-downloader (1.2.2)
5858
cocoapods-plugins (1.0.0)
5959
nap
6060
cocoapods-search (1.0.0)
61-
cocoapods-stats (1.0.0)
62-
cocoapods-trunk (1.3.0)
61+
cocoapods-stats (1.1.0)
62+
cocoapods-trunk (1.3.1)
6363
nap (>= 0.8, < 2.0)
6464
netrc (~> 0.11)
6565
cocoapods-try (1.1.0)
6666
colored2 (3.1.2)
67-
concurrent-ruby (1.0.5)
67+
concurrent-ruby (1.1.4)
6868
escape (0.0.4)
69-
fourflusher (2.0.1)
69+
fourflusher (2.2.0)
7070
fuzzy_match (2.0.4)
7171
gh_inspector (1.1.3)
7272
i18n (0.9.5)
7373
concurrent-ruby (~> 1.0)
7474
minitest (5.11.3)
75-
molinillo (0.6.5)
76-
nanaimo (0.2.5)
75+
molinillo (0.6.6)
76+
nanaimo (0.2.6)
7777
nap (1.1.0)
7878
netrc (0.11.0)
79-
ruby-macho (1.2.0)
79+
ruby-macho (1.3.1)
8080
thread_safe (0.3.6)
8181
tzinfo (1.2.5)
8282
thread_safe (~> 0.1)
@@ -90,4 +90,4 @@ DEPENDENCIES
9090
xcodeproj!
9191

9292
BUNDLED WITH
93-
1.16.1
93+
1.16.6

0 commit comments

Comments
 (0)