diff --git a/packages/file_selector/file_selector_ios/CHANGELOG.md b/packages/file_selector/file_selector_ios/CHANGELOG.md index 7216134c73b7..659188337d5f 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 + +* Temporarily remove Swift Package Manager compatibility to resolve issues with Cocoapods builds. + ## 0.5.2 * Adds Swift Package Manager compatibility. 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 aa8774c3d40a..000000000000 --- 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 8dbd36d9806b..000000000000 --- 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/file_selector/file_selector_ios/pubspec.yaml b/packages/file_selector/file_selector_ios/pubspec.yaml index f0b9a2f45017..f91652e93fe9 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 573d7c3f1b8f..7a131df2c8a1 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 + +* Temporarily remove Swift Package Manager compatibility to resolve issues with Cocoapods builds. + ## 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/ios/image_picker_ios/Package.swift b/packages/image_picker/image_picker_ios/ios/image_picker_ios/Package.swift deleted file mode 100644 index 411869087159..000000000000 --- 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 96af612d7dcd..000000000000 --- 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" - } -} diff --git a/packages/image_picker/image_picker_ios/pubspec.yaml b/packages/image_picker/image_picker_ios/pubspec.yaml index dfa52382184b..a824aed35767 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