diff --git a/.gitignore b/.gitignore index e1d82192..642b54c6 100644 --- a/.gitignore +++ b/.gitignore @@ -5,4 +5,6 @@ cmake-build-* /.idea /.dart_tool/ pubspec_overrides.yaml -build/ \ No newline at end of file +build/ +.build/ +.swiftpm/ diff --git a/packages/desktop_keep_screen_on/macos/desktop_keep_screen_on.podspec b/packages/desktop_keep_screen_on/macos/desktop_keep_screen_on.podspec index 7b112c3b..38e3fde7 100644 --- a/packages/desktop_keep_screen_on/macos/desktop_keep_screen_on.podspec +++ b/packages/desktop_keep_screen_on/macos/desktop_keep_screen_on.podspec @@ -14,7 +14,7 @@ A new Flutter plugin project. s.author = { 'Your Company' => 'email@example.com' } s.source = { :path => '.' } - s.source_files = 'Classes/**/*' + s.source_files = 'desktop_keep_screen_on/Sources/desktop_keep_screen_on/**/*' s.dependency 'FlutterMacOS' s.platform = :osx, '10.11' diff --git a/packages/desktop_keep_screen_on/macos/desktop_keep_screen_on/Package.swift b/packages/desktop_keep_screen_on/macos/desktop_keep_screen_on/Package.swift new file mode 100644 index 00000000..10f2427e --- /dev/null +++ b/packages/desktop_keep_screen_on/macos/desktop_keep_screen_on/Package.swift @@ -0,0 +1,23 @@ +// swift-tools-version: 5.9 +import PackageDescription + +let package = Package( + name: "desktop_keep_screen_on", + platforms: [ + .macOS("10.11") + ], + products: [ + .library(name: "desktop-keep-screen-on", targets: ["desktop_keep_screen_on"]) + ], + dependencies: [ + .package(name: "FlutterFramework", path: "../FlutterFramework") + ], + targets: [ + .target( + name: "desktop_keep_screen_on", + dependencies: [ + .product(name: "FlutterFramework", package: "FlutterFramework") + ] + ) + ] +) diff --git a/packages/desktop_keep_screen_on/macos/Classes/DesktopKeepScreenOnPlugin.swift b/packages/desktop_keep_screen_on/macos/desktop_keep_screen_on/Sources/desktop_keep_screen_on/DesktopKeepScreenOnPlugin.swift similarity index 100% rename from packages/desktop_keep_screen_on/macos/Classes/DesktopKeepScreenOnPlugin.swift rename to packages/desktop_keep_screen_on/macos/desktop_keep_screen_on/Sources/desktop_keep_screen_on/DesktopKeepScreenOnPlugin.swift diff --git a/packages/desktop_lifecycle/macos/desktop_lifecycle.podspec b/packages/desktop_lifecycle/macos/desktop_lifecycle.podspec index 81695dc4..20317183 100644 --- a/packages/desktop_lifecycle/macos/desktop_lifecycle.podspec +++ b/packages/desktop_lifecycle/macos/desktop_lifecycle.podspec @@ -13,7 +13,7 @@ A new flutter plugin project. s.license = { :file => '../LICENSE' } s.author = { 'Your Company' => 'email@example.com' } s.source = { :path => '.' } - s.source_files = 'Classes/**/*' + s.source_files = 'desktop_lifecycle/Sources/desktop_lifecycle/**/*' s.dependency 'FlutterMacOS' s.platform = :osx, '10.11' diff --git a/packages/desktop_lifecycle/macos/desktop_lifecycle/Package.swift b/packages/desktop_lifecycle/macos/desktop_lifecycle/Package.swift new file mode 100644 index 00000000..c5bb1911 --- /dev/null +++ b/packages/desktop_lifecycle/macos/desktop_lifecycle/Package.swift @@ -0,0 +1,23 @@ +// swift-tools-version: 5.9 +import PackageDescription + +let package = Package( + name: "desktop_lifecycle", + platforms: [ + .macOS("10.11") + ], + products: [ + .library(name: "desktop-lifecycle", targets: ["desktop_lifecycle"]) + ], + dependencies: [ + .package(name: "FlutterFramework", path: "../FlutterFramework") + ], + targets: [ + .target( + name: "desktop_lifecycle", + dependencies: [ + .product(name: "FlutterFramework", package: "FlutterFramework") + ] + ) + ] +) diff --git a/packages/desktop_lifecycle/macos/Classes/DesktopLifecyclePlugin.swift b/packages/desktop_lifecycle/macos/desktop_lifecycle/Sources/desktop_lifecycle/DesktopLifecyclePlugin.swift similarity index 100% rename from packages/desktop_lifecycle/macos/Classes/DesktopLifecyclePlugin.swift rename to packages/desktop_lifecycle/macos/desktop_lifecycle/Sources/desktop_lifecycle/DesktopLifecyclePlugin.swift diff --git a/packages/fts5_simple/macos/Libs/libsimple.dylib b/packages/fts5_simple/macos/Libs/libsimple.dylib deleted file mode 100755 index 5018f1d1..00000000 Binary files a/packages/fts5_simple/macos/Libs/libsimple.dylib and /dev/null differ diff --git a/packages/fts5_simple/macos/fts5_simple.podspec b/packages/fts5_simple/macos/fts5_simple.podspec index 0cfabca2..a3c589f1 100644 --- a/packages/fts5_simple/macos/fts5_simple.podspec +++ b/packages/fts5_simple/macos/fts5_simple.podspec @@ -13,9 +13,9 @@ A new flutter plugin project. s.license = { :file => '../LICENSE' } s.author = { 'Your Company' => 'email@example.com' } s.source = { :path => '.' } - s.source_files = 'Classes/**/*' + s.source_files = 'fts5_simple/Sources/fts5_simple/**/*' s.dependency 'FlutterMacOS' - s.vendored_libraries = 'libs/libsimple.dylib' + s.vendored_libraries = 'fts5_simple/Libs/libsimple.xcframework/macos-arm64_x86_64/libsimple.dylib' s.platform = :osx, '10.11' s.pod_target_xcconfig = { 'DEFINES_MODULE' => 'YES' } diff --git a/packages/fts5_simple/macos/fts5_simple/Libs/README.md b/packages/fts5_simple/macos/fts5_simple/Libs/README.md new file mode 100644 index 00000000..6d442c25 --- /dev/null +++ b/packages/fts5_simple/macos/fts5_simple/Libs/README.md @@ -0,0 +1,19 @@ +# libsimple + +`libsimple.xcframework` contains a universal macOS dylib assembled from the +official [libsimple v0.7.1 release](https://github.com/wangfenjin/simple/releases/tag/v0.7.1): + +- `libsimple-osx-arm64.zip` + (`b699f0fca1e7d1f8776d067708ecf4d0bcc2d765e4b643862e129058583b885f`) +- `libsimple-osx-x64.zip` + (`d6f7e9fc9dac3c2bcfb5389618d41f2f0db6ea5a83dd8b9a363cf9b02fa20f95`) + +After extracting both archives, create and ad-hoc sign the universal dylib: + +```sh +lipo -create \ + libsimple-osx-arm64/libsimple.dylib \ + libsimple-osx-x64/libsimple.dylib \ + -output libsimple.dylib +codesign --force --sign - libsimple.dylib +``` diff --git a/packages/fts5_simple/macos/fts5_simple/Libs/libsimple.xcframework/Info.plist b/packages/fts5_simple/macos/fts5_simple/Libs/libsimple.xcframework/Info.plist new file mode 100644 index 00000000..29b2f2ef --- /dev/null +++ b/packages/fts5_simple/macos/fts5_simple/Libs/libsimple.xcframework/Info.plist @@ -0,0 +1,28 @@ + + + + + AvailableLibraries + + + BinaryPath + libsimple.dylib + LibraryIdentifier + macos-arm64_x86_64 + LibraryPath + libsimple.dylib + SupportedArchitectures + + arm64 + x86_64 + + SupportedPlatform + macos + + + CFBundlePackageType + XFWK + XCFrameworkFormatVersion + 1.0 + + diff --git a/packages/fts5_simple/macos/fts5_simple/Libs/libsimple.xcframework/macos-arm64_x86_64/libsimple.dylib b/packages/fts5_simple/macos/fts5_simple/Libs/libsimple.xcframework/macos-arm64_x86_64/libsimple.dylib new file mode 100755 index 00000000..ebe508a8 Binary files /dev/null and b/packages/fts5_simple/macos/fts5_simple/Libs/libsimple.xcframework/macos-arm64_x86_64/libsimple.dylib differ diff --git a/packages/fts5_simple/macos/fts5_simple/Package.swift b/packages/fts5_simple/macos/fts5_simple/Package.swift new file mode 100644 index 00000000..995d5109 --- /dev/null +++ b/packages/fts5_simple/macos/fts5_simple/Package.swift @@ -0,0 +1,28 @@ +// swift-tools-version: 5.9 +import PackageDescription + +let package = Package( + name: "fts5_simple", + platforms: [ + .macOS("10.11") + ], + products: [ + .library(name: "fts5-simple", targets: ["fts5_simple"]) + ], + dependencies: [ + .package(name: "FlutterFramework", path: "../FlutterFramework") + ], + targets: [ + .binaryTarget( + name: "libsimple", + path: "Libs/libsimple.xcframework" + ), + .target( + name: "fts5_simple", + dependencies: [ + .product(name: "FlutterFramework", package: "FlutterFramework"), + "libsimple" + ] + ) + ] +) diff --git a/packages/fts5_simple/macos/Classes/Fts5SimplePlugin.swift b/packages/fts5_simple/macos/fts5_simple/Sources/fts5_simple/Fts5SimplePlugin.swift similarity index 100% rename from packages/fts5_simple/macos/Classes/Fts5SimplePlugin.swift rename to packages/fts5_simple/macos/fts5_simple/Sources/fts5_simple/Fts5SimplePlugin.swift diff --git a/packages/ogg_opus_player/darwin/Classes/OggOpusPlayerPlugin.h b/packages/ogg_opus_player/darwin/Classes/OggOpusPlayerPlugin.h deleted file mode 100644 index 534dbdba..00000000 --- a/packages/ogg_opus_player/darwin/Classes/OggOpusPlayerPlugin.h +++ /dev/null @@ -1,8 +0,0 @@ -#if TARGET_OS_IPHONE -#import -#else -#import -#endif - -@interface OggOpusPlayerPlugin : NSObject -@end diff --git a/packages/ogg_opus_player/darwin/Classes/OggOpusPlayerPlugin.m b/packages/ogg_opus_player/darwin/Classes/OggOpusPlayerPlugin.m deleted file mode 100644 index 1bcb7cb8..00000000 --- a/packages/ogg_opus_player/darwin/Classes/OggOpusPlayerPlugin.m +++ /dev/null @@ -1,15 +0,0 @@ -#import "OggOpusPlayerPlugin.h" -#if __has_include() -#import -#else -// Support project import fallback if the generated compatibility header -// is not copied when this plugin is created as a library. -// https://forums.swift.org/t/swift-static-libraries-dont-copy-generated-objective-c-header/19816 -#import "ogg_opus_player-Swift.h" -#endif - -@implementation OggOpusPlayerPlugin -+ (void)registerWithRegistrar:(NSObject*)registrar { - [SwiftOggOpusPlayerPlugin registerWithRegistrar:registrar]; -} -@end diff --git a/packages/ogg_opus_player/darwin/Classes/ogg_opus_player.h b/packages/ogg_opus_player/darwin/Classes/ogg_opus_player.h deleted file mode 100644 index 8b137891..00000000 --- a/packages/ogg_opus_player/darwin/Classes/ogg_opus_player.h +++ /dev/null @@ -1 +0,0 @@ - diff --git a/packages/ogg_opus_player/darwin/function.sh b/packages/ogg_opus_player/darwin/function.sh index a748ff32..874fbcea 100644 --- a/packages/ogg_opus_player/darwin/function.sh +++ b/packages/ogg_opus_player/darwin/function.sh @@ -19,7 +19,7 @@ cd "$(dirname \"$0\")" REPOROOT=$(pwd) # Where we'll end up storing things in the end -OUTPUTDIR="${REPOROOT}" +OUTPUTDIR="${REPOROOT}/ogg_opus_player" mkdir -p ${OUTPUTDIR}/Frameworks BUILDDIR="${REPOROOT}/build" @@ -162,6 +162,19 @@ function generate_xc_framework_info_plist() { AvailableLibraries + + LibraryIdentifier + macos-arm64_x86_64 + LibraryPath + lib${lib_name}.a + SupportedArchitectures + + arm64 + x86_64 + + SupportedPlatform + macos + HeadersPath Headers diff --git a/packages/ogg_opus_player/darwin/ogg_opus_player.podspec b/packages/ogg_opus_player/darwin/ogg_opus_player.podspec index abb3cc2f..e7fd764a 100644 --- a/packages/ogg_opus_player/darwin/ogg_opus_player.podspec +++ b/packages/ogg_opus_player/darwin/ogg_opus_player.podspec @@ -13,15 +13,15 @@ A new flutter plugin project. s.license = { :file => '../LICENSE' } s.author = { 'Your Company' => 'email@example.com' } s.source = { :path => '.' } - s.source_files = 'Classes/**/*', 'Headers/**/*' + s.source_files = 'ogg_opus_player/Sources/**/*' s.ios.dependency 'Flutter' s.osx.dependency 'FlutterMacOS' s.frameworks = 'Speech', 'AVFoundation', 'AudioToolbox' s.ios.deployment_target = '13.0' s.osx.deployment_target = '10.15' - s.ios.vendored_frameworks = 'Frameworks/libogg.xcframework', 'Frameworks/libopus.xcframework', 'Frameworks/libopusenc.xcframework', 'Frameworks/libopusfile.xcframework' - s.osx.vendored_libraries = 'Libs/libogg.a', 'Libs/libopus.a', 'Libs/libopusenc.a', 'Libs/libopusfile.a' + s.ios.vendored_frameworks = 'ogg_opus_player/Frameworks/libogg.xcframework', 'ogg_opus_player/Frameworks/libopus.xcframework', 'ogg_opus_player/Frameworks/libopusenc.xcframework', 'ogg_opus_player/Frameworks/libopusfile.xcframework' + s.osx.vendored_libraries = 'ogg_opus_player/Frameworks/libogg.xcframework/macos-arm64_x86_64/libogg.a', 'ogg_opus_player/Frameworks/libopus.xcframework/macos-arm64_x86_64/libopus.a', 'ogg_opus_player/Frameworks/libopusenc.xcframework/macos-arm64_x86_64/libopusenc.a', 'ogg_opus_player/Frameworks/libopusfile.xcframework/macos-arm64_x86_64/libopusfile.a' # Flutter.framework does not contain a i386 slice. s.pod_target_xcconfig = { 'DEFINES_MODULE' => 'YES', 'EXCLUDED_ARCHS[sdk=iphonesimulator*]' => 'i386', 'ENABLE_BITCODE' => 'NO' } diff --git a/packages/ogg_opus_player/darwin/Frameworks/libogg.xcframework/Info.plist b/packages/ogg_opus_player/darwin/ogg_opus_player/Frameworks/libogg.xcframework/Info.plist similarity index 78% rename from packages/ogg_opus_player/darwin/Frameworks/libogg.xcframework/Info.plist rename to packages/ogg_opus_player/darwin/ogg_opus_player/Frameworks/libogg.xcframework/Info.plist index 6efc8510..41196b66 100644 --- a/packages/ogg_opus_player/darwin/Frameworks/libogg.xcframework/Info.plist +++ b/packages/ogg_opus_player/darwin/ogg_opus_player/Frameworks/libogg.xcframework/Info.plist @@ -4,6 +4,19 @@ AvailableLibraries + + LibraryIdentifier + macos-arm64_x86_64 + LibraryPath + libogg.a + SupportedArchitectures + + arm64 + x86_64 + + SupportedPlatform + macos + HeadersPath Headers diff --git a/packages/ogg_opus_player/darwin/Frameworks/libogg.xcframework/ios-arm64/Headers/ogg/config_types.h b/packages/ogg_opus_player/darwin/ogg_opus_player/Frameworks/libogg.xcframework/ios-arm64/Headers/ogg/config_types.h similarity index 100% rename from packages/ogg_opus_player/darwin/Frameworks/libogg.xcframework/ios-arm64/Headers/ogg/config_types.h rename to packages/ogg_opus_player/darwin/ogg_opus_player/Frameworks/libogg.xcframework/ios-arm64/Headers/ogg/config_types.h diff --git a/packages/ogg_opus_player/darwin/Frameworks/libogg.xcframework/ios-arm64/Headers/ogg/ogg.h b/packages/ogg_opus_player/darwin/ogg_opus_player/Frameworks/libogg.xcframework/ios-arm64/Headers/ogg/ogg.h similarity index 100% rename from packages/ogg_opus_player/darwin/Frameworks/libogg.xcframework/ios-arm64/Headers/ogg/ogg.h rename to packages/ogg_opus_player/darwin/ogg_opus_player/Frameworks/libogg.xcframework/ios-arm64/Headers/ogg/ogg.h diff --git a/packages/ogg_opus_player/darwin/Frameworks/libogg.xcframework/ios-arm64/Headers/ogg/os_types.h b/packages/ogg_opus_player/darwin/ogg_opus_player/Frameworks/libogg.xcframework/ios-arm64/Headers/ogg/os_types.h similarity index 100% rename from packages/ogg_opus_player/darwin/Frameworks/libogg.xcframework/ios-arm64/Headers/ogg/os_types.h rename to packages/ogg_opus_player/darwin/ogg_opus_player/Frameworks/libogg.xcframework/ios-arm64/Headers/ogg/os_types.h diff --git a/packages/ogg_opus_player/darwin/Frameworks/libogg.xcframework/ios-arm64/libogg.a b/packages/ogg_opus_player/darwin/ogg_opus_player/Frameworks/libogg.xcframework/ios-arm64/libogg.a similarity index 100% rename from packages/ogg_opus_player/darwin/Frameworks/libogg.xcframework/ios-arm64/libogg.a rename to packages/ogg_opus_player/darwin/ogg_opus_player/Frameworks/libogg.xcframework/ios-arm64/libogg.a diff --git a/packages/ogg_opus_player/darwin/Frameworks/libogg.xcframework/ios-arm64_x86_64-simulator/Headers/ogg/config_types.h b/packages/ogg_opus_player/darwin/ogg_opus_player/Frameworks/libogg.xcframework/ios-arm64_x86_64-simulator/Headers/ogg/config_types.h similarity index 100% rename from packages/ogg_opus_player/darwin/Frameworks/libogg.xcframework/ios-arm64_x86_64-simulator/Headers/ogg/config_types.h rename to packages/ogg_opus_player/darwin/ogg_opus_player/Frameworks/libogg.xcframework/ios-arm64_x86_64-simulator/Headers/ogg/config_types.h diff --git a/packages/ogg_opus_player/darwin/Frameworks/libogg.xcframework/ios-arm64_x86_64-simulator/Headers/ogg/ogg.h b/packages/ogg_opus_player/darwin/ogg_opus_player/Frameworks/libogg.xcframework/ios-arm64_x86_64-simulator/Headers/ogg/ogg.h similarity index 100% rename from packages/ogg_opus_player/darwin/Frameworks/libogg.xcframework/ios-arm64_x86_64-simulator/Headers/ogg/ogg.h rename to packages/ogg_opus_player/darwin/ogg_opus_player/Frameworks/libogg.xcframework/ios-arm64_x86_64-simulator/Headers/ogg/ogg.h diff --git a/packages/ogg_opus_player/darwin/Frameworks/libogg.xcframework/ios-arm64_x86_64-simulator/Headers/ogg/os_types.h b/packages/ogg_opus_player/darwin/ogg_opus_player/Frameworks/libogg.xcframework/ios-arm64_x86_64-simulator/Headers/ogg/os_types.h similarity index 100% rename from packages/ogg_opus_player/darwin/Frameworks/libogg.xcframework/ios-arm64_x86_64-simulator/Headers/ogg/os_types.h rename to packages/ogg_opus_player/darwin/ogg_opus_player/Frameworks/libogg.xcframework/ios-arm64_x86_64-simulator/Headers/ogg/os_types.h diff --git a/packages/ogg_opus_player/darwin/Frameworks/libogg.xcframework/ios-arm64_x86_64-simulator/libogg.a b/packages/ogg_opus_player/darwin/ogg_opus_player/Frameworks/libogg.xcframework/ios-arm64_x86_64-simulator/libogg.a similarity index 100% rename from packages/ogg_opus_player/darwin/Frameworks/libogg.xcframework/ios-arm64_x86_64-simulator/libogg.a rename to packages/ogg_opus_player/darwin/ogg_opus_player/Frameworks/libogg.xcframework/ios-arm64_x86_64-simulator/libogg.a diff --git a/packages/ogg_opus_player/darwin/Libs/libogg.a b/packages/ogg_opus_player/darwin/ogg_opus_player/Frameworks/libogg.xcframework/macos-arm64_x86_64/libogg.a similarity index 100% rename from packages/ogg_opus_player/darwin/Libs/libogg.a rename to packages/ogg_opus_player/darwin/ogg_opus_player/Frameworks/libogg.xcframework/macos-arm64_x86_64/libogg.a diff --git a/packages/ogg_opus_player/darwin/Frameworks/libopus.xcframework/Info.plist b/packages/ogg_opus_player/darwin/ogg_opus_player/Frameworks/libopus.xcframework/Info.plist similarity index 78% rename from packages/ogg_opus_player/darwin/Frameworks/libopus.xcframework/Info.plist rename to packages/ogg_opus_player/darwin/ogg_opus_player/Frameworks/libopus.xcframework/Info.plist index ebaa109a..fa2d481a 100644 --- a/packages/ogg_opus_player/darwin/Frameworks/libopus.xcframework/Info.plist +++ b/packages/ogg_opus_player/darwin/ogg_opus_player/Frameworks/libopus.xcframework/Info.plist @@ -4,6 +4,19 @@ AvailableLibraries + + LibraryIdentifier + macos-arm64_x86_64 + LibraryPath + libopus.a + SupportedArchitectures + + arm64 + x86_64 + + SupportedPlatform + macos + HeadersPath Headers diff --git a/packages/ogg_opus_player/darwin/Frameworks/libopus.xcframework/ios-arm64/Headers/opus/opus.h b/packages/ogg_opus_player/darwin/ogg_opus_player/Frameworks/libopus.xcframework/ios-arm64/Headers/opus/opus.h similarity index 100% rename from packages/ogg_opus_player/darwin/Frameworks/libopus.xcframework/ios-arm64/Headers/opus/opus.h rename to packages/ogg_opus_player/darwin/ogg_opus_player/Frameworks/libopus.xcframework/ios-arm64/Headers/opus/opus.h diff --git a/packages/ogg_opus_player/darwin/Frameworks/libopus.xcframework/ios-arm64/Headers/opus/opus_defines.h b/packages/ogg_opus_player/darwin/ogg_opus_player/Frameworks/libopus.xcframework/ios-arm64/Headers/opus/opus_defines.h similarity index 100% rename from packages/ogg_opus_player/darwin/Frameworks/libopus.xcframework/ios-arm64/Headers/opus/opus_defines.h rename to packages/ogg_opus_player/darwin/ogg_opus_player/Frameworks/libopus.xcframework/ios-arm64/Headers/opus/opus_defines.h diff --git a/packages/ogg_opus_player/darwin/Frameworks/libopus.xcframework/ios-arm64/Headers/opus/opus_multistream.h b/packages/ogg_opus_player/darwin/ogg_opus_player/Frameworks/libopus.xcframework/ios-arm64/Headers/opus/opus_multistream.h similarity index 100% rename from packages/ogg_opus_player/darwin/Frameworks/libopus.xcframework/ios-arm64/Headers/opus/opus_multistream.h rename to packages/ogg_opus_player/darwin/ogg_opus_player/Frameworks/libopus.xcframework/ios-arm64/Headers/opus/opus_multistream.h diff --git a/packages/ogg_opus_player/darwin/Frameworks/libopus.xcframework/ios-arm64/Headers/opus/opus_projection.h b/packages/ogg_opus_player/darwin/ogg_opus_player/Frameworks/libopus.xcframework/ios-arm64/Headers/opus/opus_projection.h similarity index 100% rename from packages/ogg_opus_player/darwin/Frameworks/libopus.xcframework/ios-arm64/Headers/opus/opus_projection.h rename to packages/ogg_opus_player/darwin/ogg_opus_player/Frameworks/libopus.xcframework/ios-arm64/Headers/opus/opus_projection.h diff --git a/packages/ogg_opus_player/darwin/Frameworks/libopus.xcframework/ios-arm64/Headers/opus/opus_types.h b/packages/ogg_opus_player/darwin/ogg_opus_player/Frameworks/libopus.xcframework/ios-arm64/Headers/opus/opus_types.h similarity index 100% rename from packages/ogg_opus_player/darwin/Frameworks/libopus.xcframework/ios-arm64/Headers/opus/opus_types.h rename to packages/ogg_opus_player/darwin/ogg_opus_player/Frameworks/libopus.xcframework/ios-arm64/Headers/opus/opus_types.h diff --git a/packages/ogg_opus_player/darwin/Frameworks/libopus.xcframework/ios-arm64/libopus.a b/packages/ogg_opus_player/darwin/ogg_opus_player/Frameworks/libopus.xcframework/ios-arm64/libopus.a similarity index 100% rename from packages/ogg_opus_player/darwin/Frameworks/libopus.xcframework/ios-arm64/libopus.a rename to packages/ogg_opus_player/darwin/ogg_opus_player/Frameworks/libopus.xcframework/ios-arm64/libopus.a diff --git a/packages/ogg_opus_player/darwin/Frameworks/libopus.xcframework/ios-arm64_x86_64-simulator/Headers/opus/opus.h b/packages/ogg_opus_player/darwin/ogg_opus_player/Frameworks/libopus.xcframework/ios-arm64_x86_64-simulator/Headers/opus/opus.h similarity index 100% rename from packages/ogg_opus_player/darwin/Frameworks/libopus.xcframework/ios-arm64_x86_64-simulator/Headers/opus/opus.h rename to packages/ogg_opus_player/darwin/ogg_opus_player/Frameworks/libopus.xcframework/ios-arm64_x86_64-simulator/Headers/opus/opus.h diff --git a/packages/ogg_opus_player/darwin/Frameworks/libopus.xcframework/ios-arm64_x86_64-simulator/Headers/opus/opus_defines.h b/packages/ogg_opus_player/darwin/ogg_opus_player/Frameworks/libopus.xcframework/ios-arm64_x86_64-simulator/Headers/opus/opus_defines.h similarity index 100% rename from packages/ogg_opus_player/darwin/Frameworks/libopus.xcframework/ios-arm64_x86_64-simulator/Headers/opus/opus_defines.h rename to packages/ogg_opus_player/darwin/ogg_opus_player/Frameworks/libopus.xcframework/ios-arm64_x86_64-simulator/Headers/opus/opus_defines.h diff --git a/packages/ogg_opus_player/darwin/Frameworks/libopus.xcframework/ios-arm64_x86_64-simulator/Headers/opus/opus_multistream.h b/packages/ogg_opus_player/darwin/ogg_opus_player/Frameworks/libopus.xcframework/ios-arm64_x86_64-simulator/Headers/opus/opus_multistream.h similarity index 100% rename from packages/ogg_opus_player/darwin/Frameworks/libopus.xcframework/ios-arm64_x86_64-simulator/Headers/opus/opus_multistream.h rename to packages/ogg_opus_player/darwin/ogg_opus_player/Frameworks/libopus.xcframework/ios-arm64_x86_64-simulator/Headers/opus/opus_multistream.h diff --git a/packages/ogg_opus_player/darwin/Frameworks/libopus.xcframework/ios-arm64_x86_64-simulator/Headers/opus/opus_projection.h b/packages/ogg_opus_player/darwin/ogg_opus_player/Frameworks/libopus.xcframework/ios-arm64_x86_64-simulator/Headers/opus/opus_projection.h similarity index 100% rename from packages/ogg_opus_player/darwin/Frameworks/libopus.xcframework/ios-arm64_x86_64-simulator/Headers/opus/opus_projection.h rename to packages/ogg_opus_player/darwin/ogg_opus_player/Frameworks/libopus.xcframework/ios-arm64_x86_64-simulator/Headers/opus/opus_projection.h diff --git a/packages/ogg_opus_player/darwin/Frameworks/libopus.xcframework/ios-arm64_x86_64-simulator/Headers/opus/opus_types.h b/packages/ogg_opus_player/darwin/ogg_opus_player/Frameworks/libopus.xcframework/ios-arm64_x86_64-simulator/Headers/opus/opus_types.h similarity index 100% rename from packages/ogg_opus_player/darwin/Frameworks/libopus.xcframework/ios-arm64_x86_64-simulator/Headers/opus/opus_types.h rename to packages/ogg_opus_player/darwin/ogg_opus_player/Frameworks/libopus.xcframework/ios-arm64_x86_64-simulator/Headers/opus/opus_types.h diff --git a/packages/ogg_opus_player/darwin/Frameworks/libopus.xcframework/ios-arm64_x86_64-simulator/libopus.a b/packages/ogg_opus_player/darwin/ogg_opus_player/Frameworks/libopus.xcframework/ios-arm64_x86_64-simulator/libopus.a similarity index 100% rename from packages/ogg_opus_player/darwin/Frameworks/libopus.xcframework/ios-arm64_x86_64-simulator/libopus.a rename to packages/ogg_opus_player/darwin/ogg_opus_player/Frameworks/libopus.xcframework/ios-arm64_x86_64-simulator/libopus.a diff --git a/packages/ogg_opus_player/darwin/Libs/libopus.a b/packages/ogg_opus_player/darwin/ogg_opus_player/Frameworks/libopus.xcframework/macos-arm64_x86_64/libopus.a similarity index 100% rename from packages/ogg_opus_player/darwin/Libs/libopus.a rename to packages/ogg_opus_player/darwin/ogg_opus_player/Frameworks/libopus.xcframework/macos-arm64_x86_64/libopus.a diff --git a/packages/ogg_opus_player/darwin/Frameworks/libopusenc.xcframework/Info.plist b/packages/ogg_opus_player/darwin/ogg_opus_player/Frameworks/libopusenc.xcframework/Info.plist similarity index 77% rename from packages/ogg_opus_player/darwin/Frameworks/libopusenc.xcframework/Info.plist rename to packages/ogg_opus_player/darwin/ogg_opus_player/Frameworks/libopusenc.xcframework/Info.plist index 6c5e0bf1..d304e68c 100644 --- a/packages/ogg_opus_player/darwin/Frameworks/libopusenc.xcframework/Info.plist +++ b/packages/ogg_opus_player/darwin/ogg_opus_player/Frameworks/libopusenc.xcframework/Info.plist @@ -4,6 +4,19 @@ AvailableLibraries + + LibraryIdentifier + macos-arm64_x86_64 + LibraryPath + libopusenc.a + SupportedArchitectures + + arm64 + x86_64 + + SupportedPlatform + macos + HeadersPath Headers diff --git a/packages/ogg_opus_player/darwin/Frameworks/libopusenc.xcframework/ios-arm64/Headers/opus/opusenc.h b/packages/ogg_opus_player/darwin/ogg_opus_player/Frameworks/libopusenc.xcframework/ios-arm64/Headers/opus/opusenc.h similarity index 100% rename from packages/ogg_opus_player/darwin/Frameworks/libopusenc.xcframework/ios-arm64/Headers/opus/opusenc.h rename to packages/ogg_opus_player/darwin/ogg_opus_player/Frameworks/libopusenc.xcframework/ios-arm64/Headers/opus/opusenc.h diff --git a/packages/ogg_opus_player/darwin/Frameworks/libopusenc.xcframework/ios-arm64/libopusenc.a b/packages/ogg_opus_player/darwin/ogg_opus_player/Frameworks/libopusenc.xcframework/ios-arm64/libopusenc.a similarity index 100% rename from packages/ogg_opus_player/darwin/Frameworks/libopusenc.xcframework/ios-arm64/libopusenc.a rename to packages/ogg_opus_player/darwin/ogg_opus_player/Frameworks/libopusenc.xcframework/ios-arm64/libopusenc.a diff --git a/packages/ogg_opus_player/darwin/Frameworks/libopusenc.xcframework/ios-arm64_x86_64-simulator/Headers/opus/opusenc.h b/packages/ogg_opus_player/darwin/ogg_opus_player/Frameworks/libopusenc.xcframework/ios-arm64_x86_64-simulator/Headers/opus/opusenc.h similarity index 100% rename from packages/ogg_opus_player/darwin/Frameworks/libopusenc.xcframework/ios-arm64_x86_64-simulator/Headers/opus/opusenc.h rename to packages/ogg_opus_player/darwin/ogg_opus_player/Frameworks/libopusenc.xcframework/ios-arm64_x86_64-simulator/Headers/opus/opusenc.h diff --git a/packages/ogg_opus_player/darwin/Frameworks/libopusenc.xcframework/ios-arm64_x86_64-simulator/libopusenc.a b/packages/ogg_opus_player/darwin/ogg_opus_player/Frameworks/libopusenc.xcframework/ios-arm64_x86_64-simulator/libopusenc.a similarity index 100% rename from packages/ogg_opus_player/darwin/Frameworks/libopusenc.xcframework/ios-arm64_x86_64-simulator/libopusenc.a rename to packages/ogg_opus_player/darwin/ogg_opus_player/Frameworks/libopusenc.xcframework/ios-arm64_x86_64-simulator/libopusenc.a diff --git a/packages/ogg_opus_player/darwin/Libs/libopusenc.a b/packages/ogg_opus_player/darwin/ogg_opus_player/Frameworks/libopusenc.xcframework/macos-arm64_x86_64/libopusenc.a similarity index 100% rename from packages/ogg_opus_player/darwin/Libs/libopusenc.a rename to packages/ogg_opus_player/darwin/ogg_opus_player/Frameworks/libopusenc.xcframework/macos-arm64_x86_64/libopusenc.a diff --git a/packages/ogg_opus_player/darwin/Frameworks/libopusfile.xcframework/Info.plist b/packages/ogg_opus_player/darwin/ogg_opus_player/Frameworks/libopusfile.xcframework/Info.plist similarity index 77% rename from packages/ogg_opus_player/darwin/Frameworks/libopusfile.xcframework/Info.plist rename to packages/ogg_opus_player/darwin/ogg_opus_player/Frameworks/libopusfile.xcframework/Info.plist index 7ba693a3..fc398a54 100644 --- a/packages/ogg_opus_player/darwin/Frameworks/libopusfile.xcframework/Info.plist +++ b/packages/ogg_opus_player/darwin/ogg_opus_player/Frameworks/libopusfile.xcframework/Info.plist @@ -4,6 +4,19 @@ AvailableLibraries + + LibraryIdentifier + macos-arm64_x86_64 + LibraryPath + libopusfile.a + SupportedArchitectures + + arm64 + x86_64 + + SupportedPlatform + macos + HeadersPath Headers diff --git a/packages/ogg_opus_player/darwin/Frameworks/libopusfile.xcframework/ios-arm64/Headers/opus/opusfile.h b/packages/ogg_opus_player/darwin/ogg_opus_player/Frameworks/libopusfile.xcframework/ios-arm64/Headers/opus/opusfile.h similarity index 100% rename from packages/ogg_opus_player/darwin/Frameworks/libopusfile.xcframework/ios-arm64/Headers/opus/opusfile.h rename to packages/ogg_opus_player/darwin/ogg_opus_player/Frameworks/libopusfile.xcframework/ios-arm64/Headers/opus/opusfile.h diff --git a/packages/ogg_opus_player/darwin/Frameworks/libopusfile.xcframework/ios-arm64/libopusfile.a b/packages/ogg_opus_player/darwin/ogg_opus_player/Frameworks/libopusfile.xcframework/ios-arm64/libopusfile.a similarity index 100% rename from packages/ogg_opus_player/darwin/Frameworks/libopusfile.xcframework/ios-arm64/libopusfile.a rename to packages/ogg_opus_player/darwin/ogg_opus_player/Frameworks/libopusfile.xcframework/ios-arm64/libopusfile.a diff --git a/packages/ogg_opus_player/darwin/Frameworks/libopusfile.xcframework/ios-arm64_x86_64-simulator/Headers/opus/opusfile.h b/packages/ogg_opus_player/darwin/ogg_opus_player/Frameworks/libopusfile.xcframework/ios-arm64_x86_64-simulator/Headers/opus/opusfile.h similarity index 100% rename from packages/ogg_opus_player/darwin/Frameworks/libopusfile.xcframework/ios-arm64_x86_64-simulator/Headers/opus/opusfile.h rename to packages/ogg_opus_player/darwin/ogg_opus_player/Frameworks/libopusfile.xcframework/ios-arm64_x86_64-simulator/Headers/opus/opusfile.h diff --git a/packages/ogg_opus_player/darwin/Frameworks/libopusfile.xcframework/ios-arm64_x86_64-simulator/libopusfile.a b/packages/ogg_opus_player/darwin/ogg_opus_player/Frameworks/libopusfile.xcframework/ios-arm64_x86_64-simulator/libopusfile.a similarity index 100% rename from packages/ogg_opus_player/darwin/Frameworks/libopusfile.xcframework/ios-arm64_x86_64-simulator/libopusfile.a rename to packages/ogg_opus_player/darwin/ogg_opus_player/Frameworks/libopusfile.xcframework/ios-arm64_x86_64-simulator/libopusfile.a diff --git a/packages/ogg_opus_player/darwin/Libs/libopusfile.a b/packages/ogg_opus_player/darwin/ogg_opus_player/Frameworks/libopusfile.xcframework/macos-arm64_x86_64/libopusfile.a similarity index 100% rename from packages/ogg_opus_player/darwin/Libs/libopusfile.a rename to packages/ogg_opus_player/darwin/ogg_opus_player/Frameworks/libopusfile.xcframework/macos-arm64_x86_64/libopusfile.a diff --git a/packages/ogg_opus_player/darwin/ogg_opus_player/Package.swift b/packages/ogg_opus_player/darwin/ogg_opus_player/Package.swift new file mode 100644 index 00000000..0d53fb49 --- /dev/null +++ b/packages/ogg_opus_player/darwin/ogg_opus_player/Package.swift @@ -0,0 +1,34 @@ +// swift-tools-version: 5.9 +import PackageDescription + +let package = Package( + name: "ogg_opus_player", + platforms: [ + .iOS("13.0"), + .macOS("10.15") + ], + products: [ + .library(name: "ogg-opus-player", targets: ["ogg_opus_player"]) + ], + dependencies: [ + .package(name: "FlutterFramework", path: "../FlutterFramework") + ], + targets: [ + .binaryTarget(name: "libogg", path: "Frameworks/libogg.xcframework"), + .binaryTarget(name: "libopus", path: "Frameworks/libopus.xcframework"), + .binaryTarget(name: "libopusenc", path: "Frameworks/libopusenc.xcframework"), + .binaryTarget(name: "libopusfile", path: "Frameworks/libopusfile.xcframework"), + .target( + name: "ogg_opus_player_c", + dependencies: ["libogg", "libopus", "libopusenc", "libopusfile"], + publicHeadersPath: "include/ogg_opus_player_c" + ), + .target( + name: "ogg_opus_player", + dependencies: [ + .product(name: "FlutterFramework", package: "FlutterFramework"), + "ogg_opus_player_c" + ] + ) + ] +) diff --git a/packages/ogg_opus_player/darwin/Classes/AudioMetadata.swift b/packages/ogg_opus_player/darwin/ogg_opus_player/Sources/ogg_opus_player/AudioMetadata.swift similarity index 100% rename from packages/ogg_opus_player/darwin/Classes/AudioMetadata.swift rename to packages/ogg_opus_player/darwin/ogg_opus_player/Sources/ogg_opus_player/AudioMetadata.swift diff --git a/packages/ogg_opus_player/darwin/Classes/AudioSession/AudioSession.swift b/packages/ogg_opus_player/darwin/ogg_opus_player/Sources/ogg_opus_player/AudioSession/AudioSession.swift similarity index 100% rename from packages/ogg_opus_player/darwin/Classes/AudioSession/AudioSession.swift rename to packages/ogg_opus_player/darwin/ogg_opus_player/Sources/ogg_opus_player/AudioSession/AudioSession.swift diff --git a/packages/ogg_opus_player/darwin/Classes/AudioSession/AudioSessionClient.swift b/packages/ogg_opus_player/darwin/ogg_opus_player/Sources/ogg_opus_player/AudioSession/AudioSessionClient.swift similarity index 100% rename from packages/ogg_opus_player/darwin/Classes/AudioSession/AudioSessionClient.swift rename to packages/ogg_opus_player/darwin/ogg_opus_player/Sources/ogg_opus_player/AudioSession/AudioSessionClient.swift diff --git a/packages/ogg_opus_player/darwin/Classes/AudioSession/AudioSessionClientPriority.swift b/packages/ogg_opus_player/darwin/ogg_opus_player/Sources/ogg_opus_player/AudioSession/AudioSessionClientPriority.swift similarity index 100% rename from packages/ogg_opus_player/darwin/Classes/AudioSession/AudioSessionClientPriority.swift rename to packages/ogg_opus_player/darwin/ogg_opus_player/Sources/ogg_opus_player/AudioSession/AudioSessionClientPriority.swift diff --git a/packages/ogg_opus_player/darwin/Classes/MixinServices/Queue.swift b/packages/ogg_opus_player/darwin/ogg_opus_player/Sources/ogg_opus_player/MixinServices/Queue.swift similarity index 100% rename from packages/ogg_opus_player/darwin/Classes/MixinServices/Queue.swift rename to packages/ogg_opus_player/darwin/ogg_opus_player/Sources/ogg_opus_player/MixinServices/Queue.swift diff --git a/packages/ogg_opus_player/darwin/Classes/MixinServices/Synchronized.swift b/packages/ogg_opus_player/darwin/ogg_opus_player/Sources/ogg_opus_player/MixinServices/Synchronized.swift similarity index 100% rename from packages/ogg_opus_player/darwin/Classes/MixinServices/Synchronized.swift rename to packages/ogg_opus_player/darwin/ogg_opus_player/Sources/ogg_opus_player/MixinServices/Synchronized.swift diff --git a/packages/ogg_opus_player/darwin/Classes/OggOpusPlayer.swift b/packages/ogg_opus_player/darwin/ogg_opus_player/Sources/ogg_opus_player/OggOpusPlayer.swift similarity index 100% rename from packages/ogg_opus_player/darwin/Classes/OggOpusPlayer.swift rename to packages/ogg_opus_player/darwin/ogg_opus_player/Sources/ogg_opus_player/OggOpusPlayer.swift diff --git a/packages/ogg_opus_player/darwin/Classes/OggOpusReader.swift b/packages/ogg_opus_player/darwin/ogg_opus_player/Sources/ogg_opus_player/OggOpusReader.swift similarity index 97% rename from packages/ogg_opus_player/darwin/Classes/OggOpusReader.swift rename to packages/ogg_opus_player/darwin/ogg_opus_player/Sources/ogg_opus_player/OggOpusReader.swift index 116355f0..92d4e152 100644 --- a/packages/ogg_opus_player/darwin/Classes/OggOpusReader.swift +++ b/packages/ogg_opus_player/darwin/ogg_opus_player/Sources/ogg_opus_player/OggOpusReader.swift @@ -1,4 +1,7 @@ import Foundation +#if SWIFT_PACKAGE +import ogg_opus_player_c +#endif class OggOpusReader { diff --git a/packages/ogg_opus_player/darwin/Classes/OggOpusRecorder.swift b/packages/ogg_opus_player/darwin/ogg_opus_player/Sources/ogg_opus_player/OggOpusRecorder.swift similarity index 100% rename from packages/ogg_opus_player/darwin/Classes/OggOpusRecorder.swift rename to packages/ogg_opus_player/darwin/ogg_opus_player/Sources/ogg_opus_player/OggOpusRecorder.swift diff --git a/packages/ogg_opus_player/darwin/Classes/OggOpusSpeechTranscriber.swift b/packages/ogg_opus_player/darwin/ogg_opus_player/Sources/ogg_opus_player/OggOpusSpeechTranscriber.swift similarity index 100% rename from packages/ogg_opus_player/darwin/Classes/OggOpusSpeechTranscriber.swift rename to packages/ogg_opus_player/darwin/ogg_opus_player/Sources/ogg_opus_player/OggOpusSpeechTranscriber.swift diff --git a/packages/ogg_opus_player/darwin/Classes/OggOpusWriter.swift b/packages/ogg_opus_player/darwin/ogg_opus_player/Sources/ogg_opus_player/OggOpusWriter.swift similarity index 97% rename from packages/ogg_opus_player/darwin/Classes/OggOpusWriter.swift rename to packages/ogg_opus_player/darwin/ogg_opus_player/Sources/ogg_opus_player/OggOpusWriter.swift index 70b92240..400b5fcb 100644 --- a/packages/ogg_opus_player/darwin/Classes/OggOpusWriter.swift +++ b/packages/ogg_opus_player/darwin/ogg_opus_player/Sources/ogg_opus_player/OggOpusWriter.swift @@ -1,4 +1,7 @@ import Foundation +#if SWIFT_PACKAGE +import ogg_opus_player_c +#endif fileprivate let numberOfChannels: Int32 = 1; fileprivate let outputBitRate: Int32 = 16 * 1024; diff --git a/packages/ogg_opus_player/darwin/Classes/SwiftOggOpusPlayerPlugin.swift b/packages/ogg_opus_player/darwin/ogg_opus_player/Sources/ogg_opus_player/SwiftOggOpusPlayerPlugin.swift similarity index 100% rename from packages/ogg_opus_player/darwin/Classes/SwiftOggOpusPlayerPlugin.swift rename to packages/ogg_opus_player/darwin/ogg_opus_player/Sources/ogg_opus_player/SwiftOggOpusPlayerPlugin.swift diff --git a/packages/ogg_opus_player/darwin/Headers/ogg/ogg.hh b/packages/ogg_opus_player/darwin/ogg_opus_player/Sources/ogg_opus_player_c/include/ogg_opus_player_c/ogg.hh similarity index 99% rename from packages/ogg_opus_player/darwin/Headers/ogg/ogg.hh rename to packages/ogg_opus_player/darwin/ogg_opus_player/Sources/ogg_opus_player_c/include/ogg_opus_player_c/ogg.hh index b1e6d983..00ca982d 100644 --- a/packages/ogg_opus_player/darwin/Headers/ogg/ogg.hh +++ b/packages/ogg_opus_player/darwin/ogg_opus_player/Sources/ogg_opus_player_c/include/ogg_opus_player_c/ogg.hh @@ -21,7 +21,7 @@ extern "C" { #endif #include -#include +#include "ogg_os_types.h" typedef struct { void *iov_base; diff --git a/packages/ogg_opus_player/darwin/Headers/ogg/ogg_os_types.h b/packages/ogg_opus_player/darwin/ogg_opus_player/Sources/ogg_opus_player_c/include/ogg_opus_player_c/ogg_os_types.h similarity index 100% rename from packages/ogg_opus_player/darwin/Headers/ogg/ogg_os_types.h rename to packages/ogg_opus_player/darwin/ogg_opus_player/Sources/ogg_opus_player_c/include/ogg_opus_player_c/ogg_os_types.h diff --git a/packages/ogg_opus_player/darwin/Headers/opus/opus.h b/packages/ogg_opus_player/darwin/ogg_opus_player/Sources/ogg_opus_player_c/include/ogg_opus_player_c/opus.h similarity index 100% rename from packages/ogg_opus_player/darwin/Headers/opus/opus.h rename to packages/ogg_opus_player/darwin/ogg_opus_player/Sources/ogg_opus_player_c/include/ogg_opus_player_c/opus.h diff --git a/packages/ogg_opus_player/darwin/Headers/opus/opus_defines.h b/packages/ogg_opus_player/darwin/ogg_opus_player/Sources/ogg_opus_player_c/include/ogg_opus_player_c/opus_defines.h similarity index 100% rename from packages/ogg_opus_player/darwin/Headers/opus/opus_defines.h rename to packages/ogg_opus_player/darwin/ogg_opus_player/Sources/ogg_opus_player_c/include/ogg_opus_player_c/opus_defines.h diff --git a/packages/ogg_opus_player/darwin/Headers/opus/opus_multistream.h b/packages/ogg_opus_player/darwin/ogg_opus_player/Sources/ogg_opus_player_c/include/ogg_opus_player_c/opus_multistream.h similarity index 100% rename from packages/ogg_opus_player/darwin/Headers/opus/opus_multistream.h rename to packages/ogg_opus_player/darwin/ogg_opus_player/Sources/ogg_opus_player_c/include/ogg_opus_player_c/opus_multistream.h diff --git a/packages/ogg_opus_player/darwin/Headers/opus/opus_projection.h b/packages/ogg_opus_player/darwin/ogg_opus_player/Sources/ogg_opus_player_c/include/ogg_opus_player_c/opus_projection.h similarity index 100% rename from packages/ogg_opus_player/darwin/Headers/opus/opus_projection.h rename to packages/ogg_opus_player/darwin/ogg_opus_player/Sources/ogg_opus_player_c/include/ogg_opus_player_c/opus_projection.h diff --git a/packages/ogg_opus_player/darwin/Headers/opus/opus_types.h b/packages/ogg_opus_player/darwin/ogg_opus_player/Sources/ogg_opus_player_c/include/ogg_opus_player_c/opus_types.h similarity index 100% rename from packages/ogg_opus_player/darwin/Headers/opus/opus_types.h rename to packages/ogg_opus_player/darwin/ogg_opus_player/Sources/ogg_opus_player_c/include/ogg_opus_player_c/opus_types.h diff --git a/packages/ogg_opus_player/darwin/Headers/opusenc/opusenc.h b/packages/ogg_opus_player/darwin/ogg_opus_player/Sources/ogg_opus_player_c/include/ogg_opus_player_c/opusenc.h similarity index 99% rename from packages/ogg_opus_player/darwin/Headers/opusenc/opusenc.h rename to packages/ogg_opus_player/darwin/ogg_opus_player/Sources/ogg_opus_player_c/include/ogg_opus_player_c/opusenc.h index 50ba8b5f..36e61424 100644 --- a/packages/ogg_opus_player/darwin/Headers/opusenc/opusenc.h +++ b/packages/ogg_opus_player/darwin/ogg_opus_player/Sources/ogg_opus_player_c/include/ogg_opus_player_c/opusenc.h @@ -55,7 +55,7 @@ extern "C" { # endif #include -#include +#include "opus.h" #ifndef OPE_EXPORT # if defined(WIN32) diff --git a/packages/ogg_opus_player/darwin/Classes/opusenc_set_bitrate.h b/packages/ogg_opus_player/darwin/ogg_opus_player/Sources/ogg_opus_player_c/include/ogg_opus_player_c/opusenc_set_bitrate.h similarity index 100% rename from packages/ogg_opus_player/darwin/Classes/opusenc_set_bitrate.h rename to packages/ogg_opus_player/darwin/ogg_opus_player/Sources/ogg_opus_player_c/include/ogg_opus_player_c/opusenc_set_bitrate.h diff --git a/packages/ogg_opus_player/darwin/Headers/opusfile/opusfile.h b/packages/ogg_opus_player/darwin/ogg_opus_player/Sources/ogg_opus_player_c/include/ogg_opus_player_c/opusfile.h similarity index 99% rename from packages/ogg_opus_player/darwin/Headers/opusfile/opusfile.h rename to packages/ogg_opus_player/darwin/ogg_opus_player/Sources/ogg_opus_player_c/include/ogg_opus_player_c/opusfile.h index 02892722..50abfb73 100644 --- a/packages/ogg_opus_player/darwin/Headers/opusfile/opusfile.h +++ b/packages/ogg_opus_player/darwin/ogg_opus_player/Sources/ogg_opus_player_c/include/ogg_opus_player_c/opusfile.h @@ -106,8 +106,8 @@ extern "C" { # include # include -# include -# include +# include "ogg.hh" +# include "opus_multistream.h" /**@cond PRIVATE*/ diff --git a/packages/ogg_opus_player/darwin/Classes/opusenc_set_bitrate.c b/packages/ogg_opus_player/darwin/ogg_opus_player/Sources/ogg_opus_player_c/opusenc_set_bitrate.c similarity index 100% rename from packages/ogg_opus_player/darwin/Classes/opusenc_set_bitrate.c rename to packages/ogg_opus_player/darwin/ogg_opus_player/Sources/ogg_opus_player_c/opusenc_set_bitrate.c diff --git a/packages/ogg_opus_player/pubspec.yaml b/packages/ogg_opus_player/pubspec.yaml index 5776c1cf..7b36b92e 100644 --- a/packages/ogg_opus_player/pubspec.yaml +++ b/packages/ogg_opus_player/pubspec.yaml @@ -29,10 +29,10 @@ flutter: windows: ffiPlugin: true ios: - pluginClass: OggOpusPlayerPlugin + pluginClass: SwiftOggOpusPlayerPlugin sharedDarwinSource: true macos: - pluginClass: OggOpusPlayerPlugin + pluginClass: SwiftOggOpusPlayerPlugin sharedDarwinSource: true android: package: one.mixin.oggOpusPlayer