From 1073c2b533011eb71cfd93dd1328f165bf0d5282 Mon Sep 17 00:00:00 2001 From: Stuart Morgan Date: Fri, 17 May 2024 13:03:43 -0400 Subject: [PATCH 1/3] [interactive_media_ads] Add SPM support Restructures the placeholder iOS implementation to follow the Swift Package Manager layout, and enables SPM support. Also marks the plugin as unpublished since it's not ready for incremental changes to be published yet. Fixes https://github.com/flutter/flutter/issues/146906 --- .../ios/interactive_media_ads.podspec | 4 +-- .../ios/interactive_media_ads/Package.swift | 28 +++++++++++++++++++ .../InteractiveMediaAdsPlugin.swift | 0 .../Resources/PrivacyInfo.xcprivacy | 0 packages/interactive_media_ads/pubspec.yaml | 1 + 5 files changed, 31 insertions(+), 2 deletions(-) create mode 100644 packages/interactive_media_ads/ios/interactive_media_ads/Package.swift rename packages/interactive_media_ads/ios/{Classes => interactive_media_ads/Sources/interactive_media_ads}/InteractiveMediaAdsPlugin.swift (100%) rename packages/interactive_media_ads/ios/{ => interactive_media_ads/Sources/interactive_media_ads}/Resources/PrivacyInfo.xcprivacy (100%) diff --git a/packages/interactive_media_ads/ios/interactive_media_ads.podspec b/packages/interactive_media_ads/ios/interactive_media_ads.podspec index 8980d486c21..bb42cc28763 100644 --- a/packages/interactive_media_ads/ios/interactive_media_ads.podspec +++ b/packages/interactive_media_ads/ios/interactive_media_ads.podspec @@ -14,7 +14,7 @@ Downloaded by pub (not CocoaPods). s.license = { :type => 'BSD', :file => '../LICENSE' } s.author = { 'Flutter Dev Team' => 'flutter-dev@googlegroups.com' } s.source = { :http => 'https://github.com/flutter/packages/tree/main/packages/interactive_media_ads/interactive_media_ads' } - s.source_files = 'Classes/**/*' + s.source_files = 'interactive_media_ads/Sources/interactive_media_ads/**/*.swift' s.dependency 'Flutter' s.platform = :ios, '12.0' @@ -25,5 +25,5 @@ Downloaded by pub (not CocoaPods). 'LD_RUNPATH_SEARCH_PATHS' => '/usr/lib/swift', } s.swift_version = '5.0' - s.resource_bundles = {'interactive_media_ads_privacy' => ['Resources/PrivacyInfo.xcprivacy']} + s.resource_bundles = {'interactive_media_ads_privacy' => ['interactive_media_ads/Sources/interactive_media_ads/Resources/PrivacyInfo.xcprivacy']} end diff --git a/packages/interactive_media_ads/ios/interactive_media_ads/Package.swift b/packages/interactive_media_ads/ios/interactive_media_ads/Package.swift new file mode 100644 index 00000000000..a9fd6dc3ddf --- /dev/null +++ b/packages/interactive_media_ads/ios/interactive_media_ads/Package.swift @@ -0,0 +1,28 @@ +// 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: "interactive_media_ads", + platforms: [ + .iOS("12.0") + ], + products: [ + .library(name: "interactive-media-ads", targets: ["interactive_media_ads"]) + ], + dependencies: [], + targets: [ + .target( + name: "interactive_media_ads", + dependencies: [], + resources: [ + .process("Resources") + ] + ) + ] +) diff --git a/packages/interactive_media_ads/ios/Classes/InteractiveMediaAdsPlugin.swift b/packages/interactive_media_ads/ios/interactive_media_ads/Sources/interactive_media_ads/InteractiveMediaAdsPlugin.swift similarity index 100% rename from packages/interactive_media_ads/ios/Classes/InteractiveMediaAdsPlugin.swift rename to packages/interactive_media_ads/ios/interactive_media_ads/Sources/interactive_media_ads/InteractiveMediaAdsPlugin.swift diff --git a/packages/interactive_media_ads/ios/Resources/PrivacyInfo.xcprivacy b/packages/interactive_media_ads/ios/interactive_media_ads/Sources/interactive_media_ads/Resources/PrivacyInfo.xcprivacy similarity index 100% rename from packages/interactive_media_ads/ios/Resources/PrivacyInfo.xcprivacy rename to packages/interactive_media_ads/ios/interactive_media_ads/Sources/interactive_media_ads/Resources/PrivacyInfo.xcprivacy diff --git a/packages/interactive_media_ads/pubspec.yaml b/packages/interactive_media_ads/pubspec.yaml index a6b7b04a214..42d180e946c 100644 --- a/packages/interactive_media_ads/pubspec.yaml +++ b/packages/interactive_media_ads/pubspec.yaml @@ -3,6 +3,7 @@ description: A Flutter plugin for using the Interactive Media Ads SDKs on Androi repository: https://github.com/flutter/packages/tree/main/packages/interactive_media_ads issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+interactive_media_ads%22 version: 0.0.1 +publish_to: none environment: sdk: ^3.2.3 From 692a93f06a2c1fefda87a763f1e30a0ac924de76 Mon Sep 17 00:00:00 2001 From: Stuart Morgan Date: Fri, 17 May 2024 13:19:14 -0400 Subject: [PATCH 2/3] Autoformat --- .../ios/interactive_media_ads/Package.swift | 34 +++++++++---------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/packages/interactive_media_ads/ios/interactive_media_ads/Package.swift b/packages/interactive_media_ads/ios/interactive_media_ads/Package.swift index a9fd6dc3ddf..1864dffbb78 100644 --- a/packages/interactive_media_ads/ios/interactive_media_ads/Package.swift +++ b/packages/interactive_media_ads/ios/interactive_media_ads/Package.swift @@ -8,21 +8,21 @@ import PackageDescription let package = Package( - name: "interactive_media_ads", - platforms: [ - .iOS("12.0") - ], - products: [ - .library(name: "interactive-media-ads", targets: ["interactive_media_ads"]) - ], - dependencies: [], - targets: [ - .target( - name: "interactive_media_ads", - dependencies: [], - resources: [ - .process("Resources") - ] - ) - ] + name: "interactive_media_ads", + platforms: [ + .iOS("12.0") + ], + products: [ + .library(name: "interactive-media-ads", targets: ["interactive_media_ads"]) + ], + dependencies: [], + targets: [ + .target( + name: "interactive_media_ads", + dependencies: [], + resources: [ + .process("Resources") + ] + ) + ] ) From e327143f7cc2238b42ed7057c8ead3e6f00c31f6 Mon Sep 17 00:00:00 2001 From: Stuart Morgan Date: Tue, 21 May 2024 15:26:46 -0400 Subject: [PATCH 3/3] Version bump --- packages/interactive_media_ads/CHANGELOG.md | 4 ++++ packages/interactive_media_ads/pubspec.yaml | 3 +-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/packages/interactive_media_ads/CHANGELOG.md b/packages/interactive_media_ads/CHANGELOG.md index 477158a8871..e52ec79d886 100644 --- a/packages/interactive_media_ads/CHANGELOG.md +++ b/packages/interactive_media_ads/CHANGELOG.md @@ -1,3 +1,7 @@ +## 0.0.1+1 + +* Adds Swift Package Manager support. + ## 0.0.1 * Adds platform interface for Android and iOS. diff --git a/packages/interactive_media_ads/pubspec.yaml b/packages/interactive_media_ads/pubspec.yaml index 42d180e946c..c4a0bc24ce7 100644 --- a/packages/interactive_media_ads/pubspec.yaml +++ b/packages/interactive_media_ads/pubspec.yaml @@ -2,8 +2,7 @@ name: interactive_media_ads description: A Flutter plugin for using the Interactive Media Ads SDKs on Android and iOS. repository: https://github.com/flutter/packages/tree/main/packages/interactive_media_ads issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+interactive_media_ads%22 -version: 0.0.1 -publish_to: none +version: 0.0.1+1 environment: sdk: ^3.2.3