diff --git a/.gitignore b/.gitignore index 18416a97..2f7f7c0c 100644 --- a/.gitignore +++ b/.gitignore @@ -87,6 +87,8 @@ xcuserdata **/Flutter/flutter_export_environment.sh ServiceDefinitions.json GeneratedPluginRegistrant.* +.build/ +.swiftpm/ # Exceptions !default.pbxuser diff --git a/audio_service/CHANGELOG.md b/audio_service/CHANGELOG.md index 8171b570..785c0de9 100644 --- a/audio_service/CHANGELOG.md +++ b/audio_service/CHANGELOG.md @@ -1,3 +1,7 @@ +## 0.18.17 + +* Add support for SwiftPM. + ## 0.18.16 * Support MPNowPlayingInfoPropertyIsLiveStream on IOS (@MuradSh, @celsoft). diff --git a/audio_service/macos/audio_service.podspec b/audio_service/darwin/audio_service.podspec similarity index 65% rename from audio_service/macos/audio_service.podspec rename to audio_service/darwin/audio_service.podspec index 5577dd73..9a5ad987 100644 --- a/audio_service/macos/audio_service.podspec +++ b/audio_service/darwin/audio_service.podspec @@ -1,10 +1,9 @@ # -# To learn more about a Podspec see http://guides.cocoapods.org/syntax/podspec.html. -# Run `pod lib lint audio_service.podspec' to validate before publishing. +# To learn more about a Podspec see http://guides.cocoapods.org/syntax/podspec.html # Pod::Spec.new do |s| s.name = 'audio_service' - s.version = '0.14.1' + s.version = '0.0.1' s.summary = 'Flutter plugin to play audio in the background while the screen is off.' s.description = <<-DESC Flutter plugin to play audio in the background while the screen is off. @@ -13,10 +12,12 @@ Flutter plugin to play audio in the background while the screen is off. s.license = { :file => '../LICENSE' } s.author = { 'Ryan Heise' => 'ryan@ryanheise.com' } s.source = { :path => '.' } - s.source_files = 'Classes/**/*' - s.dependency 'FlutterMacOS' - - s.platform = :osx, '10.12.2' + s.source_files = 'audio_service/Sources/audio_service/**/*.{h,m}' + s.public_header_files = 'audio_service/Sources/audio_service/include/**/*.h' + s.ios.dependency 'Flutter' + s.osx.dependency 'FlutterMacOS' + s.ios.deployment_target = '12.0' + s.osx.deployment_target = '10.14' s.pod_target_xcconfig = { 'DEFINES_MODULE' => 'YES' } - s.swift_version = '5.0' end + diff --git a/audio_service/darwin/audio_service/Package.swift b/audio_service/darwin/audio_service/Package.swift new file mode 100644 index 00000000..df367852 --- /dev/null +++ b/audio_service/darwin/audio_service/Package.swift @@ -0,0 +1,25 @@ +// swift-tools-version: 5.9 +// The swift-tools-version declares the minimum version of Swift required to build this package. + +import PackageDescription + +let package = Package( + name: "audio_service", + platforms: [ + .iOS("12.0"), + .macOS("10.14") + ], + products: [ + .library(name: "audio-service", targets: ["audio_service"]) + ], + dependencies: [], + targets: [ + .target( + name: "audio_service", + dependencies: [], + cSettings: [ + .headerSearchPath("include/audio_service") + ] + ) + ] +) diff --git a/audio_service/darwin/Classes/AudioServicePlugin.m b/audio_service/darwin/audio_service/Sources/audio_service/AudioServicePlugin.m similarity index 99% rename from audio_service/darwin/Classes/AudioServicePlugin.m rename to audio_service/darwin/audio_service/Sources/audio_service/AudioServicePlugin.m index aecd590f..678a841d 100644 --- a/audio_service/darwin/Classes/AudioServicePlugin.m +++ b/audio_service/darwin/audio_service/Sources/audio_service/AudioServicePlugin.m @@ -1,4 +1,4 @@ -#import "AudioServicePlugin.h" +#import "./include/audio_service/AudioServicePlugin.h" #import #import @@ -286,6 +286,7 @@ - (void) updateNowPlayingInfo { updated |= [self updateNowPlayingField:MPNowPlayingInfoPropertyMediaType value:@(MPNowPlayingInfoMediaTypeAudio)]; } updated |= [self updateNowPlayingField:MPNowPlayingInfoPropertyPlaybackRate value:(playing ? speed : [NSNumber numberWithDouble: 0.0])]; + updated |= [self updateNowPlayingField:MPNowPlayingInfoPropertyDefaultPlaybackRate value:(playing ? speed : [NSNumber numberWithDouble: 0.0])]; updated |= [self updateNowPlayingField:MPNowPlayingInfoPropertyElapsedPlaybackTime value:[NSNumber numberWithDouble:([position doubleValue] / 1000)]]; MPNowPlayingInfoCenter *center = [MPNowPlayingInfoCenter defaultCenter]; if (@available(iOS 13.0, macOS 10.12.2, *)) { diff --git a/audio_service/macos/Classes/AudioServicePlugin.h b/audio_service/darwin/audio_service/Sources/audio_service/include/audio_service/AudioServicePlugin.h similarity index 89% rename from audio_service/macos/Classes/AudioServicePlugin.h rename to audio_service/darwin/audio_service/Sources/audio_service/include/audio_service/AudioServicePlugin.h index d2a47f33..3f704397 100644 --- a/audio_service/macos/Classes/AudioServicePlugin.h +++ b/audio_service/darwin/audio_service/Sources/audio_service/include/audio_service/AudioServicePlugin.h @@ -1,4 +1,9 @@ +#import +#if TARGET_OS_OSX #import +#else +#import +#endif @interface AudioServicePlugin : NSObject diff --git a/audio_service/example/ios/Podfile.lock b/audio_service/example/ios/Podfile.lock index a79b47f3..472b8fde 100644 --- a/audio_service/example/ios/Podfile.lock +++ b/audio_service/example/ios/Podfile.lock @@ -1,8 +1,4 @@ PODS: - - audio_service (0.0.1): - - Flutter - - audio_session (0.0.1): - - Flutter - device_info_plus (0.0.1): - Flutter - Flutter (1.0.0) @@ -11,8 +7,6 @@ PODS: - FMDB (2.7.5): - FMDB/standard (= 2.7.5) - FMDB/standard (2.7.5) - - just_audio (0.0.1): - - Flutter - path_provider_ios (0.0.1): - Flutter - permission_handler_apple (9.3.0): @@ -22,12 +16,9 @@ PODS: - FMDB (>= 2.7.5) DEPENDENCIES: - - audio_service (from `.symlinks/plugins/audio_service/ios`) - - audio_session (from `.symlinks/plugins/audio_session/ios`) - device_info_plus (from `.symlinks/plugins/device_info_plus/ios`) - Flutter (from `Flutter`) - flutter_tts (from `.symlinks/plugins/flutter_tts/ios`) - - just_audio (from `.symlinks/plugins/just_audio/ios`) - path_provider_ios (from `.symlinks/plugins/path_provider_ios/ios`) - permission_handler_apple (from `.symlinks/plugins/permission_handler_apple/ios`) - sqflite (from `.symlinks/plugins/sqflite/ios`) @@ -37,18 +28,12 @@ SPEC REPOS: - FMDB EXTERNAL SOURCES: - audio_service: - :path: ".symlinks/plugins/audio_service/ios" - audio_session: - :path: ".symlinks/plugins/audio_session/ios" device_info_plus: :path: ".symlinks/plugins/device_info_plus/ios" Flutter: :path: Flutter flutter_tts: :path: ".symlinks/plugins/flutter_tts/ios" - just_audio: - :path: ".symlinks/plugins/just_audio/ios" path_provider_ios: :path: ".symlinks/plugins/path_provider_ios/ios" permission_handler_apple: @@ -57,13 +42,10 @@ EXTERNAL SOURCES: :path: ".symlinks/plugins/sqflite/ios" SPEC CHECKSUMS: - audio_service: f509d65da41b9521a61f1c404dd58651f265a567 - audio_session: 088d2483ebd1dc43f51d253d4a1c517d9a2e7207 device_info_plus: c6fb39579d0f423935b0c9ce7ee2f44b71b9fce6 Flutter: e0871f40cf51350855a761d2e70bf5af5b9b5de7 flutter_tts: 0f492aab6accf87059b72354fcb4ba934304771d FMDB: 2ce00b547f966261cd18927a3ddb07cb6f3db82a - just_audio: baa7252489dbcf47a4c7cc9ca663e9661c99aafa path_provider_ios: 7d7ce634493af4477d156294792024ec3485acd5 permission_handler_apple: 9878588469a2b0d0fc1e048d9f43605f92e6cec2 sqflite: 6d358c025f5b867b29ed92fc697fd34924e11904 diff --git a/audio_service/example/ios/Runner.xcodeproj/project.pbxproj b/audio_service/example/ios/Runner.xcodeproj/project.pbxproj index a745d8f5..95e6c998 100644 --- a/audio_service/example/ios/Runner.xcodeproj/project.pbxproj +++ b/audio_service/example/ios/Runner.xcodeproj/project.pbxproj @@ -10,6 +10,7 @@ 1498D2341E8E89220040F4C2 /* GeneratedPluginRegistrant.m in Sources */ = {isa = PBXBuildFile; fileRef = 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */; }; 3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */ = {isa = PBXBuildFile; fileRef = 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */; }; 74858FAF1ED2DC5600515810 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 74858FAE1ED2DC5600515810 /* AppDelegate.swift */; }; + 78A318202AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage in Frameworks */ = {isa = PBXBuildFile; productRef = 78A3181F2AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage */; }; 9740EEB41CF90195004384FC /* Debug.xcconfig in Resources */ = {isa = PBXBuildFile; fileRef = 9740EEB21CF90195004384FC /* Debug.xcconfig */; }; 97C146FC1CF9000F007C117D /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FA1CF9000F007C117D /* Main.storyboard */; }; 97C146FE1CF9000F007C117D /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FD1CF9000F007C117D /* Assets.xcassets */; }; @@ -55,6 +56,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + 78A318202AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage in Frameworks */, AED074950218D357B0D72E2F /* Pods_Runner.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; @@ -155,6 +157,9 @@ dependencies = ( ); name = Runner; + packageProductDependencies = ( + 78A3181F2AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage */, + ); productName = Runner; productReference = 97C146EE1CF9000F007C117D /* Runner.app */; productType = "com.apple.product-type.application"; @@ -183,6 +188,9 @@ Base, ); mainGroup = 97C146E51CF9000F007C117D; + packageReferences = ( + 781AD8BC2B33823900A9FFBB /* XCLocalSwiftPackageReference "FlutterGeneratedPluginSwiftPackage" */, + ); productRefGroup = 97C146EF1CF9000F007C117D /* Products */; projectDirPath = ""; projectRoot = ""; @@ -247,20 +255,14 @@ inputPaths = ( "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh", "${BUILT_PRODUCTS_DIR}/FMDB/FMDB.framework", - "${BUILT_PRODUCTS_DIR}/audio_service/audio_service.framework", - "${BUILT_PRODUCTS_DIR}/audio_session/audio_session.framework", "${BUILT_PRODUCTS_DIR}/device_info_plus/device_info_plus.framework", - "${BUILT_PRODUCTS_DIR}/just_audio/just_audio.framework", "${BUILT_PRODUCTS_DIR}/path_provider_ios/path_provider_ios.framework", "${BUILT_PRODUCTS_DIR}/sqflite/sqflite.framework", ); name = "[CP] Embed Pods Frameworks"; outputPaths = ( "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FMDB.framework", - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/audio_service.framework", - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/audio_session.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/device_info_plus.framework", - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/just_audio.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/path_provider_ios.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/sqflite.framework", ); @@ -609,6 +611,20 @@ defaultConfigurationName = Release; }; /* End XCConfigurationList section */ + +/* Begin XCLocalSwiftPackageReference section */ + 781AD8BC2B33823900A9FFBB /* XCLocalSwiftPackageReference "FlutterGeneratedPluginSwiftPackage" */ = { + isa = XCLocalSwiftPackageReference; + relativePath = Flutter/ephemeral/Packages/FlutterGeneratedPluginSwiftPackage; + }; +/* End XCLocalSwiftPackageReference section */ + +/* Begin XCSwiftPackageProductDependency section */ + 78A3181F2AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage */ = { + isa = XCSwiftPackageProductDependency; + productName = FlutterGeneratedPluginSwiftPackage; + }; +/* End XCSwiftPackageProductDependency section */ }; rootObject = 97C146E61CF9000F007C117D /* Project object */; } diff --git a/audio_service/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/audio_service/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme index 5e31d3d3..e598ba79 100644 --- a/audio_service/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme +++ b/audio_service/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme @@ -5,6 +5,24 @@ + + + + + + + + + + = 2.7.5) DEPENDENCIES: - - audio_service (from `Flutter/ephemeral/.symlinks/plugins/audio_service/macos`) - - audio_session (from `Flutter/ephemeral/.symlinks/plugins/audio_session/macos`) + - device_info_plus (from `Flutter/ephemeral/.symlinks/plugins/device_info_plus/macos`) - flutter_tts (from `Flutter/ephemeral/.symlinks/plugins/flutter_tts/macos`) - FlutterMacOS (from `Flutter/ephemeral`) - - just_audio (from `Flutter/ephemeral/.symlinks/plugins/just_audio/macos`) - path_provider_macos (from `Flutter/ephemeral/.symlinks/plugins/path_provider_macos/macos`) - sqflite (from `Flutter/ephemeral/.symlinks/plugins/sqflite/macos`) @@ -31,31 +25,25 @@ SPEC REPOS: - FMDB EXTERNAL SOURCES: - audio_service: - :path: Flutter/ephemeral/.symlinks/plugins/audio_service/macos - audio_session: - :path: Flutter/ephemeral/.symlinks/plugins/audio_session/macos + device_info_plus: + :path: Flutter/ephemeral/.symlinks/plugins/device_info_plus/macos flutter_tts: :path: Flutter/ephemeral/.symlinks/plugins/flutter_tts/macos FlutterMacOS: :path: Flutter/ephemeral - just_audio: - :path: Flutter/ephemeral/.symlinks/plugins/just_audio/macos path_provider_macos: :path: Flutter/ephemeral/.symlinks/plugins/path_provider_macos/macos sqflite: :path: Flutter/ephemeral/.symlinks/plugins/sqflite/macos SPEC CHECKSUMS: - audio_service: b88ff778e0e3915efd4cd1a5ad6f0beef0c950a9 - audio_session: dea1f41890dbf1718f04a56f1d6150fd50039b72 + device_info_plus: 5401765fde0b8d062a2f8eb65510fb17e77cf07f flutter_tts: 64651204e5d276ffea5a910f942d5e9785a96085 - FlutterMacOS: 57701585bf7de1b3fc2bb61f6378d73bbdea8424 + FlutterMacOS: 8f6f14fa908a6fb3fba0cd85dbd81ec4b251fb24 FMDB: 2ce00b547f966261cd18927a3ddb07cb6f3db82a - just_audio: 9b67ca7b97c61cfc9784ea23cd8cc55eb226d489 path_provider_macos: 160cab0d5461f0c0e02995469a98f24bdb9a3f1f sqflite: a5789cceda41d54d23f31d6de539d65bb14100ea PODFILE CHECKSUM: 0d3963a09fc94f580682bd88480486da345dc3f0 -COCOAPODS: 1.10.1 +COCOAPODS: 1.15.2 diff --git a/audio_service/example/macos/Runner.xcodeproj/project.pbxproj b/audio_service/example/macos/Runner.xcodeproj/project.pbxproj index b4d8baa8..a996b5a9 100644 --- a/audio_service/example/macos/Runner.xcodeproj/project.pbxproj +++ b/audio_service/example/macos/Runner.xcodeproj/project.pbxproj @@ -3,7 +3,7 @@ archiveVersion = 1; classes = { }; - objectVersion = 51; + objectVersion = 54; objects = { /* Begin PBXAggregateTarget section */ @@ -27,6 +27,7 @@ 33CC10F62044A3C60003C045 /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = 33CC10F42044A3C60003C045 /* MainMenu.xib */; }; 33CC11132044BFA00003C045 /* MainFlutterWindow.swift in Sources */ = {isa = PBXBuildFile; fileRef = 33CC11122044BFA00003C045 /* MainFlutterWindow.swift */; }; 694FF95961DABE91D34A0C9C /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 804DE6D45226FDAC0CD200F6 /* Pods_Runner.framework */; }; + 78A318202AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage in Frameworks */ = {isa = PBXBuildFile; productRef = 78A3181F2AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -80,6 +81,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + 78A318202AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage in Frameworks */, 694FF95961DABE91D34A0C9C /* Pods_Runner.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; @@ -191,6 +193,9 @@ 33CC11202044C79F0003C045 /* PBXTargetDependency */, ); name = Runner; + packageProductDependencies = ( + 78A3181F2AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage */, + ); productName = Runner; productReference = 33CC10ED2044A3C60003C045 /* example.app */; productType = "com.apple.product-type.application"; @@ -202,7 +207,7 @@ isa = PBXProject; attributes = { LastSwiftUpdateCheck = 0920; - LastUpgradeCheck = 0930; + LastUpgradeCheck = 1510; ORGANIZATIONNAME = "The Flutter Authors"; TargetAttributes = { 33CC10EC2044A3C60003C045 = { @@ -230,6 +235,9 @@ Base, ); mainGroup = 33CC10E42044A3C60003C045; + packageReferences = ( + 781AD8BC2B33823900A9FFBB /* XCLocalSwiftPackageReference "FlutterGeneratedPluginSwiftPackage" */, + ); productRefGroup = 33CC10EE2044A3C60003C045 /* Products */; projectDirPath = ""; projectRoot = ""; @@ -283,20 +291,16 @@ inputPaths = ( "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh", "${BUILT_PRODUCTS_DIR}/FMDB/FMDB.framework", - "${BUILT_PRODUCTS_DIR}/audio_service/audio_service.framework", - "${BUILT_PRODUCTS_DIR}/audio_session/audio_session.framework", + "${BUILT_PRODUCTS_DIR}/device_info_plus/device_info_plus.framework", "${BUILT_PRODUCTS_DIR}/flutter_tts/flutter_tts.framework", - "${BUILT_PRODUCTS_DIR}/just_audio/just_audio.framework", "${BUILT_PRODUCTS_DIR}/path_provider_macos/path_provider_macos.framework", "${BUILT_PRODUCTS_DIR}/sqflite/sqflite.framework", ); name = "[CP] Embed Pods Frameworks"; outputPaths = ( "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FMDB.framework", - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/audio_service.framework", - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/audio_session.framework", + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/device_info_plus.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/flutter_tts.framework", - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/just_audio.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/path_provider_macos.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/sqflite.framework", ); @@ -307,6 +311,7 @@ }; 3399D490228B24CF009A79C7 /* ShellScript */ = { isa = PBXShellScriptBuildPhase; + alwaysOutOfDate = 1; buildActionMask = 2147483647; files = ( ); @@ -416,7 +421,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - MACOSX_DEPLOYMENT_TARGET = 10.11; + MACOSX_DEPLOYMENT_TARGET = 10.14; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = macosx; SWIFT_COMPILATION_MODE = wholemodule; @@ -500,7 +505,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - MACOSX_DEPLOYMENT_TARGET = 10.11; + MACOSX_DEPLOYMENT_TARGET = 10.14; MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; SDKROOT = macosx; @@ -547,7 +552,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - MACOSX_DEPLOYMENT_TARGET = 10.11; + MACOSX_DEPLOYMENT_TARGET = 10.14; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = macosx; SWIFT_COMPILATION_MODE = wholemodule; @@ -654,6 +659,20 @@ defaultConfigurationName = Release; }; /* End XCConfigurationList section */ + +/* Begin XCLocalSwiftPackageReference section */ + 781AD8BC2B33823900A9FFBB /* XCLocalSwiftPackageReference "FlutterGeneratedPluginSwiftPackage" */ = { + isa = XCLocalSwiftPackageReference; + relativePath = Flutter/ephemeral/Packages/FlutterGeneratedPluginSwiftPackage; + }; +/* End XCLocalSwiftPackageReference section */ + +/* Begin XCSwiftPackageProductDependency section */ + 78A3181F2AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage */ = { + isa = XCSwiftPackageProductDependency; + productName = FlutterGeneratedPluginSwiftPackage; + }; +/* End XCSwiftPackageProductDependency section */ }; rootObject = 33CC10E52044A3C60003C045 /* Project object */; } diff --git a/audio_service/example/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/audio_service/example/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme index df12c333..8de585b4 100644 --- a/audio_service/example/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme +++ b/audio_service/example/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme @@ -1,10 +1,28 @@ + + + + + + + + + + Bool { return true } + + override func applicationSupportsSecureRestorableState(_ app: NSApplication) -> Bool { + return true + } } diff --git a/audio_service/example/pubspec.yaml b/audio_service/example/pubspec.yaml index 280d4fd5..58b48379 100644 --- a/audio_service/example/pubspec.yaml +++ b/audio_service/example/pubspec.yaml @@ -11,8 +11,8 @@ dependencies: sdk: flutter path_provider: ^2.0.1 - audio_session: ^0.1.20 - just_audio: ^0.9.39 + audio_session: ^0.1.25 + just_audio: ^0.9.46 flutter_tts: ^3.8.3 device_info_plus: ^9.1.0 android_content_provider: ^0.4.1 @@ -29,4 +29,5 @@ dev_dependencies: flutter_lints: ^3.0.1 flutter: + # disable-swift-package-manager: true uses-material-design: true \ No newline at end of file diff --git a/audio_service/ios/Assets/.gitkeep b/audio_service/ios/Assets/.gitkeep deleted file mode 100644 index e69de29b..00000000 diff --git a/audio_service/ios/Classes/AudioServicePlugin.h b/audio_service/ios/Classes/AudioServicePlugin.h deleted file mode 100644 index 39e9c635..00000000 --- a/audio_service/ios/Classes/AudioServicePlugin.h +++ /dev/null @@ -1,45 +0,0 @@ -#import - -@interface AudioServicePlugin : NSObject - -@property (readonly, nonatomic) FlutterMethodChannel *channel; - -@end - -enum AudioProcessingState { - ApsIdle, - ApsLoading, - ApsBuffering, - ApsReady, - ApsCompleted, - ApsError -}; - -enum MediaAction { - AStop, - APause, - APlay, - ARewind, - ASkipToPrevious, - ASkipToNext, - AFastForward, - ASetRating, - ASeekTo, - APlayPause, - APlayFromMediaId, - APlayFromSearch, - ASkipToQueueItem, - APlayFromUri, - APrepare, - APrepareFromMediaId, - APrepareFromSearch, - APrepareFromUri, - ASetRepeatMode, - ASetShuffleModeEnabled, // deprecated - ASetCaptioningEnabled, - ASetShuffleMode, - // iOS/macOS-specific - ASeekBackward, - ASeekForward, - ASetSpeed, -}; diff --git a/audio_service/ios/Classes/AudioServicePlugin.m b/audio_service/ios/Classes/AudioServicePlugin.m deleted file mode 120000 index ce7a5fe5..00000000 --- a/audio_service/ios/Classes/AudioServicePlugin.m +++ /dev/null @@ -1 +0,0 @@ -../../darwin/Classes/AudioServicePlugin.m \ No newline at end of file diff --git a/audio_service/ios/audio_service.podspec b/audio_service/ios/audio_service.podspec deleted file mode 100644 index bdf38014..00000000 --- a/audio_service/ios/audio_service.podspec +++ /dev/null @@ -1,21 +0,0 @@ -# -# To learn more about a Podspec see http://guides.cocoapods.org/syntax/podspec.html -# -Pod::Spec.new do |s| - s.name = 'audio_service' - s.version = '0.0.1' - s.summary = 'A new flutter plugin project.' - s.description = <<-DESC -A new flutter plugin project. - DESC - s.homepage = 'http://example.com' - s.license = { :file => '../LICENSE' } - s.author = { 'Your Company' => 'email@example.com' } - s.source = { :path => '.' } - s.source_files = 'Classes/**/*' - s.public_header_files = 'Classes/**/*.h' - s.dependency 'Flutter' - - s.ios.deployment_target = '8.0' -end - diff --git a/audio_service/macos/Classes/AudioServicePlugin.m b/audio_service/macos/Classes/AudioServicePlugin.m deleted file mode 120000 index ce7a5fe5..00000000 --- a/audio_service/macos/Classes/AudioServicePlugin.m +++ /dev/null @@ -1 +0,0 @@ -../../darwin/Classes/AudioServicePlugin.m \ No newline at end of file diff --git a/audio_service/pubspec.yaml b/audio_service/pubspec.yaml index 5b85179e..791cf999 100644 --- a/audio_service/pubspec.yaml +++ b/audio_service/pubspec.yaml @@ -1,6 +1,6 @@ name: audio_service description: Flutter plugin to play audio in the background while the screen is off. -version: 0.18.16 +version: 0.18.17 repository: https://github.com/ryanheise/audio_service/tree/minor/audio_service issue_tracker: https://github.com/ryanheise/audio_service/issues topics: @@ -34,7 +34,7 @@ dependencies: audio_service_platform_interface: ^0.1.3 audio_service_web: ^0.1.4 - audio_session: ^0.1.20 + audio_session: ^0.1.25 rxdart: '>=0.26.0 <0.29.0' flutter_cache_manager: ^3.3.1 clock: ^1.1.0 @@ -59,7 +59,9 @@ flutter: pluginClass: AudioServicePlugin ios: pluginClass: AudioServicePlugin + sharedDarwinSource: true macos: pluginClass: AudioServicePlugin + sharedDarwinSource: true web: default_package: audio_service_web