Skip to content

Commit 3ef42c1

Browse files
paulb777paulb777
authored
Address v9, resolved, and obsolete TODO's (#9659)
1 parent 58a5c8a commit 3ef42c1

File tree

8 files changed

+28
-44
lines changed

8 files changed

+28
-44
lines changed

‎.github/workflows/functions.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -109,8 +109,7 @@ jobs:
109109

110110
functions-cron-only:
111111
# Don't run on private repo.
112-
# TODO: Uncomment below
113-
# if: github.event_name == 'schedule' && github.repository == 'Firebase/firebase-ios-sdk'
112+
if: github.event_name == 'schedule' && github.repository == 'Firebase/firebase-ios-sdk'
114113

115114
runs-on: macos-11
116115
strategy:

‎.github/workflows/storage.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ jobs:
129129
130130
storage-cron-only:
131131
# Don't run on private repo.
132-
# if: github.event_name == 'schedule' && github.repository == 'Firebase/firebase-ios-sdk'
132+
if: github.event_name == 'schedule' && github.repository == 'Firebase/firebase-ios-sdk'
133133
runs-on: macos-11
134134
strategy:
135135
matrix:

‎.github/workflows/zip.yml

Lines changed: 24 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -25,31 +25,30 @@ concurrency:
2525
cancel-in-progress: true
2626

2727
jobs:
28-
# TODO: Reenable package-release once v9 merges to master.
29-
# package-release:
30-
# # Don't run on private repo.
31-
# if: (github.repository == 'Firebase/firebase-ios-sdk' && github.event_name == 'schedule') || github.event_name == 'pull_request' || github.event_name == 'workflow_dispatch'
32-
# runs-on: macos-11
33-
# steps:
34-
# - uses: actions/checkout@v2
35-
# - uses: mikehardy/buildcache-action@50738c6c77de7f34e66b870e4f8ede333b69d077
36-
# with:
37-
# cache_key: ${{ matrix.os }}
38-
# - name: Xcode 13.2.1
39-
# run: sudo xcode-select -s /Applications/Xcode_13.2.1.app/Contents/Developer
40-
# - name: Setup Bundler
41-
# run: ./scripts/setup_bundler.sh
42-
# - name: ZipBuildingTest
43-
# run: |
44-
# mkdir -p release_zip_dir
45-
# sh -x scripts/build_zip.sh release_zip_dir \
46-
# "${{ github.event.inputs.custom_spec_repos || 'https://github.com/firebase/SpecsStaging.git' }}"
47-
# - uses: actions/upload-artifact@v1
48-
# with:
49-
# name: Firebase-release-zip-zip
50-
# # Zip the entire output directory since the builder adds subdirectories we don't know the
51-
# # name of.
52-
# path: release_zip_dir
28+
package-release:
29+
# Don't run on private repo.
30+
if: (github.repository == 'Firebase/firebase-ios-sdk' && github.event_name == 'schedule') || github.event_name == 'pull_request' || github.event_name == 'workflow_dispatch'
31+
runs-on: macos-11
32+
steps:
33+
- uses: actions/checkout@v2
34+
- uses: mikehardy/buildcache-action@50738c6c77de7f34e66b870e4f8ede333b69d077
35+
with:
36+
cache_key: ${{ matrix.os }}
37+
- name: Xcode 13.2.1
38+
run: sudo xcode-select -s /Applications/Xcode_13.2.1.app/Contents/Developer
39+
- name: Setup Bundler
40+
run: ./scripts/setup_bundler.sh
41+
- name: ZipBuildingTest
42+
run: |
43+
mkdir -p release_zip_dir
44+
sh -x scripts/build_zip.sh release_zip_dir \
45+
"${{ github.event.inputs.custom_spec_repos || 'https://github.com/firebase/SpecsStaging.git' }}"
46+
- uses: actions/upload-artifact@v1
47+
with:
48+
name: Firebase-release-zip-zip
49+
# Zip the entire output directory since the builder adds subdirectories we don't know the
50+
# name of.
51+
path: release_zip_dir
5352

5453
build:
5554
# Don't run on private repo unless it is a PR.

‎Crashlytics/Protogen/nanopb/crashlytics.nanopb.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ const pb_field_t google_crashlytics_FilesPayload_File_fields[3] = {
5454
#if !defined(PB_FIELD_32BIT)
5555
/* If you get an error here, it means that you need to define PB_FIELD_32BIT
5656
* compile-time option. You can do that in pb.h or on compiler command line.
57-
*
57+
*
5858
* The reason you need to do this is that some of your messages contain tag
5959
* numbers or field sizes that are larger than what can fit in 8 or 16 bit
6060
* field descriptors.
@@ -65,7 +65,7 @@ PB_STATIC_ASSERT((pb_membersize(google_crashlytics_Report, apple_payload) < 6553
6565
#if !defined(PB_FIELD_16BIT) && !defined(PB_FIELD_32BIT)
6666
/* If you get an error here, it means that you need to define PB_FIELD_16BIT
6767
* compile-time option. You can do that in pb.h or on compiler command line.
68-
*
68+
*
6969
* The reason you need to do this is that some of your messages contain tag
7070
* numbers or field sizes that are larger than what can fit in the default
7171
* 8 bit descriptors.

‎FirebaseCore/Extension/FIRAppInternal.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,6 @@
2424
* The internal interface to `FirebaseApp`. This is meant for first-party integrators, who need to
2525
* receive `FirebaseApp` notifications, log info about the success or failure of their
2626
* configuration, and access other internal functionality of `FirebaseApp`.
27-
*
28-
* TODO(b/28296561): Restructure this header.
2927
*/
3028
NS_ASSUME_NONNULL_BEGIN
3129

‎FirebaseDatabase/Sources/Api/FIRDatabase.m

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,6 @@ + (FIRDatabase *)databaseForApp:(FIRApp *)app URL:(NSString *)url {
9797
}
9898

9999
+ (NSString *)buildVersion {
100-
// TODO: Restore git hash when build moves back to git
101100
return [NSString stringWithFormat:@"%@_%s", FIRFirebaseVersion(), __DATE__];
102101
}
103102

‎FirebaseDynamicLinks/Sources/FIRDynamicLinks.m

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -557,9 +557,6 @@ - (void)handlePendingDynamicLinkRetrievalFailureWithErrorCode:(NSInteger)errorCo
557557
errorDescription:(NSString *)errorDescription
558558
underlyingError:(nullable NSError *)underlyingError {
559559
self.retrievingPendingDynamicLink = NO;
560-
561-
// TODO (b/38035270) inform caller why we failed, for App developer it is hard to debug
562-
// stuff like this without having source code access
563560
}
564561

565562
#pragma mark - FIRDLRetrievalProcessDelegate
@@ -585,7 +582,6 @@ - (void)retrievalProcess:(id<FIRDLRetrievalProcessProtocol>)retrievalProcess
585582

586583
static NSString *kSelfDiagnoseOutputHeader =
587584
@"---- Firebase Dynamic Links diagnostic output start ----\n";
588-
// TODO (b/38397557) Add link to the "Debug FDL" documentation when docs is published
589585
static NSString *kSelfDiagnoseOutputFooter =
590586
@"---- Firebase Dynamic Links diagnostic output end ----\n";
591587

‎scripts/check_whitespace.sh

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -25,24 +25,17 @@ options=(
2525
' $'
2626
)
2727

28-
# TODO(https://github.com/nanopb/nanopb/pull/622) remove Protogen exceptions
29-
# likely in a nanopb release after 0.3.9.7.
30-
3128
git grep "${options[@]}" -- \
32-
':(exclude)Crashlytics/Protogen/nanopb' \
3329
':(exclude)Crashlytics/ProtoSupport' \
3430
':(exclude)Crashlytics/UnitTests/Data' \
35-
':(exclude)Firebase/CoreDiagnostics/FIRCDLibrary/Protogen/nanopb' \
3631
':(exclude)Firebase/CoreDiagnostics/ProtoSupport' \
3732
':(exclude)CoreOnly/NOTICES' \
3833
':(exclude)Firebase/Firebase/NOTICES' \
3934
':(exclude)Firebase/InAppMessaging/ProtoSupport' \
40-
':(exclude)Firebase/InAppMessaging/Analytics/Protogen/nanopb' \
4135
':(exclude)Firestore/Protos/nanopb' \
4236
':(exclude)Firestore/Protos/cpp' \
4337
':(exclude)Firestore/Protos/objc' \
4438
':(exclude)Firestore/third_party/abseil-cpp' \
45-
':(exclude)GoogleDataTransport/GDTCCTLibrary/Protogen/nanopb' \
4639
':(exclude)GoogleDataTransport/ProtoSupport' \
4740
':(exclude)ReleaseTooling/Template/NOTICES'
4841

0 commit comments

Comments
 (0)