diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index cae6c4f..c988443 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -119,18 +119,18 @@ jobs: cd .. zip -r app-spm.ipa Payload-spm - # iOS IPA with CocoaPods - - name: Build iOS Sample (CocoaPods) - working-directory: ./didomi_sdk/example - run: | - flutter config --no-enable-swift-package-manager - flutter build ios --no-codesign - cd build/ios/iphoneos - mkdir Payload - cd Payload - ln -s ../Runner.app - cd .. - zip -r app.ipa Payload + # iOS IPA with CocoaPods disabled from https://github.com/didomi/flutter/pull/160 +# - name: Build iOS Sample (CocoaPods) +# working-directory: ./didomi_sdk/example +# run: | +# flutter config --no-enable-swift-package-manager +# flutter build ios --no-codesign +# cd build/ios/iphoneos +# mkdir Payload +# cd Payload +# ln -s ../Runner.app +# cd .. +# zip -r app.ipa Payload # Archive iOS IPA - name: Archive iOS artifacts diff --git a/ios/didomi_sdk/Package.swift b/ios/didomi_sdk/Package.swift index 1b681be..b33add1 100644 --- a/ios/didomi_sdk/Package.swift +++ b/ios/didomi_sdk/Package.swift @@ -12,29 +12,30 @@ let package = Package( .library(name: "didomi-sdk", targets: ["didomi_sdk"]) ], dependencies: [ - .package(url: "https://github.com/didomi/didomi-ios-sdk-spm", from: "2.47.0") + .package(url: "https://github.com/didomi/didomi-ios-sdk-spm", from: "2.47.0"), + // Provided by the Flutter tool: it generates this package next to the + // plugin package when building an app, so the relative path resolves then. + .package(name: "FlutterFramework", path: "../FlutterFramework") ], targets: [ .target( name: "DidomiSwift", dependencies: [ - .product(name: "Didomi", package: "didomi-ios-sdk-spm") + .product(name: "Didomi", package: "didomi-ios-sdk-spm"), + .product(name: "FlutterFramework", package: "FlutterFramework") ], path: "Sources/DidomiSwift", - resources: [], - linkerSettings: [ - .linkedFramework("Flutter", .when(platforms: [.iOS])) - ] + resources: [] ), .target( name: "didomi_sdk", - dependencies: ["DidomiSwift"], + dependencies: [ + "DidomiSwift", + .product(name: "FlutterFramework", package: "FlutterFramework") + ], path: "Sources/DidomiObjC", resources: [], - publicHeadersPath: "include", - linkerSettings: [ - .linkedFramework("Flutter", .when(platforms: [.iOS])) - ] + publicHeadersPath: "include" ) ] )