Skip to content

Commit b341cf6

Browse files
emawbyemawby
authored
Merge pull request #703 from OneSignal/user_model/remove_set_launch_urls
[User model] remove set launch urls and update to native user model GAs
2 parents a0d21a5 + 5a58593 commit b341cf6

File tree

11 files changed

+66
-53
lines changed

11 files changed

+66
-53
lines changed

‎MIGRATION_GUIDE.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -171,8 +171,6 @@ The SDK is still accessible via a `OneSignal` static class. It provides access t
171171

172172
| `OneSignal.consentGiven(true);` | *Sets whether a user has consented to privacy prior to their user data being sent up to OneSignal. * |
173173

174-
| `OneSignal.setLaunchURLsInApp(true);` | *(iOS only) This method can be used to set if launch URLs should be opened in safari or within the application. Set to `true` to launch all notifications with a URL in the app instead of the default web browser. Make sure to call `setLaunchURLsInApp` before the `initialize` call.* |
175-
176174

177175
## Live Activities
178176

‎android/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
group 'com.onesignal.flutter'
2-
version '5.0.0-beta2'
2+
version '5.0.0'
33

44
buildscript {
55
repositories {
@@ -34,5 +34,5 @@ android {
3434
}
3535

3636
dependencies {
37-
implementation 'com.onesignal:OneSignal:5.0.0-beta4'
37+
implementation 'com.onesignal:OneSignal:5.0.0'
3838
}

‎example/android/app/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ android {
2424
defaultConfig {
2525
// TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
2626
applicationId "com.onesignal.onesignalexample"
27-
minSdkVersion 16
27+
minSdkVersion 19
2828
targetSdkVersion 33
2929
versionCode 1
3030
versionName "1.0"

‎example/ios/Flutter/Flutter.podspec

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
#
2+
# NOTE: This podspec is NOT to be published. It is only used as a local source!
3+
# This is a generated file; do not edit or check into version control.
4+
#
5+
6+
Pod::Spec.new do |s|
7+
s.name = 'Flutter'
8+
s.version = '1.0.0'
9+
s.summary = 'A UI toolkit for beautiful and fast apps.'
10+
s.homepage = 'https://flutter.dev'
11+
s.license = { :type => 'BSD' }
12+
s.author = { 'Flutter Dev Team' => 'flutter-dev@googlegroups.com' }
13+
s.source = { :git => 'https://github.com/flutter/engine', :tag => s.version.to_s }
14+
s.ios.deployment_target = '11.0'
15+
# Framework linking is handled by Flutter tooling, not CocoaPods.
16+
# Add a placeholder to satisfy `s.dependency 'Flutter'` plugin podspecs.
17+
s.vendored_frameworks = 'path/to/nothing'
18+
end

‎example/ios/Podfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ target 'Runner' do
3232
end
3333

3434
target 'OneSignalNotificationServiceExtension' do
35-
pod 'OneSignalXCFramework', '5.0.0-beta-04'
35+
pod 'OneSignalXCFramework', '>= 5.0.1', '< 6.0.0'
3636
end
3737

3838
post_install do |installer|

‎example/ios/Podfile.lock

Lines changed: 37 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,45 @@
11
PODS:
22
- Flutter (1.0.0)
3-
- onesignal_flutter (5.0.0-beta-02):
3+
- onesignal_flutter (5.0.0):
44
- Flutter
5-
- OneSignalXCFramework (= 5.0.0-beta-02)
6-
- OneSignalXCFramework (5.0.0-beta-02):
7-
- OneSignalXCFramework/OneSignalCore (= 5.0.0-beta-02)
8-
- OneSignalXCFramework/OneSignalExtension (= 5.0.0-beta-02)
9-
- OneSignalXCFramework/OneSignalNotifications (= 5.0.0-beta-02)
10-
- OneSignalXCFramework/OneSignalOSCore (= 5.0.0-beta-02)
11-
- OneSignalXCFramework/OneSignalOutcomes (= 5.0.0-beta-02)
12-
- OneSignalXCFramework/OneSignalUser (= 5.0.0-beta-02)
13-
- OneSignalXCFramework/OneSignalCore (5.0.0-beta-02)
14-
- OneSignalXCFramework/OneSignalExtension (5.0.0-beta-02):
5+
- OneSignalXCFramework (= 5.0.1)
6+
- OneSignalXCFramework (5.0.1):
7+
- OneSignalXCFramework/OneSignalComplete (= 5.0.1)
8+
- OneSignalXCFramework/OneSignal (5.0.1):
159
- OneSignalXCFramework/OneSignalCore
10+
- OneSignalXCFramework/OneSignalExtension
11+
- OneSignalXCFramework/OneSignalNotifications
12+
- OneSignalXCFramework/OneSignalOSCore
13+
- OneSignalXCFramework/OneSignalOutcomes
14+
- OneSignalXCFramework/OneSignalUser
15+
- OneSignalXCFramework/OneSignalComplete (5.0.1):
16+
- OneSignalXCFramework/OneSignal
17+
- OneSignalXCFramework/OneSignalInAppMessages
18+
- OneSignalXCFramework/OneSignalLocation
19+
- OneSignalXCFramework/OneSignalCore (5.0.1)
20+
- OneSignalXCFramework/OneSignalExtension (5.0.1):
21+
- OneSignalXCFramework/OneSignalCore
22+
- OneSignalXCFramework/OneSignalOutcomes
23+
- OneSignalXCFramework/OneSignalInAppMessages (5.0.1):
24+
- OneSignalXCFramework/OneSignalCore
25+
- OneSignalXCFramework/OneSignalNotifications
26+
- OneSignalXCFramework/OneSignalOSCore
1627
- OneSignalXCFramework/OneSignalOutcomes
17-
- OneSignalXCFramework/OneSignalNotifications (5.0.0-beta-02):
28+
- OneSignalXCFramework/OneSignalUser
29+
- OneSignalXCFramework/OneSignalLocation (5.0.1):
30+
- OneSignalXCFramework/OneSignalCore
31+
- OneSignalXCFramework/OneSignalNotifications
32+
- OneSignalXCFramework/OneSignalOSCore
33+
- OneSignalXCFramework/OneSignalUser
34+
- OneSignalXCFramework/OneSignalNotifications (5.0.1):
1835
- OneSignalXCFramework/OneSignalCore
1936
- OneSignalXCFramework/OneSignalExtension
2037
- OneSignalXCFramework/OneSignalOutcomes
21-
- OneSignalXCFramework/OneSignalOSCore (5.0.0-beta-02):
38+
- OneSignalXCFramework/OneSignalOSCore (5.0.1):
2239
- OneSignalXCFramework/OneSignalCore
23-
- OneSignalXCFramework/OneSignalOutcomes (5.0.0-beta-02):
40+
- OneSignalXCFramework/OneSignalOutcomes (5.0.1):
2441
- OneSignalXCFramework/OneSignalCore
25-
- OneSignalXCFramework/OneSignalUser (5.0.0-beta-02):
42+
- OneSignalXCFramework/OneSignalUser (5.0.1):
2643
- OneSignalXCFramework/OneSignalCore
2744
- OneSignalXCFramework/OneSignalNotifications
2845
- OneSignalXCFramework/OneSignalOSCore
@@ -31,7 +48,7 @@ PODS:
3148
DEPENDENCIES:
3249
- Flutter (from `Flutter`)
3350
- onesignal_flutter (from `.symlinks/plugins/onesignal_flutter/ios`)
34-
- OneSignalXCFramework (= 5.0.0-beta-02)
51+
- OneSignalXCFramework (< 6.0.0, >= 5.0.1)
3552

3653
SPEC REPOS:
3754
trunk:
@@ -45,9 +62,9 @@ EXTERNAL SOURCES:
4562

4663
SPEC CHECKSUMS:
4764
Flutter: f04841e97a9d0b0a8025694d0796dd46242b2854
48-
onesignal_flutter: bd487de9496226e9d1c3fb1cdd0828eb89823896
49-
OneSignalXCFramework: c5d8671065c95db06567730c29dd739f887def45
65+
onesignal_flutter: 33912d40612d20a6b34cd77e3d783f61843493fc
66+
OneSignalXCFramework: 8429bc2456554da1b09b17135621087152ad05a0
5067

51-
PODFILE CHECKSUM: 33df664a2d5067e5102be29dbfecdaaa4da1b8a9
68+
PODFILE CHECKSUM: 90d5364fb6d80b7d4d98fb125af13a6b8da34c0b
5269

53-
COCOAPODS: 1.11.3
70+
COCOAPODS: 1.12.1

‎example/ios/Runner.xcodeproj/project.pbxproj

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -371,9 +371,11 @@
371371
);
372372
inputPaths = (
373373
"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh",
374-
"${PODS_XCFRAMEWORKS_BUILD_DIR}/OneSignalXCFramework/OneSignalFramework.framework/OneSignalFramework",
374+
"${PODS_XCFRAMEWORKS_BUILD_DIR}/OneSignalXCFramework/OneSignal/OneSignalFramework.framework/OneSignalFramework",
375375
"${PODS_XCFRAMEWORKS_BUILD_DIR}/OneSignalXCFramework/OneSignalCore/OneSignalCore.framework/OneSignalCore",
376376
"${PODS_XCFRAMEWORKS_BUILD_DIR}/OneSignalXCFramework/OneSignalExtension/OneSignalExtension.framework/OneSignalExtension",
377+
"${PODS_XCFRAMEWORKS_BUILD_DIR}/OneSignalXCFramework/OneSignalInAppMessages/OneSignalInAppMessages.framework/OneSignalInAppMessages",
378+
"${PODS_XCFRAMEWORKS_BUILD_DIR}/OneSignalXCFramework/OneSignalLocation/OneSignalLocation.framework/OneSignalLocation",
377379
"${PODS_XCFRAMEWORKS_BUILD_DIR}/OneSignalXCFramework/OneSignalNotifications/OneSignalNotifications.framework/OneSignalNotifications",
378380
"${PODS_XCFRAMEWORKS_BUILD_DIR}/OneSignalXCFramework/OneSignalOSCore/OneSignalOSCore.framework/OneSignalOSCore",
379381
"${PODS_XCFRAMEWORKS_BUILD_DIR}/OneSignalXCFramework/OneSignalOutcomes/OneSignalOutcomes.framework/OneSignalOutcomes",
@@ -384,6 +386,8 @@
384386
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/OneSignalFramework.framework",
385387
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/OneSignalCore.framework",
386388
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/OneSignalExtension.framework",
389+
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/OneSignalInAppMessages.framework",
390+
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/OneSignalLocation.framework",
387391
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/OneSignalNotifications.framework",
388392
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/OneSignalOSCore.framework",
389393
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/OneSignalOutcomes.framework",

‎example/lib/main.dart

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -102,9 +102,6 @@ class _MyAppState extends State<MyApp> {
102102
print("ON DID DISMISS IN APP MESSAGE ${event.message.messageId}");
103103
});
104104

105-
// iOS-only method to open launch URLs in Safari when set to false
106-
OneSignal.setLaunchURLsInApp(false);
107-
108105
this.setState(() {
109106
_enableConsentButton = _requireConsent;
110107
});

‎ios/Classes/OneSignalPlugin.m

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -83,8 +83,6 @@ - (void)handleMethodCall:(FlutterMethodCall*)call result:(FlutterResult)result {
8383
[self setConsentRequired:call withResult:result];
8484
else if ([@"OneSignal#consentGiven" isEqualToString:call.method])
8585
[self setConsentGiven:call withResult:result];
86-
else if ([@"OneSignal#setLaunchURLsInApp" isEqualToString:call.method])
87-
[self setLaunchURLsInApp:call withResult:result];
8886
else
8987
result(FlutterMethodNotImplemented);
9088
}
@@ -122,12 +120,4 @@ - (void)setConsentRequired:(FlutterMethodCall *)call withResult:(FlutterResult)r
122120
result(nil);
123121
}
124122

125-
#pragma mark Launch Urls In App
126-
127-
- (void)setLaunchURLsInApp:(FlutterMethodCall *)call withResult:(FlutterResult)result{
128-
BOOL launchUrlsInApp = [call.arguments[@"launchUrlsInApp"] boolValue];
129-
[OneSignal setLaunchURLsInApp:launchUrlsInApp];
130-
result(nil);
131-
}
132-
133123
@end

‎ios/onesignal_flutter.podspec

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
#
44
Pod::Spec.new do |s|
55
s.name = 'onesignal_flutter'
6-
s.version = '5.0.0-beta2'
6+
s.version = '5.0.0'
77
s.summary = 'The OneSignal Flutter SDK'
88
s.description = 'Allows you to easily add OneSignal to your flutter projects, to make sending and handling push notifications easy'
99
s.homepage = 'https://www.onesignal.com'
@@ -13,7 +13,7 @@ Pod::Spec.new do |s|
1313
s.source_files = 'Classes/**/*'
1414
s.public_header_files = 'Classes/**/*.h'
1515
s.dependency 'Flutter'
16-
s.dependency 'OneSignalXCFramework', '5.0.0-beta-04'
16+
s.dependency 'OneSignalXCFramework', '5.0.1'
1717
s.ios.deployment_target = '11.0'
1818
s.static_framework = true
1919
end

‎lib/onesignal_flutter.dart

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -90,15 +90,4 @@ class OneSignal {
9090
return await _channel
9191
.invokeMethod("OneSignal#consentRequired", {'required': require});
9292
}
93-
94-
/// This method can be used to set if launch URLs should be opened in safari or
95-
/// within the application. Set to true to launch all notifications with a URL
96-
/// in the app instead of the default web browser. Make sure to call setLaunchURLsInApp
97-
/// before the initialize call.
98-
static Future<void> setLaunchURLsInApp(bool launchUrlsInApp) async {
99-
if (Platform.isIOS) {
100-
return await _channel.invokeMethod(
101-
'OneSignal#setLaunchURLsInApp', {'launchUrlsInApp': launchUrlsInApp});
102-
}
103-
}
10493
}

0 commit comments

Comments
 (0)