diff --git a/.github/workflows/create-release-pr.yml b/.github/workflows/create-release-pr.yml index dcd36495..abce977f 100644 --- a/.github/workflows/create-release-pr.yml +++ b/.github/workflows/create-release-pr.yml @@ -158,6 +158,14 @@ jobs: sed -i '' "s/^version:.*/version: $NEW_VERSION/" pubspec.yaml echo "✓ Updated pubspec.yaml version to ${NEW_VERSION}" + # Update podspec version + sed -i '' "s|s\.version[[:space:]]*=[[:space:]]*'[^']*'|s.version = '${NEW_VERSION}'|" ios/onesignal_flutter.podspec + echo "✓ Updated ios/onesignal_flutter.podspec version to ${NEW_VERSION}" + + # Update android build.gradle version + sed -i '' "s|^version '[^']*'|version '${NEW_VERSION}'|" android/build.gradle + echo "✓ Updated android/build.gradle version to ${NEW_VERSION}" + # Update OneSignalPlugin.java wrapper version sed -i '' "s/OneSignalWrapper\.setSdkVersion(\"[^\"]*\")/OneSignalWrapper.setSdkVersion(\"$WRAPPER_VERSION\")/g" android/src/main/java/com/onesignal/flutter/OneSignalPlugin.java diff --git a/android/build.gradle b/android/build.gradle index 8afc6e69..443f4d46 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -1,5 +1,5 @@ group 'com.onesignal.flutter' -version '5.3.4' +version '5.5.0' buildscript { repositories { diff --git a/android/src/main/java/com/onesignal/flutter/OneSignalPlugin.java b/android/src/main/java/com/onesignal/flutter/OneSignalPlugin.java index 510a8ad3..0472bb4a 100644 --- a/android/src/main/java/com/onesignal/flutter/OneSignalPlugin.java +++ b/android/src/main/java/com/onesignal/flutter/OneSignalPlugin.java @@ -24,7 +24,7 @@ private void init(Context context, BinaryMessenger messenger) { this.messenger = messenger; OneSignalWrapper.setSdkType("flutter"); // For 5.0.0, hard code to reflect SDK version - OneSignalWrapper.setSdkVersion("050406"); + OneSignalWrapper.setSdkVersion("050500"); channel = new MethodChannel(messenger, "OneSignal"); channel.setMethodCallHandler(this); diff --git a/examples/demo/ios/Podfile.lock b/examples/demo/ios/Podfile.lock index 236ac9ea..91840489 100644 --- a/examples/demo/ios/Podfile.lock +++ b/examples/demo/ios/Podfile.lock @@ -1,6 +1,6 @@ PODS: - Flutter (1.0.0) - - onesignal_flutter (5.3.4): + - onesignal_flutter (5.5.0): - Flutter - OneSignalXCFramework (= 5.5.0) - OneSignalXCFramework (5.5.0): @@ -78,7 +78,7 @@ EXTERNAL SOURCES: SPEC CHECKSUMS: Flutter: cabc95a1d2626b1b06e7179b784ebcf0c0cde467 - onesignal_flutter: fa28e94a7baa3cd8b503fc4d760103405882f47f + onesignal_flutter: 786a2ae8d69120f3041f0f1de326bee63b319e3e OneSignalXCFramework: 943852e7d70d719f73e9669d48620aeec1b93022 shared_preferences_foundation: 7036424c3d8ec98dfe75ff1667cb0cd531ec82bb url_launcher_ios: 7a95fa5b60cc718a708b8f2966718e93db0cef1b diff --git a/examples/demo/lib/widgets/sections/live_activities_section.dart b/examples/demo/lib/widgets/sections/live_activities_section.dart index dbe82125..6e5729e4 100644 --- a/examples/demo/lib/widgets/sections/live_activities_section.dart +++ b/examples/demo/lib/widgets/sections/live_activities_section.dart @@ -82,18 +82,6 @@ class _LiveActivitiesSectionState extends State { : () => vm.updateLiveActivity(), ), AppSpacing.gapBox, - SizedBox( - width: double.infinity, - child: OutlinedButton( - onPressed: activityEmpty ? null : () => vm.exitLiveActivity(), - style: OutlinedButton.styleFrom( - foregroundColor: AppColors.osPrimary, - side: const BorderSide(color: AppColors.osPrimary), - ), - child: const Text('STOP UPDATING LIVE ACTIVITY'), - ), - ), - AppSpacing.gapBox, SizedBox( width: double.infinity, child: OutlinedButton( diff --git a/ios/onesignal_flutter.podspec b/ios/onesignal_flutter.podspec index 84f9d30d..03591391 100644 --- a/ios/onesignal_flutter.podspec +++ b/ios/onesignal_flutter.podspec @@ -3,7 +3,7 @@ # Pod::Spec.new do |s| s.name = 'onesignal_flutter' - s.version = '5.3.4' + s.version = '5.5.0' s.summary = 'The OneSignal Flutter SDK' s.description = 'Allows you to easily add OneSignal to your flutter projects, to make sending and handling push notifications easy' s.homepage = 'https://www.onesignal.com' diff --git a/ios/onesignal_flutter/Sources/onesignal_flutter/OneSignalPlugin.m b/ios/onesignal_flutter/Sources/onesignal_flutter/OneSignalPlugin.m index 951463bb..6e24a265 100644 --- a/ios/onesignal_flutter/Sources/onesignal_flutter/OneSignalPlugin.m +++ b/ios/onesignal_flutter/Sources/onesignal_flutter/OneSignalPlugin.m @@ -56,7 +56,7 @@ + (instancetype)sharedInstance { + (void)registerWithRegistrar:(NSObject *)registrar { OneSignalWrapper.sdkType = @"flutter"; - OneSignalWrapper.sdkVersion = @"050406"; + OneSignalWrapper.sdkVersion = @"050500"; [OneSignal initialize:nil withLaunchOptions:nil]; OneSignalPlugin.sharedInstance.channel = diff --git a/lib/src/liveactivities.dart b/lib/src/liveactivities.dart index 7021b835..819e496c 100644 --- a/lib/src/liveactivities.dart +++ b/lib/src/liveactivities.dart @@ -5,7 +5,7 @@ class OneSignalLiveActivities { // private channels used to bridge to ObjC/Java MethodChannel _channel = const MethodChannel('OneSignal#liveactivities'); - /// Indicate this device has exited a live activity, identified within OneSignal by the [activityId]. The + /// Indicate this device has entered a live activity, identified within OneSignal by the [activityId]. The /// [token] is the ActivityKit's update token that will be used to update the live activity. /// /// Only applies to iOS. @@ -19,6 +19,7 @@ class OneSignalLiveActivities { /// Indicate this device has exited a live activity, identified within OneSignal by the [activityId]. /// /// Only applies to iOS. + @Deprecated('Currently unsupported, avoid using this method.') Future exitLiveActivity(String activityId) async { if (defaultTargetPlatform == TargetPlatform.iOS) { return await _channel.invokeMethod( diff --git a/pubspec.yaml b/pubspec.yaml index a324717d..7d791759 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -1,6 +1,6 @@ name: onesignal_flutter description: OneSignal is a free push notification service for mobile apps. This plugin makes it easy to integrate your flutter app with OneSignal -version: 5.4.6 +version: 5.5.0 homepage: https://github.com/OneSignal/OneSignal-Flutter-SDK # Uses rps package for scripts diff --git a/test/liveactivities_test.dart b/test/liveactivities_test.dart index e2cfce14..3905b99c 100644 --- a/test/liveactivities_test.dart +++ b/test/liveactivities_test.dart @@ -39,6 +39,7 @@ void main() { group('exitLiveActivity', () { test('invokes OneSignal#exitLiveActivity with activityId', () async { + // ignore: deprecated_member_use_from_same_package await liveActivities.exitLiveActivity(activityId); expect(channelController.state.liveActivityExited, true);