diff --git a/.github/workflows/create-release-pr.yml b/.github/workflows/create-release-pr.yml index 1e68fad9..43dc69eb 100644 --- a/.github/workflows/create-release-pr.yml +++ b/.github/workflows/create-release-pr.yml @@ -142,6 +142,10 @@ jobs: sed -i '' "s|s.dependency 'OneSignalXCFramework', '[^']*'|s.dependency 'OneSignalXCFramework', '${VERSION}'|" ios/onesignal_flutter.podspec echo "✓ Updated ios/onesignal_flutter.podspec with iOS SDK ${VERSION}" + # Update Package.swift with new version (for SPM) + sed -i '' "s|OneSignal-XCFramework\", exact: \"[^\"]*\"|OneSignal-XCFramework\", exact: \"${VERSION}\"|" ios/onesignal_flutter/Package.swift + echo "✓ Updated ios/onesignal_flutter/Package.swift with iOS SDK ${VERSION}" + # Update ios example cd example/ios pod update OneSignalXCFramework diff --git a/.gitignore b/.gitignore index f624417f..4ddccc77 100644 --- a/.gitignore +++ b/.gitignore @@ -23,10 +23,3 @@ dlcov.log *.ipr *.iws .idea/ - -# Swift Package Manager -**/.build/ -**/.swiftpm/ -**/Package.resolved -**/.lock -**/workspace-state.json diff --git a/.pubignore b/.pubignore index ab647e07..3df4e872 100644 --- a/.pubignore +++ b/.pubignore @@ -31,3 +31,14 @@ dlcov.log pubspec.lock .flutter-plugins-dependencies flutter_export_environment.sh +analysis_options.yaml + +# Misc +CODEOWNERS +CONTRIBUTING.md +MIGRATION_GUIDE.md + +# Examples +example +example_pod +example_spm diff --git a/analysis_options.yaml b/analysis_options.yaml index f7375932..14714683 100644 --- a/analysis_options.yaml +++ b/analysis_options.yaml @@ -1,3 +1,6 @@ analyzer: exclude: - test/dlcov_references_test.dart + - example/** + - example_pod/** + - example_spm/** diff --git a/example/ios/Runner/Info.plist b/example/ios/Runner/Info.plist index fa946f24..527f5f0f 100644 --- a/example/ios/Runner/Info.plist +++ b/example/ios/Runner/Info.plist @@ -33,6 +33,8 @@ NSSupportsLiveActivities + NSLocationWhenInUseUsageDescription + Your location is used to send relevant notifications. UIApplicationSupportsIndirectInputEvents UILaunchStoryboardName diff --git a/example/lib/main.dart b/example/lib/main.dart index b77b9201..d07bfe17 100644 --- a/example/lib/main.dart +++ b/example/lib/main.dart @@ -18,6 +18,7 @@ class _MyAppState extends State { String? _language; String? _liveActivityId; bool _enableConsentButton = false; + bool _locationShared = false; // CHANGE THIS parameter to true if you want to test GDPR privacy consent bool _requireConsent = false; @@ -197,8 +198,20 @@ class _MyAppState extends State { } void _handleSetLocationShared() { - print("Setting location shared to true"); - OneSignal.Location.setShared(true); + _locationShared = !_locationShared; + print("Setting location shared to $_locationShared"); + OneSignal.Location.setShared(_locationShared); + setState(() {}); + } + + void _handleRequestLocationPermission() { + print("Requesting location permission"); + OneSignal.Location.requestPermission(); + } + + void _handleIsLocationShared() async { + var isShared = await OneSignal.Location.isShared(); + print('Location shared: $isShared'); } void _handleGetExternalId() async { @@ -394,9 +407,17 @@ class _MyAppState extends State { _enableConsentButton) ]), new TableRow(children: [ - new OneSignalButton("Set Location Shared", + new OneSignalButton("Location Shared: $_locationShared", _handleSetLocationShared, !_enableConsentButton) ]), + new TableRow(children: [ + new OneSignalButton("Request Location", + _handleRequestLocationPermission, !_enableConsentButton) + ]), + new TableRow(children: [ + new OneSignalButton("Is Location Shared", + _handleIsLocationShared, !_enableConsentButton) + ]), new TableRow(children: [ new OneSignalButton( "Remove Tag", _handleRemoveTag, !_enableConsentButton) diff --git a/example_pod/ios/Runner/Info.plist b/example_pod/ios/Runner/Info.plist index fa946f24..527f5f0f 100644 --- a/example_pod/ios/Runner/Info.plist +++ b/example_pod/ios/Runner/Info.plist @@ -33,6 +33,8 @@ NSSupportsLiveActivities + NSLocationWhenInUseUsageDescription + Your location is used to send relevant notifications. UIApplicationSupportsIndirectInputEvents UILaunchStoryboardName diff --git a/example_pod/lib/main.dart b/example_pod/lib/main.dart index b77b9201..d07bfe17 100644 --- a/example_pod/lib/main.dart +++ b/example_pod/lib/main.dart @@ -18,6 +18,7 @@ class _MyAppState extends State { String? _language; String? _liveActivityId; bool _enableConsentButton = false; + bool _locationShared = false; // CHANGE THIS parameter to true if you want to test GDPR privacy consent bool _requireConsent = false; @@ -197,8 +198,20 @@ class _MyAppState extends State { } void _handleSetLocationShared() { - print("Setting location shared to true"); - OneSignal.Location.setShared(true); + _locationShared = !_locationShared; + print("Setting location shared to $_locationShared"); + OneSignal.Location.setShared(_locationShared); + setState(() {}); + } + + void _handleRequestLocationPermission() { + print("Requesting location permission"); + OneSignal.Location.requestPermission(); + } + + void _handleIsLocationShared() async { + var isShared = await OneSignal.Location.isShared(); + print('Location shared: $isShared'); } void _handleGetExternalId() async { @@ -394,9 +407,17 @@ class _MyAppState extends State { _enableConsentButton) ]), new TableRow(children: [ - new OneSignalButton("Set Location Shared", + new OneSignalButton("Location Shared: $_locationShared", _handleSetLocationShared, !_enableConsentButton) ]), + new TableRow(children: [ + new OneSignalButton("Request Location", + _handleRequestLocationPermission, !_enableConsentButton) + ]), + new TableRow(children: [ + new OneSignalButton("Is Location Shared", + _handleIsLocationShared, !_enableConsentButton) + ]), new TableRow(children: [ new OneSignalButton( "Remove Tag", _handleRemoveTag, !_enableConsentButton) diff --git a/example_spm/ios/ExampleWidget/Info.plist b/example_spm/ios/ExampleWidget/Info.plist index 0f118fb7..04f07b5f 100644 --- a/example_spm/ios/ExampleWidget/Info.plist +++ b/example_spm/ios/ExampleWidget/Info.plist @@ -2,6 +2,8 @@ + NSSupportsLiveActivities + NSExtension NSExtensionPointIdentifier diff --git a/example_spm/ios/Flutter/Flutter.podspec b/example_spm/ios/Flutter/Flutter.podspec deleted file mode 100644 index 3aed58d3..00000000 --- a/example_spm/ios/Flutter/Flutter.podspec +++ /dev/null @@ -1,18 +0,0 @@ -# -# This podspec is NOT to be published. It is only used as a local source! -# This is a generated file; do not edit or check into version control. -# - -Pod::Spec.new do |s| - s.name = 'Flutter' - s.version = '1.0.0' - s.summary = 'A UI toolkit for beautiful and fast apps.' - s.homepage = 'https://flutter.dev' - s.license = { :type => 'BSD' } - s.author = { 'Flutter Dev Team' => 'flutter-dev@googlegroups.com' } - s.source = { :git => 'https://github.com/flutter/engine', :tag => s.version.to_s } - s.ios.deployment_target = '13.0' - # Framework linking is handled by Flutter tooling, not CocoaPods. - # Add a placeholder to satisfy `s.dependency 'Flutter'` plugin podspecs. - s.vendored_frameworks = 'path/to/nothing' -end diff --git a/example_spm/ios/Runner.xcodeproj/project.pbxproj b/example_spm/ios/Runner.xcodeproj/project.pbxproj index 4656ecdd..959021e9 100644 --- a/example_spm/ios/Runner.xcodeproj/project.pbxproj +++ b/example_spm/ios/Runner.xcodeproj/project.pbxproj @@ -28,6 +28,8 @@ CA2C87F221015A8D00D5D35D /* UserNotifications.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CA2C87F121015A8C00D5D35D /* UserNotifications.framework */; }; CAB34E9320F96BDA0024CA6B /* NotificationService.m in Sources */ = {isa = PBXBuildFile; fileRef = CAB34E9220F96BDA0024CA6B /* NotificationService.m */; }; CAB34E9D20F96F460024CA6B /* OneSignalNotificationServiceExtension.appex in Embed App Extensions */ = {isa = PBXBuildFile; fileRef = CAB34E8F20F96BDA0024CA6B /* OneSignalNotificationServiceExtension.appex */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; }; + E82451E52F0F38F80032825E /* OneSignalFramework in Frameworks */ = {isa = PBXBuildFile; productRef = E82451E42F0F38F80032825E /* OneSignalFramework */; }; + E82451E72F0F39250032825E /* OneSignalFramework in Frameworks */ = {isa = PBXBuildFile; productRef = E82451E62F0F39250032825E /* OneSignalFramework */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -112,6 +114,7 @@ buildActionMask = 2147483647; files = ( 47CD9D272BE10D9400F8B006 /* SwiftUI.framework in Frameworks */, + E82451E72F0F39250032825E /* OneSignalFramework in Frameworks */, 47CD9D252BE10D9400F8B006 /* WidgetKit.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; @@ -128,6 +131,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + E82451E52F0F38F80032825E /* OneSignalFramework in Frameworks */, CA2C87F221015A8D00D5D35D /* UserNotifications.framework in Frameworks */, CA2C87DC21014E1C00D5D35D /* UIKit.framework in Frameworks */, CA2C87DA21014E1800D5D35D /* SystemConfiguration.framework in Frameworks */, @@ -169,7 +173,6 @@ 47CD9D282BE10D9400F8B006 /* ExampleWidget */, 97C146EF1CF9000F007C117D /* Products */, E458450F0521E6D94C4900F1 /* Frameworks */, - BA809C1A17A51DB9BC859D35 /* Pods */, ); sourceTree = ""; }; @@ -208,13 +211,6 @@ name = "Supporting Files"; sourceTree = ""; }; - BA809C1A17A51DB9BC859D35 /* Pods */ = { - isa = PBXGroup; - children = ( - ); - path = Pods; - sourceTree = ""; - }; CAB34E9020F96BDA0024CA6B /* OneSignalNotificationServiceExtension */ = { isa = PBXGroup; children = ( @@ -349,7 +345,8 @@ ); mainGroup = 97C146E51CF9000F007C117D; packageReferences = ( - 781AD8BC2B33823900A9FFBB /* XCLocalSwiftPackageReference "FlutterGeneratedPluginSwiftPackage" */, + 781AD8BC2B33823900A9FFBB /* XCLocalSwiftPackageReference "Flutter/ephemeral/Packages/FlutterGeneratedPluginSwiftPackage" */, + E82451E32F0F38D40032825E /* XCRemoteSwiftPackageReference "OneSignal-XCFramework" */, ); productRefGroup = 97C146EF1CF9000F007C117D /* Products */; projectDirPath = ""; @@ -844,17 +841,38 @@ /* End XCConfigurationList section */ /* Begin XCLocalSwiftPackageReference section */ - 781AD8BC2B33823900A9FFBB /* XCLocalSwiftPackageReference "FlutterGeneratedPluginSwiftPackage" */ = { + 781AD8BC2B33823900A9FFBB /* XCLocalSwiftPackageReference "Flutter/ephemeral/Packages/FlutterGeneratedPluginSwiftPackage" */ = { isa = XCLocalSwiftPackageReference; relativePath = Flutter/ephemeral/Packages/FlutterGeneratedPluginSwiftPackage; }; /* End XCLocalSwiftPackageReference section */ +/* Begin XCRemoteSwiftPackageReference section */ + E82451E32F0F38D40032825E /* XCRemoteSwiftPackageReference "OneSignal-XCFramework" */ = { + isa = XCRemoteSwiftPackageReference; + repositoryURL = "https://github.com/OneSignal/OneSignal-XCFramework"; + requirement = { + kind = upToNextMajorVersion; + minimumVersion = 5.2.15; + }; + }; +/* End XCRemoteSwiftPackageReference section */ + /* Begin XCSwiftPackageProductDependency section */ 78A3181F2AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage */ = { isa = XCSwiftPackageProductDependency; productName = FlutterGeneratedPluginSwiftPackage; }; + E82451E42F0F38F80032825E /* OneSignalFramework */ = { + isa = XCSwiftPackageProductDependency; + package = E82451E32F0F38D40032825E /* XCRemoteSwiftPackageReference "OneSignal-XCFramework" */; + productName = OneSignalFramework; + }; + E82451E62F0F39250032825E /* OneSignalFramework */ = { + isa = XCSwiftPackageProductDependency; + package = E82451E32F0F38D40032825E /* XCRemoteSwiftPackageReference "OneSignal-XCFramework" */; + productName = OneSignalFramework; + }; /* End XCSwiftPackageProductDependency section */ }; rootObject = 97C146E61CF9000F007C117D /* Project object */; diff --git a/example_spm/ios/Runner.xcworkspace/contents.xcworkspacedata b/example_spm/ios/Runner.xcworkspace/contents.xcworkspacedata index 21a3cc14..1d526a16 100644 --- a/example_spm/ios/Runner.xcworkspace/contents.xcworkspacedata +++ b/example_spm/ios/Runner.xcworkspace/contents.xcworkspacedata @@ -4,7 +4,4 @@ - - diff --git a/example_spm/ios/Runner/Info.plist b/example_spm/ios/Runner/Info.plist index fa946f24..527f5f0f 100644 --- a/example_spm/ios/Runner/Info.plist +++ b/example_spm/ios/Runner/Info.plist @@ -33,6 +33,8 @@ NSSupportsLiveActivities + NSLocationWhenInUseUsageDescription + Your location is used to send relevant notifications. UIApplicationSupportsIndirectInputEvents UILaunchStoryboardName diff --git a/example_spm/lib/main.dart b/example_spm/lib/main.dart index b77b9201..d07bfe17 100644 --- a/example_spm/lib/main.dart +++ b/example_spm/lib/main.dart @@ -18,6 +18,7 @@ class _MyAppState extends State { String? _language; String? _liveActivityId; bool _enableConsentButton = false; + bool _locationShared = false; // CHANGE THIS parameter to true if you want to test GDPR privacy consent bool _requireConsent = false; @@ -197,8 +198,20 @@ class _MyAppState extends State { } void _handleSetLocationShared() { - print("Setting location shared to true"); - OneSignal.Location.setShared(true); + _locationShared = !_locationShared; + print("Setting location shared to $_locationShared"); + OneSignal.Location.setShared(_locationShared); + setState(() {}); + } + + void _handleRequestLocationPermission() { + print("Requesting location permission"); + OneSignal.Location.requestPermission(); + } + + void _handleIsLocationShared() async { + var isShared = await OneSignal.Location.isShared(); + print('Location shared: $isShared'); } void _handleGetExternalId() async { @@ -394,9 +407,17 @@ class _MyAppState extends State { _enableConsentButton) ]), new TableRow(children: [ - new OneSignalButton("Set Location Shared", + new OneSignalButton("Location Shared: $_locationShared", _handleSetLocationShared, !_enableConsentButton) ]), + new TableRow(children: [ + new OneSignalButton("Request Location", + _handleRequestLocationPermission, !_enableConsentButton) + ]), + new TableRow(children: [ + new OneSignalButton("Is Location Shared", + _handleIsLocationShared, !_enableConsentButton) + ]), new TableRow(children: [ new OneSignalButton( "Remove Tag", _handleRemoveTag, !_enableConsentButton) diff --git a/ios/Assets/.gitkeep b/ios/Assets/.gitkeep deleted file mode 100644 index e69de29b..00000000 diff --git a/ios/onesignal_flutter.podspec b/ios/onesignal_flutter.podspec index 5949a71e..78233bc9 100644 --- a/ios/onesignal_flutter.podspec +++ b/ios/onesignal_flutter.podspec @@ -10,8 +10,8 @@ Pod::Spec.new do |s| s.license = { :file => '../LICENSE' } s.author = { 'Brad Hesse' => 'brad@onesignal.com', 'Josh Kasten' => 'josh@onesignal.com' } s.source = { :path => '.' } - s.source_files = 'Classes/**/*' - s.public_header_files = 'Classes/**/*.h' + s.source_files = 'onesignal_flutter/Sources/onesignal_flutter/**/*.{h,m}' + s.public_header_files = 'onesignal_flutter/Sources/onesignal_flutter/include/**/*.h' s.dependency 'Flutter' s.dependency 'OneSignalXCFramework', '5.2.15' s.ios.deployment_target = '11.0' diff --git a/ios/onesignal_flutter/Package.swift b/ios/onesignal_flutter/Package.swift new file mode 100644 index 00000000..d1a2133a --- /dev/null +++ b/ios/onesignal_flutter/Package.swift @@ -0,0 +1,32 @@ +// 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: "onesignal_flutter", + platforms: [ + .iOS("12.0") + ], + products: [ + .library(name: "onesignal-flutter", targets: ["onesignal_flutter"]) + ], + dependencies: [ + .package(url: "https://github.com/OneSignal/OneSignal-XCFramework", exact: "5.2.15") + ], + targets: [ + .target( + name: "onesignal_flutter", + dependencies: [ + .product(name: "OneSignalFramework", package: "OneSignal-XCFramework"), + .product(name: "OneSignalInAppMessages", package: "OneSignal-XCFramework"), + .product(name: "OneSignalLocation", package: "OneSignal-XCFramework"), + .product(name: "OneSignalExtension", package: "OneSignal-XCFramework") + ], + path: "Sources/onesignal_flutter", + cSettings: [ + .headerSearchPath("include/onesignal_flutter"), + ] + ), + ] +) diff --git a/ios/Classes/OSFlutterCategories.m b/ios/onesignal_flutter/Sources/onesignal_flutter/OSFlutterCategories.m similarity index 98% rename from ios/Classes/OSFlutterCategories.m rename to ios/onesignal_flutter/Sources/onesignal_flutter/OSFlutterCategories.m index db3ac0ec..536e047e 100644 --- a/ios/Classes/OSFlutterCategories.m +++ b/ios/onesignal_flutter/Sources/onesignal_flutter/OSFlutterCategories.m @@ -25,7 +25,7 @@ * THE SOFTWARE. */ -#import "OSFlutterCategories.h" +#import "./include/onesignal_flutter/OSFlutterCategories.h" /* The OneSignal iOS SDK implements similar methods (`toDictionary`) diff --git a/ios/Classes/OSFlutterDebug.m b/ios/onesignal_flutter/Sources/onesignal_flutter/OSFlutterDebug.m similarity index 95% rename from ios/Classes/OSFlutterDebug.m rename to ios/onesignal_flutter/Sources/onesignal_flutter/OSFlutterDebug.m index f443157a..28ac9b28 100644 --- a/ios/Classes/OSFlutterDebug.m +++ b/ios/onesignal_flutter/Sources/onesignal_flutter/OSFlutterDebug.m @@ -25,8 +25,8 @@ * THE SOFTWARE. */ -#import "OSFlutterDebug.h" -#import "OSFlutterCategories.h" +#import "./include/onesignal_flutter/OSFlutterDebug.h" +#import "./include/onesignal_flutter/OSFlutterCategories.h" #import @implementation OSFlutterDebug diff --git a/ios/Classes/OSFlutterInAppMessages.m b/ios/onesignal_flutter/Sources/onesignal_flutter/OSFlutterInAppMessages.m similarity index 97% rename from ios/Classes/OSFlutterInAppMessages.m rename to ios/onesignal_flutter/Sources/onesignal_flutter/OSFlutterInAppMessages.m index a8f538a3..cec9c4fa 100644 --- a/ios/Classes/OSFlutterInAppMessages.m +++ b/ios/onesignal_flutter/Sources/onesignal_flutter/OSFlutterInAppMessages.m @@ -25,8 +25,8 @@ * THE SOFTWARE. */ -#import "OSFlutterInAppMessages.h" -#import "OSFlutterCategories.h" +#import "./include/onesignal_flutter/OSFlutterInAppMessages.h" +#import "./include/onesignal_flutter/OSFlutterCategories.h" #import @implementation OSFlutterInAppMessages diff --git a/ios/Classes/OSFlutterLiveActivities.m b/ios/onesignal_flutter/Sources/onesignal_flutter/OSFlutterLiveActivities.m similarity index 98% rename from ios/Classes/OSFlutterLiveActivities.m rename to ios/onesignal_flutter/Sources/onesignal_flutter/OSFlutterLiveActivities.m index aa2a1f80..ed86e620 100644 --- a/ios/Classes/OSFlutterLiveActivities.m +++ b/ios/onesignal_flutter/Sources/onesignal_flutter/OSFlutterLiveActivities.m @@ -25,8 +25,8 @@ * THE SOFTWARE. */ -#import "OSFlutterLiveActivities.h" -#import "OSFlutterCategories.h" +#import "./include/onesignal_flutter/OSFlutterLiveActivities.h" +#import "./include/onesignal_flutter/OSFlutterCategories.h" #import "OneSignalLiveActivities/OneSignalLiveActivities-Swift.h" #import diff --git a/ios/Classes/OSFlutterLocation.m b/ios/onesignal_flutter/Sources/onesignal_flutter/OSFlutterLocation.m similarity index 95% rename from ios/Classes/OSFlutterLocation.m rename to ios/onesignal_flutter/Sources/onesignal_flutter/OSFlutterLocation.m index 1d0d46fd..ca088772 100644 --- a/ios/Classes/OSFlutterLocation.m +++ b/ios/onesignal_flutter/Sources/onesignal_flutter/OSFlutterLocation.m @@ -25,8 +25,8 @@ * THE SOFTWARE. */ -#import "OSFlutterLocation.h" -#import "OSFlutterCategories.h" +#import "./include/onesignal_flutter/OSFlutterLocation.h" +#import "./include/onesignal_flutter/OSFlutterCategories.h" #import @implementation OSFlutterLocation diff --git a/ios/Classes/OSFlutterNotifications.m b/ios/onesignal_flutter/Sources/onesignal_flutter/OSFlutterNotifications.m similarity index 98% rename from ios/Classes/OSFlutterNotifications.m rename to ios/onesignal_flutter/Sources/onesignal_flutter/OSFlutterNotifications.m index 242ee4b4..d6053bea 100644 --- a/ios/Classes/OSFlutterNotifications.m +++ b/ios/onesignal_flutter/Sources/onesignal_flutter/OSFlutterNotifications.m @@ -25,8 +25,8 @@ * THE SOFTWARE. */ -#import "OSFlutterNotifications.h" -#import "OSFlutterCategories.h" +#import "./include/onesignal_flutter/OSFlutterNotifications.h" +#import "./include/onesignal_flutter/OSFlutterCategories.h" #import #import diff --git a/ios/Classes/OSFlutterPushSubscription.m b/ios/onesignal_flutter/Sources/onesignal_flutter/OSFlutterPushSubscription.m similarity index 96% rename from ios/Classes/OSFlutterPushSubscription.m rename to ios/onesignal_flutter/Sources/onesignal_flutter/OSFlutterPushSubscription.m index 45b41aa2..35432f46 100644 --- a/ios/Classes/OSFlutterPushSubscription.m +++ b/ios/onesignal_flutter/Sources/onesignal_flutter/OSFlutterPushSubscription.m @@ -25,8 +25,8 @@ * THE SOFTWARE. */ -#import "OSFlutterPushSubscription.h" -#import "OSFlutterCategories.h" +#import "./include/onesignal_flutter/OSFlutterPushSubscription.h" +#import "./include/onesignal_flutter/OSFlutterCategories.h" #import #import diff --git a/ios/Classes/OSFlutterSession.m b/ios/onesignal_flutter/Sources/onesignal_flutter/OSFlutterSession.m similarity index 96% rename from ios/Classes/OSFlutterSession.m rename to ios/onesignal_flutter/Sources/onesignal_flutter/OSFlutterSession.m index a5aa511a..524c17a4 100644 --- a/ios/Classes/OSFlutterSession.m +++ b/ios/onesignal_flutter/Sources/onesignal_flutter/OSFlutterSession.m @@ -25,8 +25,8 @@ * THE SOFTWARE. */ -#import "OSFlutterSession.h" -#import "OSFlutterCategories.h" +#import "./include/onesignal_flutter/OSFlutterSession.h" +#import "./include/onesignal_flutter/OSFlutterCategories.h" #import @implementation OSFlutterSession diff --git a/ios/Classes/OSFlutterUser.m b/ios/onesignal_flutter/Sources/onesignal_flutter/OSFlutterUser.m similarity index 97% rename from ios/Classes/OSFlutterUser.m rename to ios/onesignal_flutter/Sources/onesignal_flutter/OSFlutterUser.m index 165b9ef8..c57564ff 100644 --- a/ios/Classes/OSFlutterUser.m +++ b/ios/onesignal_flutter/Sources/onesignal_flutter/OSFlutterUser.m @@ -24,9 +24,9 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -#import "OSFlutterUser.h" -#import "OSFlutterCategories.h" -#import "OSFlutterPushSubscription.h" +#import "./include/onesignal_flutter/OSFlutterUser.h" +#import "./include/onesignal_flutter/OSFlutterCategories.h" +#import "./include/onesignal_flutter/OSFlutterPushSubscription.h" #import #import diff --git a/ios/Classes/OneSignalPlugin.m b/ios/onesignal_flutter/Sources/onesignal_flutter/OneSignalPlugin.m similarity index 88% rename from ios/Classes/OneSignalPlugin.m rename to ios/onesignal_flutter/Sources/onesignal_flutter/OneSignalPlugin.m index 9309a8b7..e8e4b2d7 100644 --- a/ios/Classes/OneSignalPlugin.m +++ b/ios/onesignal_flutter/Sources/onesignal_flutter/OneSignalPlugin.m @@ -25,15 +25,15 @@ * THE SOFTWARE. */ -#import "OneSignalPlugin.h" -#import "OSFlutterCategories.h" -#import "OSFlutterDebug.h" -#import "OSFlutterInAppMessages.h" -#import "OSFlutterLiveActivities.h" -#import "OSFlutterLocation.h" -#import "OSFlutterNotifications.h" -#import "OSFlutterSession.h" -#import "OSFlutterUser.h" +#import "./include/onesignal_flutter/OneSignalPlugin.h" +#import "./include/onesignal_flutter/OSFlutterCategories.h" +#import "./include/onesignal_flutter/OSFlutterDebug.h" +#import "./include/onesignal_flutter/OSFlutterInAppMessages.h" +#import "./include/onesignal_flutter/OSFlutterLiveActivities.h" +#import "./include/onesignal_flutter/OSFlutterLocation.h" +#import "./include/onesignal_flutter/OSFlutterNotifications.h" +#import "./include/onesignal_flutter/OSFlutterSession.h" +#import "./include/onesignal_flutter/OSFlutterUser.h" @interface OneSignalPlugin () diff --git a/ios/Classes/OSFlutterCategories.h b/ios/onesignal_flutter/Sources/onesignal_flutter/include/onesignal_flutter/OSFlutterCategories.h similarity index 100% rename from ios/Classes/OSFlutterCategories.h rename to ios/onesignal_flutter/Sources/onesignal_flutter/include/onesignal_flutter/OSFlutterCategories.h diff --git a/ios/Classes/OSFlutterDebug.h b/ios/onesignal_flutter/Sources/onesignal_flutter/include/onesignal_flutter/OSFlutterDebug.h similarity index 100% rename from ios/Classes/OSFlutterDebug.h rename to ios/onesignal_flutter/Sources/onesignal_flutter/include/onesignal_flutter/OSFlutterDebug.h diff --git a/ios/Classes/OSFlutterInAppMessages.h b/ios/onesignal_flutter/Sources/onesignal_flutter/include/onesignal_flutter/OSFlutterInAppMessages.h similarity index 100% rename from ios/Classes/OSFlutterInAppMessages.h rename to ios/onesignal_flutter/Sources/onesignal_flutter/include/onesignal_flutter/OSFlutterInAppMessages.h diff --git a/ios/Classes/OSFlutterLiveActivities.h b/ios/onesignal_flutter/Sources/onesignal_flutter/include/onesignal_flutter/OSFlutterLiveActivities.h similarity index 100% rename from ios/Classes/OSFlutterLiveActivities.h rename to ios/onesignal_flutter/Sources/onesignal_flutter/include/onesignal_flutter/OSFlutterLiveActivities.h diff --git a/ios/Classes/OSFlutterLocation.h b/ios/onesignal_flutter/Sources/onesignal_flutter/include/onesignal_flutter/OSFlutterLocation.h similarity index 100% rename from ios/Classes/OSFlutterLocation.h rename to ios/onesignal_flutter/Sources/onesignal_flutter/include/onesignal_flutter/OSFlutterLocation.h diff --git a/ios/Classes/OSFlutterNotifications.h b/ios/onesignal_flutter/Sources/onesignal_flutter/include/onesignal_flutter/OSFlutterNotifications.h similarity index 100% rename from ios/Classes/OSFlutterNotifications.h rename to ios/onesignal_flutter/Sources/onesignal_flutter/include/onesignal_flutter/OSFlutterNotifications.h diff --git a/ios/Classes/OSFlutterPushSubscription.h b/ios/onesignal_flutter/Sources/onesignal_flutter/include/onesignal_flutter/OSFlutterPushSubscription.h similarity index 100% rename from ios/Classes/OSFlutterPushSubscription.h rename to ios/onesignal_flutter/Sources/onesignal_flutter/include/onesignal_flutter/OSFlutterPushSubscription.h diff --git a/ios/Classes/OSFlutterSession.h b/ios/onesignal_flutter/Sources/onesignal_flutter/include/onesignal_flutter/OSFlutterSession.h similarity index 100% rename from ios/Classes/OSFlutterSession.h rename to ios/onesignal_flutter/Sources/onesignal_flutter/include/onesignal_flutter/OSFlutterSession.h diff --git a/ios/Classes/OSFlutterUser.h b/ios/onesignal_flutter/Sources/onesignal_flutter/include/onesignal_flutter/OSFlutterUser.h similarity index 100% rename from ios/Classes/OSFlutterUser.h rename to ios/onesignal_flutter/Sources/onesignal_flutter/include/onesignal_flutter/OSFlutterUser.h diff --git a/ios/Classes/OneSignalPlugin.h b/ios/onesignal_flutter/Sources/onesignal_flutter/include/onesignal_flutter/OneSignalPlugin.h similarity index 100% rename from ios/Classes/OneSignalPlugin.h rename to ios/onesignal_flutter/Sources/onesignal_flutter/include/onesignal_flutter/OneSignalPlugin.h