Skip to content

Commit

Permalink
Merging the 6.8.0 release into master (#3783)
Browse files Browse the repository at this point in the history
* Update versions for Release 6.8.0

* RemoteConfig fix pod spec lint (#3715) (#3716)

* ABTesting: add protos to private headers.

* RemoteConfig: #import <FirebaseABTesting/ExperimentPayload.pbobjc.h>

* ./scripts/style.sh

* Remote Config `pod spec lint` fixes (#3717) (#3718)

* Fix ExperimentPayload.pbobjc.h imports

* RemoteConfig tests: add missing headers to spec.

* Revert ExperimentPayload.pbobjc.h import for ABTesting sources.

* Add FDL to M55 (#3724)

* Remove references to UIWebView from DynamicLinks to comply with Apple "ITMS-90809: Deprecated API Usage" (#3723)
* Add FDL to M55

* Fix accessing a destroyed object (#3721) (#3725)

This was caused by running under Asan with XCode 11. Apparently, previous versions of XCode cannot catch it (which is why Travis is passing, apparently).

Also:
* enable "Detect use of stack after return" option for Asan. AFAIU, it can only be enabled in the scheme. It's already enabled for unit tests, this PR additionally enables it for integration tests;
* make Asan failures fail Travis build. They were originally not considered blocking due to some sporadic failures. I haven't seen those for some time, and worst case scenario, we can revert this change.

* Cherry pick GDT changes for 6.8.0 and increment versions (#3770)

* Release 6.8.0: cherry pick of #3764 and #3766 (#3772)

* Gate access to cached instances. (#3766)

* Gate access to cached instances.

This is causing an issue in #3728. Hopefully this will fix it, but no
repro is available yet to test. There's still an underlying race
condition where a `creationBlock` could be called twice for a component
that is supposed to cache the instance returned, but that should be
addressed in a follow up PR.

* Review feedback.

* Iterate from array copy in `latestExperimentStartTimestampBetweenTimestamp:` (#3764)

* Release 6.8.0 cherry pick: conflicting Dynamic Links changelog changes. (#3790)

* Update FDL CHANGELOG (#3781)

* Issue number, not PR number (#3785)
  • Loading branch information
maksymmalyhin authored Sep 6, 2019
1 parent d440418 commit 89a2769
Show file tree
Hide file tree
Showing 12 changed files with 23 additions and 13 deletions.
2 changes: 1 addition & 1 deletion Example/Podfile
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ target 'Core_Example_iOS' do
# The next line is the forcing function for the Firebase pod. The Firebase
# version's subspecs should depend on the component versions in the
# corresponding podspec's in this repo.
pod 'Firebase/CoreOnly', '6.7.0'
pod 'Firebase/CoreOnly', '6.8.0'

target 'Core_Tests_iOS' do
inherit! :search_paths
Expand Down
2 changes: 1 addition & 1 deletion FirebaseABTesting.podspec
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Pod::Spec.new do |s|
s.name = 'FirebaseABTesting'
s.version = '3.1.0'
s.version = '3.1.1'
s.summary = 'Firebase ABTesting for iOS'

s.description = <<-DESC
Expand Down
4 changes: 2 additions & 2 deletions FirebaseCore.podspec
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Pod::Spec.new do |s|
s.name = 'FirebaseCore'
s.version = '6.2.1'
s.version = '6.2.2'
s.summary = 'Firebase Core for iOS (plus community support for macOS and tvOS)'

s.description = <<-DESC
Expand Down Expand Up @@ -39,7 +39,7 @@ Firebase Core includes FIRApp and FIROptions which provide central configuration
s.pod_target_xcconfig = {
'GCC_C_LANGUAGE_STANDARD' => 'c99',
'GCC_PREPROCESSOR_DEFINITIONS' =>
'FIRCore_VERSION=' + s.version.to_s + ' Firebase_VERSION=6.7.0',
'FIRCore_VERSION=' + s.version.to_s + ' Firebase_VERSION=6.8.0',
'OTHER_CFLAGS' => '-fno-autolink'
}
s.test_spec 'unit' do |unit_tests|
Expand Down
2 changes: 1 addition & 1 deletion FirebaseDynamicLinks.podspec
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Pod::Spec.new do |s|
s.name = 'FirebaseDynamicLinks'
s.version = '4.0.3'
s.version = '4.0.4'
s.summary = 'Firebase DynamicLinks for iOS'

s.description = <<-DESC
Expand Down
2 changes: 1 addition & 1 deletion FirebaseFirestore.podspec
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Pod::Spec.new do |s|
s.name = 'FirebaseFirestore'
s.version = '1.4.5'
s.version = '1.5.0'
s.summary = 'Google Cloud Firestore for iOS'

s.description = <<-DESC
Expand Down
2 changes: 1 addition & 1 deletion FirebaseInAppMessaging.podspec
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Pod::Spec.new do |s|
s.name = 'FirebaseInAppMessaging'
s.version = '0.15.3'
s.version = '0.15.4'
s.summary = 'Firebase In-App Messaging for iOS'

s.description = <<-DESC
Expand Down
2 changes: 1 addition & 1 deletion FirebaseInstanceID.podspec
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Pod::Spec.new do |s|
s.name = 'FirebaseInstanceID'
s.version = '4.2.3'
s.version = '4.2.4'
s.summary = 'Firebase InstanceID for iOS'

s.description = <<-DESC
Expand Down
2 changes: 1 addition & 1 deletion FirebaseMessaging.podspec
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Pod::Spec.new do |s|
s.name = 'FirebaseMessaging'
s.version = '4.1.3'
s.version = '4.1.4'
s.summary = 'Firebase Messaging for iOS'

s.description = <<-DESC
Expand Down
2 changes: 1 addition & 1 deletion Firestore/Example/Podfile
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ target 'Firestore_Example_iOS' do
# The next line is the forcing function for the Firebase pod. The Firebase
# version's subspecs should depend on the component versions in their
# corresponding podspecs.
pod 'Firebase/CoreOnly', '6.7.0'
pod 'Firebase/CoreOnly', '6.8.0'

configure_local_pods()

Expand Down
2 changes: 1 addition & 1 deletion GoogleDataTransport.podspec
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Pod::Spec.new do |s|
s.name = 'GoogleDataTransport'
s.version = '1.1.3'
s.version = '1.2.0'
s.summary = 'Google iOS SDK data transport.'

s.description = <<-DESC
Expand Down
4 changes: 2 additions & 2 deletions GoogleDataTransportCCTSupport.podspec
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

Pod::Spec.new do |s|
s.name = 'GoogleDataTransportCCTSupport'
s.version = '1.0.2'
s.version = '1.0.3'
s.summary = 'Support library for the GoogleDataTransport CCT backend target.'


Expand Down Expand Up @@ -30,7 +30,7 @@ Support library to provide event prioritization and uploading for the GoogleData
s.source_files = 'GoogleDataTransportCCTSupport/GDTCCTLibrary/**/*'
s.private_header_files = 'GoogleDataTransportCCTSupport/GDTCCTLibrary/Private/*.h'

s.dependency 'GoogleDataTransport', '~> 1.1'
s.dependency 'GoogleDataTransport', '~> 1.2'
s.dependency 'nanopb'

header_search_paths = {
Expand Down
10 changes: 10 additions & 0 deletions Releases/Manifests/6.8.0.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
{
"FirebaseABTesting":"3.1.1",
"FirebaseCore":"6.2.2",
"FirebaseDynamicLinks":"4.0.4",
"FirebaseFirestore":"1.5.0",
"FirebaseInAppMessaging":"0.15.4",
"FirebaseInstanceID":"4.2.4",
"FirebaseMessaging":"4.1.4",
"FirebaseRemoteConfig":"4.4.0"
}

0 comments on commit 89a2769

Please sign in to comment.