From 78420030baee7654c9eaea639d1c3303694c65f3 Mon Sep 17 00:00:00 2001 From: Victoria Ashworth Date: Wed, 15 May 2024 13:00:19 -0500 Subject: [PATCH 1/3] Temporarily remove Swift Package compatibility for plugins that use modulemaps --- .../ios/file_selector_ios/Package.swift | 32 ------------------- .../include/module.modulemap | 10 ------ .../ios/image_picker_ios/Package.swift | 31 ------------------ .../image_picker_ios/include/module.modulemap | 14 -------- 4 files changed, 87 deletions(-) delete mode 100644 packages/file_selector/file_selector_ios/ios/file_selector_ios/Package.swift delete mode 100644 packages/file_selector/file_selector_ios/ios/file_selector_ios/Sources/file_selector_ios/include/module.modulemap delete mode 100644 packages/image_picker/image_picker_ios/ios/image_picker_ios/Package.swift delete mode 100644 packages/image_picker/image_picker_ios/ios/image_picker_ios/Sources/image_picker_ios/include/module.modulemap diff --git a/packages/file_selector/file_selector_ios/ios/file_selector_ios/Package.swift b/packages/file_selector/file_selector_ios/ios/file_selector_ios/Package.swift deleted file mode 100644 index aa8774c3d40..00000000000 --- a/packages/file_selector/file_selector_ios/ios/file_selector_ios/Package.swift +++ /dev/null @@ -1,32 +0,0 @@ -// swift-tools-version: 5.9 -// The swift-tools-version declares the minimum version of Swift required to build this package. - -// 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( - name: "file_selector_ios", - platforms: [ - .iOS("12.0") - ], - products: [ - .library(name: "file-selector-ios", targets: ["file_selector_ios"]) - ], - dependencies: [], - targets: [ - .target( - name: "file_selector_ios", - dependencies: [], - exclude: ["include/cocoapods_file_selector_ios.modulemap"], - resources: [ - .process("Resources") - ], - cSettings: [ - .headerSearchPath("include/file_selector_ios") - ] - ) - ] -) diff --git a/packages/file_selector/file_selector_ios/ios/file_selector_ios/Sources/file_selector_ios/include/module.modulemap b/packages/file_selector/file_selector_ios/ios/file_selector_ios/Sources/file_selector_ios/include/module.modulemap deleted file mode 100644 index 8dbd36d9806..00000000000 --- a/packages/file_selector/file_selector_ios/ios/file_selector_ios/Sources/file_selector_ios/include/module.modulemap +++ /dev/null @@ -1,10 +0,0 @@ -module file_selector_ios { - umbrella header "file_selector_ios/file_selector_ios-umbrella.h" - - export * - module * { export * } - - explicit module Test { - header "file_selector_ios/FFSFileSelectorPlugin_Test.h" - } -} diff --git a/packages/image_picker/image_picker_ios/ios/image_picker_ios/Package.swift b/packages/image_picker/image_picker_ios/ios/image_picker_ios/Package.swift deleted file mode 100644 index 41186908715..00000000000 --- a/packages/image_picker/image_picker_ios/ios/image_picker_ios/Package.swift +++ /dev/null @@ -1,31 +0,0 @@ -// 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( - name: "image_picker_ios", - platforms: [ - .iOS("12.0") - ], - products: [ - .library(name: "image-picker-ios", targets: ["image_picker_ios"]) - ], - dependencies: [], - targets: [ - .target( - name: "image_picker_ios", - dependencies: [], - exclude: ["include/ImagePickerPlugin.modulemap"], - resources: [ - .process("Resources") - ], - cSettings: [ - .headerSearchPath("include/image_picker_ios") - ] - ) - ] -) diff --git a/packages/image_picker/image_picker_ios/ios/image_picker_ios/Sources/image_picker_ios/include/module.modulemap b/packages/image_picker/image_picker_ios/ios/image_picker_ios/Sources/image_picker_ios/include/module.modulemap deleted file mode 100644 index 96af612d7dc..00000000000 --- a/packages/image_picker/image_picker_ios/ios/image_picker_ios/Sources/image_picker_ios/include/module.modulemap +++ /dev/null @@ -1,14 +0,0 @@ -module image_picker_ios { - umbrella header "image_picker_ios-umbrella.h" - - export * - module * { export * } - - explicit module Test { - header "image_picker_ios/FLTImagePickerPlugin_Test.h" - header "image_picker_ios/FLTImagePickerImageUtil.h" - header "image_picker_ios/FLTImagePickerMetaDataUtil.h" - header "image_picker_ios/FLTImagePickerPhotoAssetUtil.h" - header "image_picker_ios/FLTPHPickerSaveImageToPathOperation.h" - } -} From 7b6e3e32fcde3e1acbd164dac49c301a3f13b6a0 Mon Sep 17 00:00:00 2001 From: Victoria Ashworth Date: Wed, 15 May 2024 13:01:31 -0500 Subject: [PATCH 2/3] Update changelog and version --- packages/file_selector/file_selector_ios/CHANGELOG.md | 4 ++++ packages/file_selector/file_selector_ios/pubspec.yaml | 2 +- packages/image_picker/image_picker_ios/CHANGELOG.md | 4 ++++ packages/image_picker/image_picker_ios/pubspec.yaml | 2 +- 4 files changed, 10 insertions(+), 2 deletions(-) diff --git a/packages/file_selector/file_selector_ios/CHANGELOG.md b/packages/file_selector/file_selector_ios/CHANGELOG.md index 7216134c73b..2c9f7d99e17 100644 --- a/packages/file_selector/file_selector_ios/CHANGELOG.md +++ b/packages/file_selector/file_selector_ios/CHANGELOG.md @@ -1,3 +1,7 @@ +## 0.5.2+1 + +* Removes Swift Package Manager compatibility. + ## 0.5.2 * Adds Swift Package Manager compatibility. diff --git a/packages/file_selector/file_selector_ios/pubspec.yaml b/packages/file_selector/file_selector_ios/pubspec.yaml index f0b9a2f4501..f91652e93fe 100644 --- a/packages/file_selector/file_selector_ios/pubspec.yaml +++ b/packages/file_selector/file_selector_ios/pubspec.yaml @@ -2,7 +2,7 @@ name: file_selector_ios description: iOS implementation of the file_selector plugin. repository: https://github.com/flutter/packages/tree/main/packages/file_selector/file_selector_ios issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+file_selector%22 -version: 0.5.2 +version: 0.5.2+1 environment: sdk: ^3.2.3 diff --git a/packages/image_picker/image_picker_ios/CHANGELOG.md b/packages/image_picker/image_picker_ios/CHANGELOG.md index 573d7c3f1b8..1d860fa82a7 100644 --- a/packages/image_picker/image_picker_ios/CHANGELOG.md +++ b/packages/image_picker/image_picker_ios/CHANGELOG.md @@ -1,3 +1,7 @@ +## 0.8.11+2 + +* Removes Swift Package Manager compatibility. + ## 0.8.11+1 * Makes all headers public with Swift Package Manager integration to keep inline with CocoaPods. diff --git a/packages/image_picker/image_picker_ios/pubspec.yaml b/packages/image_picker/image_picker_ios/pubspec.yaml index dfa52382184..a824aed3576 100755 --- a/packages/image_picker/image_picker_ios/pubspec.yaml +++ b/packages/image_picker/image_picker_ios/pubspec.yaml @@ -2,7 +2,7 @@ name: image_picker_ios description: iOS implementation of the image_picker plugin. repository: https://github.com/flutter/packages/tree/main/packages/image_picker/image_picker_ios issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+image_picker%22 -version: 0.8.11+1 +version: 0.8.11+2 environment: sdk: ^3.3.0 From 2954e4e44f93b50832dbd34fd99125f048d5172f Mon Sep 17 00:00:00 2001 From: Victoria Ashworth Date: Wed, 15 May 2024 13:54:15 -0500 Subject: [PATCH 3/3] Update changelog to better message --- packages/file_selector/file_selector_ios/CHANGELOG.md | 2 +- packages/image_picker/image_picker_ios/CHANGELOG.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/file_selector/file_selector_ios/CHANGELOG.md b/packages/file_selector/file_selector_ios/CHANGELOG.md index 2c9f7d99e17..659188337d5 100644 --- a/packages/file_selector/file_selector_ios/CHANGELOG.md +++ b/packages/file_selector/file_selector_ios/CHANGELOG.md @@ -1,6 +1,6 @@ ## 0.5.2+1 -* Removes Swift Package Manager compatibility. +* Temporarily remove Swift Package Manager compatibility to resolve issues with Cocoapods builds. ## 0.5.2 diff --git a/packages/image_picker/image_picker_ios/CHANGELOG.md b/packages/image_picker/image_picker_ios/CHANGELOG.md index 1d860fa82a7..7a131df2c8a 100644 --- a/packages/image_picker/image_picker_ios/CHANGELOG.md +++ b/packages/image_picker/image_picker_ios/CHANGELOG.md @@ -1,6 +1,6 @@ ## 0.8.11+2 -* Removes Swift Package Manager compatibility. +* Temporarily remove Swift Package Manager compatibility to resolve issues with Cocoapods builds. ## 0.8.11+1