Skip to content
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.

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

Use maximally-compatible launch storyboard for iOS 8 compatibility. #8286

Merged
merged 5 commits into from
Nov 17, 2018
Merged

Use maximally-compatible launch storyboard for iOS 8 compatibility. #8286

merged 5 commits into from
Nov 17, 2018

Conversation

SlaunchaMan
Copy link
Contributor

Fixes #8285. This PR modifies the template for launch storyboards to be compatible with iOS 8 by not including safe area insets.

If we want to keep the current state, it looks like we could pass the deployment target to the method that uses this, so I could create an alternative version that works for iOS 8 targets, keeping this version for iOS 9 targets.

@dnkoutso
Copy link
Contributor

@SlaunchaMan yes lets pass deployment target and rename LAUNCHSCREEN_STORYBOARD_CONTENTS to LAUNCHSCREEN_STORYBOARD_CONTENTS_IOS_8 and LAUNCHSCREEN_STORYBOARD_CONTENTS_IOS_9

@dnkoutso dnkoutso added this to the 1.6.0 milestone Nov 16, 2018
@SlaunchaMan
Copy link
Contributor Author

Sounds good. How do I go about updating cocoapods-integration-specs with the new specs—would that PR need to land before this one?

@dnkoutso
Copy link
Contributor

@SlaunchaMan you will probably be OK if you split the two because the integration specs will use iOS 9.0 if they don't I will provide instructions, its fairly easy.

@dnkoutso
Copy link
Contributor

@SlaunchaMan make sure the Launchscreen.storyboard is the one created by Xcode for iOS 8.0 without any manual modifications etc.

@SlaunchaMan
Copy link
Contributor Author

@dnkoutso Xcode doesn’t ask you for your deployment target before you create a project, but what I have here is the minimal set of changes that make it build successfully.

@dnkoutso dnkoutso merged commit 66f1fa6 into CocoaPods:master Nov 17, 2018
@SlaunchaMan SlaunchaMan deleted the ios-8-launch-storyboards branch December 7, 2018 15:24
paulb777 pushed a commit that referenced this pull request Dec 20, 2018
Use maximally-compatible launch storyboard for iOS 8 compatibility.
dnkoutso added a commit that referenced this pull request Jan 25, 2019
Release 1.6.0.rc.1

* tag '1.6.0.rc.1':
  Release 1.6.0.rc.1
  [Gemspec] Bump Xcodeproj to `'>= 1.8.0', '< 2.0'`
  Bundle update
  Point Core at the stable branch
  Fix CHANGELOG for 1-6-stable
  Merge pull request #8334 from CocoaPods/paulb777/ldflags-regression (#8429)
  Merge pull request #8314 from CocoaPods/segiddins/remove-linker-flags-from-pod-targets (#8428)
  Merge pull request #8291 from CocoaPods/amorde/xcode-10-64-bit
  Fix unit test for pre build_type implementation
  Merge pull request #8287 from CocoaPods/paulb777/sf-info-plist
  Merge pull request #8234 from colus001/master
  Fix merge
  Merge pull request #8286 from SlaunchaMan/ios-8-launch-storyboards
  Supporting Xcode 10.1 with fourflusher 2.1.0.
  Merge pull request #8196 from cfis/master
  [CHANGELOG] Add empty Master section
dnkoutso added a commit that referenced this pull request Jan 25, 2019
* 1-6-stable:
  [CHANGELOG] Add empty Master section
  Release 1.6.0.rc.1
  [Gemspec] Bump Xcodeproj to `'>= 1.8.0', '< 2.0'`
  Bundle update
  Point Core at the stable branch
  Fix CHANGELOG for 1-6-stable
  Merge pull request #8334 from CocoaPods/paulb777/ldflags-regression (#8429)
  Merge pull request #8314 from CocoaPods/segiddins/remove-linker-flags-from-pod-targets (#8428)
  Merge pull request #8291 from CocoaPods/amorde/xcode-10-64-bit
  Fix unit test for pre build_type implementation
  Merge pull request #8287 from CocoaPods/paulb777/sf-info-plist
  Merge pull request #8234 from colus001/master
  Fix merge
  Merge pull request #8286 from SlaunchaMan/ios-8-launch-storyboards
  Supporting Xcode 10.1 with fourflusher 2.1.0.
  Merge pull request #8196 from cfis/master
  [CHANGELOG] Add empty Master section
dnkoutso added a commit that referenced this pull request Jan 25, 2019
* 1-6-stable:
  [CHANGELOG] Add empty Master section
  Release 1.6.0.rc.1
  [Gemspec] Bump Xcodeproj to `'>= 1.8.0', '< 2.0'`
  Bundle update
  Point Core at the stable branch
  Fix CHANGELOG for 1-6-stable
  Merge pull request #8334 from CocoaPods/paulb777/ldflags-regression (#8429)
  Merge pull request #8314 from CocoaPods/segiddins/remove-linker-flags-from-pod-targets (#8428)
  Merge pull request #8291 from CocoaPods/amorde/xcode-10-64-bit
  Fix unit test for pre build_type implementation
  Merge pull request #8287 from CocoaPods/paulb777/sf-info-plist
  Merge pull request #8234 from colus001/master
  Fix merge
  Merge pull request #8286 from SlaunchaMan/ios-8-launch-storyboards
  Supporting Xcode 10.1 with fourflusher 2.1.0.
  Merge pull request #8196 from cfis/master
  [CHANGELOG] Add empty Master section
dnkoutso added a commit that referenced this pull request Jan 25, 2019
* 1-6-stable:
  [CHANGELOG] Add empty Master section
  Release 1.6.0.rc.1
  [Gemspec] Bump Xcodeproj to `'>= 1.8.0', '< 2.0'`
  Bundle update
  Point Core at the stable branch
  Fix CHANGELOG for 1-6-stable
  Merge pull request #8334 from CocoaPods/paulb777/ldflags-regression (#8429)
  Merge pull request #8314 from CocoaPods/segiddins/remove-linker-flags-from-pod-targets (#8428)
  Merge pull request #8291 from CocoaPods/amorde/xcode-10-64-bit
  Fix unit test for pre build_type implementation
  Merge pull request #8287 from CocoaPods/paulb777/sf-info-plist
  Merge pull request #8234 from colus001/master
  Fix merge
  Merge pull request #8286 from SlaunchaMan/ios-8-launch-storyboards
  Supporting Xcode 10.1 with fourflusher 2.1.0.
  Merge pull request #8196 from cfis/master
  [CHANGELOG] Add empty Master section
dnkoutso added a commit that referenced this pull request Jan 25, 2019
* 1-6-stable:
  [CHANGELOG] Add empty Master section
  Release 1.6.0.rc.1
  [Gemspec] Bump Xcodeproj to `'>= 1.8.0', '< 2.0'`
  Bundle update
  Point Core at the stable branch
  Fix CHANGELOG for 1-6-stable
  Merge pull request #8334 from CocoaPods/paulb777/ldflags-regression (#8429)
  Merge pull request #8314 from CocoaPods/segiddins/remove-linker-flags-from-pod-targets (#8428)
  Merge pull request #8291 from CocoaPods/amorde/xcode-10-64-bit
  Fix unit test for pre build_type implementation
  Merge pull request #8287 from CocoaPods/paulb777/sf-info-plist
  Merge pull request #8234 from colus001/master
  Fix merge
  Merge pull request #8286 from SlaunchaMan/ios-8-launch-storyboards
  Supporting Xcode 10.1 with fourflusher 2.1.0.
  Merge pull request #8196 from cfis/master
  [CHANGELOG] Add empty Master section
dnkoutso added a commit that referenced this pull request Jan 25, 2019
* 1-6-stable:
  [CHANGELOG] Add empty Master section
  Release 1.6.0.rc.1
  [Gemspec] Bump Xcodeproj to `'>= 1.8.0', '< 2.0'`
  Bundle update
  Point Core at the stable branch
  Fix CHANGELOG for 1-6-stable
  Merge pull request #8334 from CocoaPods/paulb777/ldflags-regression (#8429)
  Merge pull request #8314 from CocoaPods/segiddins/remove-linker-flags-from-pod-targets (#8428)
  Merge pull request #8291 from CocoaPods/amorde/xcode-10-64-bit
  Fix unit test for pre build_type implementation
  Merge pull request #8287 from CocoaPods/paulb777/sf-info-plist
  Merge pull request #8234 from colus001/master
  Fix merge
  Merge pull request #8286 from SlaunchaMan/ios-8-launch-storyboards
  Supporting Xcode 10.1 with fourflusher 2.1.0.
  Merge pull request #8196 from cfis/master
  [CHANGELOG] Add empty Master section
dnkoutso added a commit that referenced this pull request Jan 25, 2019
* 1-6-stable:
  [CHANGELOG] Add empty Master section
  Release 1.6.0.rc.1
  [Gemspec] Bump Xcodeproj to `'>= 1.8.0', '< 2.0'`
  Bundle update
  Point Core at the stable branch
  Fix CHANGELOG for 1-6-stable
  Merge pull request #8334 from CocoaPods/paulb777/ldflags-regression (#8429)
  Merge pull request #8314 from CocoaPods/segiddins/remove-linker-flags-from-pod-targets (#8428)
  Merge pull request #8291 from CocoaPods/amorde/xcode-10-64-bit
  Fix unit test for pre build_type implementation
  Merge pull request #8287 from CocoaPods/paulb777/sf-info-plist
  Merge pull request #8234 from colus001/master
  Fix merge
  Merge pull request #8286 from SlaunchaMan/ios-8-launch-storyboards
  Supporting Xcode 10.1 with fourflusher 2.1.0.
  Merge pull request #8196 from cfis/master
  [CHANGELOG] Add empty Master section
dnkoutso added a commit that referenced this pull request Jan 25, 2019
* 1-6-stable:
  [CHANGELOG] Add empty Master section
  Release 1.6.0.rc.1
  [Gemspec] Bump Xcodeproj to `'>= 1.8.0', '< 2.0'`
  Bundle update
  Point Core at the stable branch
  Fix CHANGELOG for 1-6-stable
  Merge pull request #8334 from CocoaPods/paulb777/ldflags-regression (#8429)
  Merge pull request #8314 from CocoaPods/segiddins/remove-linker-flags-from-pod-targets (#8428)
  Merge pull request #8291 from CocoaPods/amorde/xcode-10-64-bit
  Fix unit test for pre build_type implementation
  Merge pull request #8287 from CocoaPods/paulb777/sf-info-plist
  Merge pull request #8234 from colus001/master
  Fix merge
  Merge pull request #8286 from SlaunchaMan/ios-8-launch-storyboards
  Supporting Xcode 10.1 with fourflusher 2.1.0.
  Merge pull request #8196 from cfis/master
  [CHANGELOG] Add empty Master section
dnkoutso added a commit that referenced this pull request Jan 25, 2019
* 1-6-stable:
  [CHANGELOG] Add empty Master section
  Release 1.6.0.rc.1
  [Gemspec] Bump Xcodeproj to `'>= 1.8.0', '< 2.0'`
  Bundle update
  Point Core at the stable branch
  Fix CHANGELOG for 1-6-stable
  Merge pull request #8334 from CocoaPods/paulb777/ldflags-regression (#8429)
  Merge pull request #8314 from CocoaPods/segiddins/remove-linker-flags-from-pod-targets (#8428)
  Merge pull request #8291 from CocoaPods/amorde/xcode-10-64-bit
  Fix unit test for pre build_type implementation
  Merge pull request #8287 from CocoaPods/paulb777/sf-info-plist
  Merge pull request #8234 from colus001/master
  Fix merge
  Merge pull request #8286 from SlaunchaMan/ios-8-launch-storyboards
  Supporting Xcode 10.1 with fourflusher 2.1.0.
  Merge pull request #8196 from cfis/master
  [CHANGELOG] Add empty Master section
sebastianv1 added a commit to sebastianv1/CocoaPods that referenced this pull request Jan 29, 2019
* upstream/master: (21 commits)
  Clean up `uses_swift?` method
  Fix `add_cdn_spec` with latest cocoapods-core bump
  [CHANGELOG] Add entry for plural setting
  [BuildSettings] Mark USER_HEADER_SEARCH_PATHS as plural
  [CHANGELOG] Add empty Master section
  Release 1.6.0.rc.1
  [Gemspec] Bump Xcodeproj to `'>= 1.8.0', '< 2.0'`
  Bundle update
  Point Core at the stable branch
  Fix CHANGELOG for 1-6-stable
  Merge pull request CocoaPods#8334 from CocoaPods/paulb777/ldflags-regression (CocoaPods#8429)
  Merge pull request CocoaPods#8314 from CocoaPods/segiddins/remove-linker-flags-from-pod-targets (CocoaPods#8428)
  Merge pull request CocoaPods#8291 from CocoaPods/amorde/xcode-10-64-bit
  Fix unit test for pre build_type implementation
  Merge pull request CocoaPods#8287 from CocoaPods/paulb777/sf-info-plist
  Merge pull request CocoaPods#8234 from colus001/master
  Fix merge
  Merge pull request CocoaPods#8286 from SlaunchaMan/ios-8-launch-storyboards
  Supporting Xcode 10.1 with fourflusher 2.1.0.
  Merge pull request CocoaPods#8196 from cfis/master
  ...
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants