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

Skip podspec Swift Search Path validation if only swift file is Package.swift #6627

Merged

Conversation

vashworth
Copy link
Contributor

@vashworth vashworth commented Apr 29, 2024

Usually when an iOS plugin uses Swift files, it requires a workaround in the podspec to add Swift to the search paths. Part of the podspec-check command is validating this workaround is found. However, when the only Swift file is the Package.swift (Swift Package Manager manifest), skip this validation since having this file does not indicate the plugin uses Swift files.

Fixes flutter/flutter#147548.

Pre-launch Checklist

If you need help, consider asking for advice on the #hackers-new channel on Discord.

@vashworth vashworth marked this pull request as ready for review April 29, 2024 21:57
@vashworth vashworth changed the title Skip Swift Search Path validation if only swift file is Package.swift Skip podspec and license validation for Package.swift Apr 29, 2024
@stuartmorgan
Copy link
Contributor

Also, skip license check for Package.swift files.

I don't think we should skip the license here; it's authored code, not generated code. Even though it's not very interesting, it's still non-generated.

@vashworth
Copy link
Contributor Author

vashworth commented Apr 30, 2024

Also, skip license check for Package.swift files.

I don't think we should skip the license here; it's authored code, not generated code. Even though it's not very interesting, it's still non-generated.

I was thinking it didn't need to be licensed since we don't license the podspec file. Also, Package.swift is very picky about what comments are at the top of the file. The first comment has to be the tools version.

So to license it, it would look like

// swift-tools-version: 5.9

// Copyright 2013 The Flutter Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.

import PackageDescription

let package = Package(
...

Is that okay?

@stuartmorgan
Copy link
Contributor

That should be fine; it's similar to how bash script files have a #! comment before the license block section since that also has to be the very first line.

@vashworth vashworth changed the title Skip podspec and license validation for Package.swift Skip podspec Swift Search Path validation if only swift file is Package.swift Apr 30, 2024
Copy link
Contributor

@stuartmorgan stuartmorgan left a comment

Choose a reason for hiding this comment

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

LGTM

@vashworth vashworth added the autosubmit Merge PR when tree becomes green via auto submit App label Apr 30, 2024
@auto-submit auto-submit bot merged commit aea93d2 into flutter:main Apr 30, 2024
78 checks passed
engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request May 1, 2024
auto-submit bot pushed a commit to flutter/flutter that referenced this pull request May 1, 2024
flutter/packages@cc47b06...aea93d2

2024-04-30 15619084+vashworth@users.noreply.github.com Skip podspec Swift Search Path validation if only swift file is Package.swift (flutter/packages#6627)
2024-04-30 ditman@gmail.com [go_router_builder] Tweaks for latest analyzer-6.5.0 (flutter/packages#6632)
2024-04-30 engine-flutter-autoroll@skia.org Roll Flutter from db8c475 to b597dd2 (23 revisions) (flutter/packages#6631)
2024-04-30 44902066+waleedf112@users.noreply.github.com [flutter_adaptive_scaffold] use `MediaQuery.sizeOf` instead of `MediaQuery.of` to prevent unnecessary rebuilds (flutter/packages#6544)
2024-04-30 34871572+gmackall@users.noreply.github.com [image_picker] Update documentation to note that Photo Picker use is non-optional on Android 13+ (flutter/packages#6569)

If this roll has caused a breakage, revert this CL and stop the roller
using the controls here:
https://autoroll.skia.org/r/flutter-packages-flutter-autoroll
Please CC flutter-ecosystem@google.com,rmistry@google.com on the revert to ensure that a human
is aware of the problem.

To file a bug in Flutter: https://github.com/flutter/flutter/issues/new/choose

To report a problem with the AutoRoller itself, please file a bug:
https://issues.skia.org/issues/new?component=1389291&template=1850622

Documentation for the AutoRoller is here:
https://skia.googlesource.com/buildbot/+doc/main/autoroll/README.md
auto-submit bot pushed a commit that referenced this pull request May 2, 2024
…ge.swift for darwin plugins (#6635)

Fix for iOS was added in #6627, but neglected to handle when plugin uses darwin directory.

Supplemental fix for flutter/flutter#147548.
TecHaxter pushed a commit to TecHaxter/flutter_packages that referenced this pull request May 22, 2024
…ge.swift (flutter#6627)

Usually when an iOS plugin uses Swift files, it requires a workaround in the podspec to add Swift to the search paths. Part of the `podspec-check` command is validating this workaround is found. However, when the only Swift file is the `Package.swift` (Swift Package Manager manifest), skip this validation since having this file does not indicate the plugin uses Swift files.

Fixes flutter/flutter#147548.
TecHaxter pushed a commit to TecHaxter/flutter_packages that referenced this pull request May 22, 2024
…ge.swift for darwin plugins (flutter#6635)

Fix for iOS was added in flutter#6627, but neglected to handle when plugin uses darwin directory.

Supplemental fix for flutter/flutter#147548.
arc-yong pushed a commit to Arctuition/packages-arc that referenced this pull request Jun 14, 2024
…ge.swift (flutter#6627)

Usually when an iOS plugin uses Swift files, it requires a workaround in the podspec to add Swift to the search paths. Part of the `podspec-check` command is validating this workaround is found. However, when the only Swift file is the `Package.swift` (Swift Package Manager manifest), skip this validation since having this file does not indicate the plugin uses Swift files.

Fixes flutter/flutter#147548.
arc-yong pushed a commit to Arctuition/packages-arc that referenced this pull request Jun 14, 2024
…ge.swift for darwin plugins (flutter#6635)

Fix for iOS was added in flutter#6627, but neglected to handle when plugin uses darwin directory.

Supplemental fix for flutter/flutter#147548.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
autosubmit Merge PR when tree becomes green via auto submit App
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Skip Package.swift when validating in flutter/packages
2 participants