Skip to content
New issue

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

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

Already on GitHub? # to your account

Update podspecs to min iOS 10 #6517

Merged
merged 12 commits into from
Sep 22, 2020
Merged
Show file tree
Hide file tree
Changes from 11 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .github/workflows/remoteconfig.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ on:
- 'Interop/Analytics/Public/*.h'
- '.github/workflows/remoteconfig.yml'
- 'Gemfile'
- 'scripts/generate_access_token.sh'
schedule:
# Run every day at 11pm (PST) - cron uses UTC times
- cron: '0 7 * * *'
Expand Down
1 change: 1 addition & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -293,3 +293,4 @@ jobs:
branches:
only:
- master
- firebase7-main
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Uncomment the next line to define a global platform for your project
platform :ios, '9.0'
platform :ios, '10.0'

target 'CocoapodsIntegrationTest' do
use_frameworks!
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Uncomment the next line to define a global platform for your project
platform :ios, '9.0'
platform :ios, '10.0'

target 'CocoapodsIntegrationTest' do
pod 'FirebaseABTesting', :path => '../'
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Uncomment the next line to define a global platform for your project
platform :ios, '9.0'
platform :ios, '10.0'

target 'CocoapodsIntegrationTest' do
use_frameworks!
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Uncomment the next line to define a global platform for your project
platform :ios, '9.0'
platform :ios, '10.0'

target 'CocoapodsIntegrationTest' do
# Comment the next line if you don't want to use dynamic frameworks
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Uncomment the next line to define a global platform for your project
platform :ios, '9.0'
platform :ios, '10.0'

target 'CocoapodsIntegrationTest' do
pod 'FirebaseABTesting', :path => '../'
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Uncomment the next line to define a global platform for your project
platform :ios, '9.0'
platform :ios, '10.0'

target 'CocoapodsIntegrationTest' do
pod 'FirebaseABTesting', :path => '../'
Expand Down
2 changes: 1 addition & 1 deletion CoreOnly/Tests/FirebasePodTest/Podfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Uncomment the next line to define a global platform for your project
# platform :ios, '9.0'
platform :ios, '10.0'

source 'https://github.com/firebase/SpecsStaging.git'
source 'https://cdn.cocoapods.org/'
Expand Down
21 changes: 10 additions & 11 deletions Firebase.podspec
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ Simplify your app development, grow your user base, and monetize more effectivel
"CoreOnly/README.md"
]
s.social_media_url = 'https://twitter.com/Firebase'
s.ios.deployment_target = '8.0'
s.osx.deployment_target = '10.11'
s.ios.deployment_target = '10.0'
s.osx.deployment_target = '10.12'
s.tvos.deployment_target = '10.0'

s.cocoapods_version = '>= 1.4.0'
Expand All @@ -49,13 +49,14 @@ Simplify your app development, grow your user base, and monetize more effectivel
}
end
# Standard platforms PLUS watchOS.
ss.ios.deployment_target = '8.0'
ss.osx.deployment_target = '10.11'
ss.ios.deployment_target = '9.0'
ss.osx.deployment_target = '10.12'
ss.tvos.deployment_target = '10.0'
ss.watchos.deployment_target = '6.0'
end

s.subspec 'Analytics' do |ss|
ss.ios.deployment_target = '9.0'
ss.dependency 'Firebase/Core'
end

Expand All @@ -66,15 +67,13 @@ Simplify your app development, grow your user base, and monetize more effectivel

s.subspec 'AdMob' do |ss|
ss.dependency 'Firebase/CoreOnly'
# 7.64 bumps the minimum iOS version to 9.0, so don't update here until
# next major version.
ss.ios.deployment_target = '9.0'
ss.ios.dependency 'Google-Mobile-Ads-SDK', '~> 7.63'
end

s.subspec 'AppDistribution' do |ss|
ss.dependency 'Firebase/CoreOnly'
ss.ios.dependency 'FirebaseAppDistribution', '~> 0.9.1'
ss.ios.deployment_target = '9.0'
end

s.subspec 'Auth' do |ss|
Expand Down Expand Up @@ -117,8 +116,8 @@ Simplify your app development, grow your user base, and monetize more effectivel
ss.dependency 'Firebase/CoreOnly'
ss.dependency 'FirebaseMessaging', '~> 4.6.2'
# Standard platforms PLUS watchOS.
ss.ios.deployment_target = '8.0'
ss.osx.deployment_target = '10.11'
ss.ios.deployment_target = '10.0'
ss.osx.deployment_target = '10.12'
ss.tvos.deployment_target = '10.0'
ss.watchos.deployment_target = '6.0'
end
Expand All @@ -137,8 +136,8 @@ Simplify your app development, grow your user base, and monetize more effectivel
ss.dependency 'Firebase/CoreOnly'
ss.dependency 'FirebaseStorage', '~> 3.9.0'
# Standard platforms PLUS watchOS.
ss.ios.deployment_target = '8.0'
ss.osx.deployment_target = '10.11'
ss.ios.deployment_target = '10.0'
ss.osx.deployment_target = '10.12'
ss.tvos.deployment_target = '10.0'
ss.watchos.deployment_target = '6.0'
end
Expand Down
4 changes: 2 additions & 2 deletions FirebaseABTesting.podspec
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ Firebase Cloud Messaging and Firebase Remote Config in your app.
:tag => 'ABTesting-' + s.version.to_s
}
s.social_media_url = 'https://twitter.com/Firebase'
s.ios.deployment_target = '8.0'
s.osx.deployment_target = '10.11'
s.ios.deployment_target = '10.0'
s.osx.deployment_target = '10.12'
s.tvos.deployment_target = '10.0'

s.cocoapods_version = '>= 1.4.0'
Expand Down
2 changes: 1 addition & 1 deletion FirebaseAppDistribution.podspec
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ iOS SDK for App Distribution for Firebase.
:tag => 'AppDistribution-' + s.version.to_s
}

s.ios.deployment_target = '9.0'
s.ios.deployment_target = '10.0'

s.cocoapods_version = '>= 1.4.0'
s.static_framework = true
Expand Down
4 changes: 2 additions & 2 deletions FirebaseAuth.podspec
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ supports email and password accounts, as well as several 3rd party authenticatio
:tag => 'Auth-' + s.version.to_s
}
s.social_media_url = 'https://twitter.com/Firebase'
s.ios.deployment_target = '8.0'
s.osx.deployment_target = '10.11'
s.ios.deployment_target = '10.0'
s.osx.deployment_target = '10.12'
s.tvos.deployment_target = '10.0'
s.watchos.deployment_target = '6.0'

Expand Down
2 changes: 1 addition & 1 deletion FirebaseAuth/Tests/Sample/Podfile
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ source 'https://cdn.cocoapods.org/'
use_frameworks!

target 'AuthSample' do
platform :ios, '8.0'
platform :ios, '10.0'
pod 'FirebaseCore', :path => '../../../'
pod 'FirebaseCoreDiagnostics', :path => '../../../'
pod 'GoogleDataTransport', :path => '../../../'
Expand Down
4 changes: 2 additions & 2 deletions FirebaseCore.podspec
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ Firebase Core includes FIRApp and FIROptions which provide central configuration
:tag => 'Core-' + s.version.to_s
}
s.social_media_url = 'https://twitter.com/Firebase'
s.ios.deployment_target = '8.0'
s.osx.deployment_target = '10.11'
s.ios.deployment_target = '9.0'
s.osx.deployment_target = '10.12'
s.tvos.deployment_target = '10.0'
s.watchos.deployment_target = '6.0'

Expand Down
4 changes: 4 additions & 0 deletions FirebaseCore/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
# Firebase 7.0.0
- [changed] Update minimum iOS version to iOS 10 except for Analytics which is now iOS 9. (#4847)
- [changed] Update minimum OSX version to 10.12.
Copy link
Contributor

Choose a reason for hiding this comment

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

Apple no longer calls this operating system "OSX": it's "macOS".


# Firebase 6.32.0
- [changed] Swift Package Manager - It's no longer necessary to select the Firebase or
FirebaseCore products. Their build targets are implicitly selected when choosing any other
Expand Down
4 changes: 2 additions & 2 deletions FirebaseCoreDiagnostics.podspec
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ non-Cocoapod integration. This library also respects the Firebase global data co
:tag => 'CoreDiagnostics-' + s.version.to_s
}
s.social_media_url = 'https://twitter.com/Firebase'
s.ios.deployment_target = '8.0'
s.osx.deployment_target = '10.11'
s.ios.deployment_target = '9.0'
s.osx.deployment_target = '10.12'
s.tvos.deployment_target = '10.0'
s.watchos.deployment_target = '6.0'

Expand Down
4 changes: 2 additions & 2 deletions FirebaseCrashlytics.podspec
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ Pod::Spec.new do |s|
:tag => 'Crashlytics-' + s.version.to_s
}

s.ios.deployment_target = '8.0'
s.osx.deployment_target = '10.11'
s.ios.deployment_target = '10.0'
s.osx.deployment_target = '10.12'
s.tvos.deployment_target = '10.0'
s.watchos.deployment_target = '6.0'

Expand Down
4 changes: 2 additions & 2 deletions FirebaseDatabase.podspec
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ Simplify your iOS development, grow your user base, and monetize more effectivel
:tag => 'Database-' + s.version.to_s
}
s.social_media_url = 'https://twitter.com/Firebase'
s.ios.deployment_target = '8.0'
s.osx.deployment_target = '10.11'
s.ios.deployment_target = '10.0'
s.osx.deployment_target = '10.12'
s.tvos.deployment_target = '10.0'

s.cocoapods_version = '>= 1.4.0'
Expand Down
2 changes: 1 addition & 1 deletion FirebaseDynamicLinks.podspec
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ Firebase Dynamic Links are deep links that enhance user experience and increase
:tag => 'DynamicLinks-' + s.version.to_s
}
s.social_media_url = 'https://twitter.com/Firebase'
s.ios.deployment_target = '8.0'
s.ios.deployment_target = '10.0'

s.cocoapods_version = '>= 1.4.0'
s.static_framework = true
Expand Down
12 changes: 1 addition & 11 deletions FirebaseDynamicLinks/Sources/FIRDynamicLinks.m
Original file line number Diff line number Diff line change
Expand Up @@ -531,17 +531,7 @@ - (BOOL)handleIncomingCustomSchemeDeepLink:(NSURL *)url {
}

- (void)passRetrievedDynamicLinkToApplication:(NSURL *)url {
id<UIApplicationDelegate> applicationDelegate = [UIApplication sharedApplication].delegate;
if (applicationDelegate &&
[applicationDelegate respondsToSelector:@selector(application:openURL:options:)]) {
// pass url directly to application delegate to avoid hop into
// iOS handling of the universal links
if (@available(iOS 9.0, *)) {
[applicationDelegate application:[UIApplication sharedApplication] openURL:url options:@{}];
return;
}
}
[[UIApplication sharedApplication] openURL:url];
[[UIApplication sharedApplication] openURL:url options:@{} completionHandler:nil];
}

- (void)handlePendingDynamicLinkRetrievalFailureWithErrorCode:(NSInteger)errorCode
Expand Down
4 changes: 2 additions & 2 deletions FirebaseFirestore.podspec
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ Google Cloud Firestore is a NoSQL document database built for automatic scaling,
:tag => 'Firestore-' + s.version.to_s
}

s.ios.deployment_target = '8.0'
s.osx.deployment_target = '10.11'
s.ios.deployment_target = '10.0'
s.osx.deployment_target = '10.12'
s.tvos.deployment_target = '10.0'

s.cocoapods_version = '>= 1.4.0'
Expand Down
4 changes: 2 additions & 2 deletions FirebaseFirestoreSwift.podspec
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ Google Cloud Firestore is a NoSQL document database built for automatic scaling,
}

s.swift_version = '4.1'
s.ios.deployment_target = '8.0'
s.osx.deployment_target = '10.11'
s.ios.deployment_target = '10.0'
s.osx.deployment_target = '10.12'
s.tvos.deployment_target = '10.0'

s.cocoapods_version = '>= 1.4.0'
Expand Down
4 changes: 2 additions & 2 deletions FirebaseFunctions.podspec
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ Cloud Functions for Firebase.
:tag => 'Functions-' + s.version.to_s
}

s.ios.deployment_target = '8.0'
s.osx.deployment_target = '10.11'
s.ios.deployment_target = '10.0'
s.osx.deployment_target = '10.12'
s.tvos.deployment_target = '10.0'

s.cocoapods_version = '>= 1.4.0'
Expand Down
2 changes: 1 addition & 1 deletion FirebaseInAppMessaging.podspec
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ See more product details at https://firebase.google.com/products/in-app-messagin
:tag => 'InAppMessaging-' + s.version.to_s
}
s.social_media_url = 'https://twitter.com/Firebase'
s.ios.deployment_target = '9.0'
s.ios.deployment_target = '10.0'

s.cocoapods_version = '>= 1.4.0'
s.static_framework = true
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ pod 'GoogleUtilities', :path => '../../../..'
pod 'FirebaseABTesting', :path => '../../../..'

target 'FiamDisplaySwiftExample' do
platform :ios, '9.0'
platform :ios, '10.0'
pod 'FirebaseInAppMessaging', :path => '../../../..'
end

18 changes: 6 additions & 12 deletions FirebaseInAppMessaging/Tests/Unit/FIRIAMActionUrlFollowerTests.m
Original file line number Diff line number Diff line change
Expand Up @@ -108,18 +108,12 @@ - (void)testUniversalLinkHandlingReturnYES {

- (void)setupOpenURLViaIOSForUIApplicationWithReturnValue:(BOOL)returnValue {
// it would fallback to either openURL:options:completionHandler:
// or openURL: on the UIApplication object to follow the url
if ([self.mockApplication respondsToSelector:@selector(openURL:options:completionHandler:)]) {
// id types is needed for calling invokeBlockWithArgs
id yesOrNo = returnValue ? @YES : @NO;
if (@available(iOS 10.0, *)) {
OCMStub([self.mockApplication openURL:[OCMArg any]
options:[OCMArg any]
completionHandler:([OCMArg invokeBlockWithArgs:yesOrNo, nil])]);
}
} else {
OCMStub([self.mockApplication openURL:[OCMArg any]]).andReturn(returnValue);
}
// on the UIApplication object to follow the url
// id types is needed for calling invokeBlockWithArgs
id yesOrNo = returnValue ? @YES : @NO;
OCMStub([self.mockApplication openURL:[OCMArg any]
options:[OCMArg any]
completionHandler:([OCMArg invokeBlockWithArgs:yesOrNo, nil])]);
}

- (void)testUniversalLinkHandlingReturnNo {
Expand Down
8 changes: 4 additions & 4 deletions FirebaseInstallations.podspec
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ Pod::Spec.new do |s|
:tag => 'Installations-' + s.version.to_s
}
s.social_media_url = 'https://twitter.com/Firebase'
s.ios.deployment_target = '8.0'
s.osx.deployment_target = '10.11'
s.ios.deployment_target = '9.0'
s.osx.deployment_target = '10.12'
s.tvos.deployment_target = '10.0'
s.watchos.deployment_target = '6.0'

Expand Down Expand Up @@ -56,7 +56,7 @@ Pod::Spec.new do |s|
}

s.test_spec 'unit' do |unit_tests|
unit_tests.platforms = {:ios => '8.0', :osx => '10.11', :tvos => '10.0'}
unit_tests.platforms = {:ios => '9.0', :osx => '10.12', :tvos => '10.0'}
unit_tests.source_files = base_dir + 'Tests/Unit/**/*.[mh]',
base_dir + 'Tests/Utils/**/*.[mh]'
unit_tests.resources = base_dir + 'Tests/Fixture/**/*'
Expand All @@ -67,7 +67,7 @@ Pod::Spec.new do |s|
end

s.test_spec 'integration' do |int_tests|
int_tests.platforms = {:ios => '8.0', :osx => '10.11', :tvos => '10.0'}
int_tests.platforms = {:ios => '9.0', :osx => '10.12', :tvos => '10.0'}
int_tests.source_files = base_dir + 'Tests/Integration/**/*.[mh]'
int_tests.resources = base_dir + 'Tests/Resources/**/*'
if ENV['FIS_INTEGRATION_TESTS_REQUIRED'] && ENV['FIS_INTEGRATION_TESTS_REQUIRED'] == '1' then
Expand Down
6 changes: 3 additions & 3 deletions FirebaseInstanceID.podspec
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ services.
:tag => 'InstanceID-' + s.version.to_s
}
s.social_media_url = 'https://twitter.com/Firebase'
s.ios.deployment_target = '8.0'
s.osx.deployment_target = '10.11'
s.ios.deployment_target = '10.0'
s.osx.deployment_target = '10.12'
s.tvos.deployment_target = '10.0'
s.watchos.deployment_target = '6.0'

Expand Down Expand Up @@ -65,7 +65,7 @@ services.
end

s.test_spec 'integration' do |int_tests|
int_tests.platforms = {:ios => '8.0', :osx => '10.11', :tvos => '10.0'}
int_tests.platforms = {:ios => '10.0', :osx => '10.12', :tvos => '10.0'}
int_tests.source_files = 'Example/InstanceID/IntegrationTests/*.[mh]'
int_tests.resources = 'Example/InstanceID/Resources/**/*'
int_tests.requires_app_host = true
Expand Down
Loading