Skip to content

Merge IID removal code to master#7814

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 32 commits into from
Mar 31, 2021
Merged

Merge IID removal code to master #7814

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
8ec05d6
Remove instanceID dependency from Messaging (#6103)
charlotteliang Jul 22, 2020
8ba1a1c
merge conflict
charlotteliang Jul 23, 2020
3d8e2c7
fix conflicts again
charlotteliang Jul 23, 2020
012bc14
fix conficts
charlotteliang Aug 13, 2020
1561602
merge conflicts from master
charlotteliang Aug 13, 2020
42ac674
Add both IID and FCM APIs in test app to test compatibility (#6285)
charlotteliang Aug 20, 2020
141b582
merge conflict
charlotteliang Oct 26, 2020
eda686b
merging master
charlotteliang Dec 1, 2020
dd085db
Merge branch 'master' of github.com:firebase/firebase-ios-sdk into ch…
charlotteliang Dec 22, 2020
cea68ec
Merge branch 'master' of github.com:firebase/firebase-ios-sdk into ch…
charlotteliang Dec 30, 2020
ded8291
Merge branch 'master' of github.com:firebase/firebase-ios-sdk into ch…
charlotteliang Jan 5, 2021
0582395
Should only have only one local cache of token (#7233)
charlotteliang Jan 11, 2021
8356e85
Merge branch 'master' of github.com:firebase/firebase-ios-sdk into ch…
charlotteliang Jan 12, 2021
3090073
Merge branch 'master' of github.com:firebase/firebase-ios-sdk into ch…
charlotteliang Jan 12, 2021
e1fbde9
[Remove IID] Move some token unit tests from IID to Messaging (#7294)
charlotteliang Feb 17, 2021
482d039
merge with master
charlotteliang Feb 17, 2021
5df1836
Merge remote-tracking branch 'origin/master' into chen/fm-master
charlotteliang Feb 24, 2021
41877bd
[IID removal]Move Checkin unit tests from InstanceID to Messaging (#7…
charlotteliang Mar 1, 2021
4f33b0e
Merge remote-tracking branch 'origin/master' into chen/fm-master
charlotteliang Mar 9, 2021
30335a3
merge from master
charlotteliang Mar 24, 2021
162e754
Add more token tests (#7776)
charlotteliang Mar 25, 2021
2471cd8
Merge remote-tracking branch 'origin/master' into chen/fm-master
charlotteliang Mar 30, 2021
0092172
merge conflict
charlotteliang Mar 30, 2021
f8fdf7f
fix conflicts
charlotteliang Mar 30, 2021
bb1230c
merge conflicts
charlotteliang Mar 30, 2021
a379ce2
fix conflicts
charlotteliang Mar 30, 2021
3f18619
revert removing iid dependency in podspec file
charlotteliang Mar 30, 2021
f74aef6
add Installations dependency in podspec
charlotteliang Mar 30, 2021
55579f1
run clangformat
charlotteliang Mar 30, 2021
7570b14
update changelog
charlotteliang Mar 30, 2021
3293bd7
fix a few podspec settings
charlotteliang Mar 31, 2021
f8ca45f
set release version to 7.11.0
charlotteliang Mar 31, 2021
File filter

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 7 additions & 4 deletions FirebaseMessaging.podspec
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -38,11 +38,10 @@ device, and it is completely free.
base_dir + 'Sources/**/*.[mh]',
'Interop/Analytics/Public/*.h',
'FirebaseCore/Sources/Private/*.h',
'FirebaseInstallations/Source/Library/Private/*.h',
'Firebase/InstanceID/Private/*.h',
'Firebase/InstanceID/Public/*.h',
'FirebaseInstallations/Source/Library/Private/*.h',
]
s.requires_arc = base_dir + 'Sources/*.m'
s.public_header_files = base_dir + 'Sources/Public/FirebaseMessaging/*.h'
s.library = 'sqlite3'
s.pod_target_xcconfig = {
Expand All@@ -54,8 +53,9 @@ device, and it is completely free.
s.tvos.framework = 'SystemConfiguration'
s.osx.framework = 'SystemConfiguration'
s.weak_framework = 'UserNotifications'
s.dependency 'FirebaseCore', '~> 7.0'
s.dependency 'FirebaseInstanceID', '~> 7.0'
s.dependency 'FirebaseInstallations', '~> 7.0'
s.dependency 'FirebaseCore', '~> 7.0'
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: alphabetize dependencies

Copy link
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done.

s.dependency 'GoogleUtilities/AppDelegateSwizzler', '~> 7.0'
s.dependency 'GoogleUtilities/Reachability', '~> 7.0'
s.dependency 'GoogleUtilities/Environment', '~> 7.0'
Expand All@@ -68,7 +68,10 @@ device, and it is completely free.
:osx => osx_deployment_target,
:tvos => tvos_deployment_target
}
unit_tests.source_files = 'FirebaseMessaging/Tests/UnitTests*/*.{m,h,swift}'
unit_tests.source_files = [
'FirebaseMessaging/Tests/UnitTests*/*.{m,h,swift}',
'SharedTestUtilities/URLSession/*.[mh]',
]
unit_tests.requires_app_host = true
unit_tests.pod_target_xcconfig = {
'CLANG_ENABLE_OBJC_WEAK' => 'YES'
Expand Down
4 changes: 2 additions & 2 deletions FirebaseMessaging/Apps/Shared/ContentView.swift
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -142,7 +142,6 @@ struct ContentView: View {
.multilineTextAlignment(.leading)
}
.navigationBarTitle("Firebase Messaging")

}.buttonStyle(IdentityButtonStyle())
}
}
Expand DownExpand Up@@ -338,8 +337,9 @@ struct IdentityButtonStyle: ButtonStyle {
.padding()
.foregroundColor(.white)
.background(Color.yellow)
.cornerRadius(40)
.cornerRadius(20)
// Push the button down a bit when it's pressed.
.scaleEffect(configuration.isPressed ? 0.9 : 1)
.font(.footnote)
}
}
1 change: 0 additions & 1 deletion FirebaseMessaging/Apps/Shared/SceneDelegate.swift
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -15,7 +15,6 @@
import Combine
import UIKit
import SwiftUI
import FirebaseInstanceID
import FirebaseMessaging
import FirebaseInstallations

Expand Down
3 changes: 3 additions & 0 deletions FirebaseMessaging/CHANGELOG.md
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
# 2021-04 -- v7.11.0
- [changed] Refactor Messaging to internally not depending on InstanceID, but can co-exist. Will remove InstanceID dependency in the next Firebase breaking change. (#7814)

# 2021-02 -- v7.7.0
- [fixed] Fixed an issue in which, when checking storage size before writing to disk, the client was checking document folders that were no longer used. (#7480)

Expand Down
Loading
close