Skip to content

Commit 0227035

Browse files
authored
Merge pull request #638 from OneSignal/updating-iOS-to-5.0.0
Update iOS to 5.0.0 alpha02
2 parents 36e4565 + fc00b74 commit 0227035

25 files changed

+527
-2407
lines changed

example/ios/Flutter/AppFrameworkInfo.plist

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,6 @@
2121
<key>CFBundleVersion</key>
2222
<string>1.0</string>
2323
<key>MinimumOSVersion</key>
24-
<string>8.0</string>
24+
<string>11.0</string>
2525
</dict>
2626
</plist>

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/OneSignalNotificationServiceExtension/NotificationService.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
// Copyright © 2018 The Chromium Authors. All rights reserved.
77
//
88

9-
#import <OneSignal/OneSignal.h>
9+
#import <OneSignalFramework/OneSignalFramework.h>
1010

1111
#import "NotificationService.h"
1212

example/ios/Podfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Uncomment this line to define a global platform for your project
2-
platform :ios, '10.0'
2+
platform :ios, '11.0'
33

44
# CocoaPods analytics sends network stats synchronously affecting flutter build latency.
55
ENV['COCOAPODS_DISABLE_STATS'] = 'true'
@@ -32,11 +32,11 @@ target 'Runner' do
3232
end
3333

3434
target 'OneSignalNotificationServiceExtension' do
35-
pod 'OneSignalXCFramework', '>= 3.0.0', '< 4.0'
35+
pod 'OneSignalXCFramework', '5.0.0-alpha-02'
3636
end
3737

3838
post_install do |installer|
3939
installer.pods_project.targets.each do |target|
4040
flutter_additional_ios_build_settings(target)
4141
end
42-
end
42+
end

example/ios/Podfile.lock

Lines changed: 32 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,37 @@
11
PODS:
22
- Flutter (1.0.0)
3-
- onesignal_flutter (3.1.0):
3+
- onesignal_flutter (5.0.0-alpha-02):
44
- Flutter
5-
- OneSignalXCFramework (= 3.5.3)
6-
- OneSignalXCFramework (3.5.3)
5+
- OneSignalXCFramework (= 5.0.0-alpha-02)
6+
- OneSignalXCFramework (5.0.0-alpha-02):
7+
- OneSignalXCFramework/OneSignalCore (= 5.0.0-alpha-02)
8+
- OneSignalXCFramework/OneSignalExtension (= 5.0.0-alpha-02)
9+
- OneSignalXCFramework/OneSignalNotifications (= 5.0.0-alpha-02)
10+
- OneSignalXCFramework/OneSignalOSCore (= 5.0.0-alpha-02)
11+
- OneSignalXCFramework/OneSignalOutcomes (= 5.0.0-alpha-02)
12+
- OneSignalXCFramework/OneSignalUser (= 5.0.0-alpha-02)
13+
- OneSignalXCFramework/OneSignalCore (5.0.0-alpha-02)
14+
- OneSignalXCFramework/OneSignalExtension (5.0.0-alpha-02):
15+
- OneSignalXCFramework/OneSignalCore
16+
- OneSignalXCFramework/OneSignalOutcomes
17+
- OneSignalXCFramework/OneSignalNotifications (5.0.0-alpha-02):
18+
- OneSignalXCFramework/OneSignalCore
19+
- OneSignalXCFramework/OneSignalExtension
20+
- OneSignalXCFramework/OneSignalOutcomes
21+
- OneSignalXCFramework/OneSignalOSCore (5.0.0-alpha-02):
22+
- OneSignalXCFramework/OneSignalCore
23+
- OneSignalXCFramework/OneSignalOutcomes (5.0.0-alpha-02):
24+
- OneSignalXCFramework/OneSignalCore
25+
- OneSignalXCFramework/OneSignalUser (5.0.0-alpha-02):
26+
- OneSignalXCFramework/OneSignalCore
27+
- OneSignalXCFramework/OneSignalNotifications
28+
- OneSignalXCFramework/OneSignalOSCore
29+
- OneSignalXCFramework/OneSignalOutcomes
730

831
DEPENDENCIES:
932
- Flutter (from `Flutter`)
1033
- onesignal_flutter (from `.symlinks/plugins/onesignal_flutter/ios`)
11-
- OneSignalXCFramework (< 4.0, >= 3.0.0)
34+
- OneSignalXCFramework (= 5.0.0-alpha-02)
1235

1336
SPEC REPOS:
1437
trunk:
@@ -21,10 +44,10 @@ EXTERNAL SOURCES:
2144
:path: ".symlinks/plugins/onesignal_flutter/ios"
2245

2346
SPEC CHECKSUMS:
24-
Flutter: 434fef37c0980e73bb6479ef766c45957d4b510c
25-
onesignal_flutter: 79eb89d25249b078d3c358fb7827b22909f7fbed
26-
OneSignalXCFramework: 4e08d8353adec161c3d9174e2572c849e1225c9f
47+
Flutter: f04841e97a9d0b0a8025694d0796dd46242b2854
48+
onesignal_flutter: c4fe7cfb99196ccc89ecaef890bdd66abf00f5d7
49+
OneSignalXCFramework: 8eec9904167f8c97c23c441709b648f353d22a41
2750

28-
PODFILE CHECKSUM: b074b7b0bedd9b715d33807e4b6c0f0dcee63e1e
51+
PODFILE CHECKSUM: f0497bd2adc984c2ee14f5ec68f1959c4d6f7a55
2952

30-
COCOAPODS: 1.10.1
53+
COCOAPODS: 1.11.3

example/ios/Runner.xcodeproj/project.pbxproj

Lines changed: 53 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
archiveVersion = 1;
44
classes = {
55
};
6-
objectVersion = 46;
6+
objectVersion = 50;
77
objects = {
88

99
/* Begin PBXBuildFile section */
@@ -221,6 +221,7 @@
221221
9705A1C41CF9048500538489 /* Embed Frameworks */,
222222
3B06AD1E1E4923F5004D2608 /* Thin Binary */,
223223
CAB34EA020F96F460024CA6B /* Embed App Extensions */,
224+
7D19491000A09E5367EAA6BE /* [CP] Embed Pods Frameworks */,
224225
);
225226
buildRules = (
226227
);
@@ -256,7 +257,7 @@
256257
97C146E61CF9000F007C117D /* Project object */ = {
257258
isa = PBXProject;
258259
attributes = {
259-
LastUpgradeCheck = 0910;
260+
LastUpgradeCheck = 1300;
260261
ORGANIZATIONNAME = "The Chromium Authors";
261262
TargetAttributes = {
262263
97C146ED1CF9000F007C117D = {
@@ -385,6 +386,36 @@
385386
shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
386387
showEnvVarsInLog = 0;
387388
};
389+
7D19491000A09E5367EAA6BE /* [CP] Embed Pods Frameworks */ = {
390+
isa = PBXShellScriptBuildPhase;
391+
buildActionMask = 2147483647;
392+
files = (
393+
);
394+
inputPaths = (
395+
"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh",
396+
"${PODS_XCFRAMEWORKS_BUILD_DIR}/OneSignalXCFramework/OneSignalFramework.framework/OneSignalFramework",
397+
"${PODS_XCFRAMEWORKS_BUILD_DIR}/OneSignalXCFramework/OneSignalCore/OneSignalCore.framework/OneSignalCore",
398+
"${PODS_XCFRAMEWORKS_BUILD_DIR}/OneSignalXCFramework/OneSignalExtension/OneSignalExtension.framework/OneSignalExtension",
399+
"${PODS_XCFRAMEWORKS_BUILD_DIR}/OneSignalXCFramework/OneSignalNotifications/OneSignalNotifications.framework/OneSignalNotifications",
400+
"${PODS_XCFRAMEWORKS_BUILD_DIR}/OneSignalXCFramework/OneSignalOSCore/OneSignalOSCore.framework/OneSignalOSCore",
401+
"${PODS_XCFRAMEWORKS_BUILD_DIR}/OneSignalXCFramework/OneSignalOutcomes/OneSignalOutcomes.framework/OneSignalOutcomes",
402+
"${PODS_XCFRAMEWORKS_BUILD_DIR}/OneSignalXCFramework/OneSignalUser/OneSignalUser.framework/OneSignalUser",
403+
);
404+
name = "[CP] Embed Pods Frameworks";
405+
outputPaths = (
406+
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/OneSignalFramework.framework",
407+
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/OneSignalCore.framework",
408+
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/OneSignalExtension.framework",
409+
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/OneSignalNotifications.framework",
410+
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/OneSignalOSCore.framework",
411+
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/OneSignalOutcomes.framework",
412+
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/OneSignalUser.framework",
413+
);
414+
runOnlyForDeploymentPostprocessing = 0;
415+
shellPath = /bin/sh;
416+
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n";
417+
showEnvVarsInLog = 0;
418+
};
388419
9740EEB61CF901F6004384FC /* Run Script */ = {
389420
isa = PBXShellScriptBuildPhase;
390421
buildActionMask = 2147483647;
@@ -495,7 +526,7 @@
495526
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
496527
GCC_WARN_UNUSED_FUNCTION = YES;
497528
GCC_WARN_UNUSED_VARIABLE = YES;
498-
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
529+
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
499530
MTL_ENABLE_DEBUG_INFO = YES;
500531
ONLY_ACTIVE_ARCH = YES;
501532
SDKROOT = iphoneos;
@@ -542,7 +573,7 @@
542573
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
543574
GCC_WARN_UNUSED_FUNCTION = YES;
544575
GCC_WARN_UNUSED_VARIABLE = YES;
545-
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
576+
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
546577
MTL_ENABLE_DEBUG_INFO = NO;
547578
SDKROOT = iphoneos;
548579
TARGETED_DEVICE_FAMILY = "1,2";
@@ -565,7 +596,10 @@
565596
"$(PROJECT_DIR)/Flutter",
566597
);
567598
INFOPLIST_FILE = Runner/Info.plist;
568-
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
599+
LD_RUNPATH_SEARCH_PATHS = (
600+
"$(inherited)",
601+
"@executable_path/Frameworks",
602+
);
569603
LIBRARY_SEARCH_PATHS = (
570604
"$(inherited)",
571605
"$(PROJECT_DIR)/Flutter",
@@ -591,7 +625,10 @@
591625
"$(PROJECT_DIR)/Flutter",
592626
);
593627
INFOPLIST_FILE = Runner/Info.plist;
594-
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
628+
LD_RUNPATH_SEARCH_PATHS = (
629+
"$(inherited)",
630+
"@executable_path/Frameworks",
631+
);
595632
LIBRARY_SEARCH_PATHS = (
596633
"$(inherited)",
597634
"$(PROJECT_DIR)/Flutter",
@@ -621,7 +658,11 @@
621658
GCC_C_LANGUAGE_STANDARD = gnu11;
622659
INFOPLIST_FILE = OneSignalNotificationServiceExtension/Info.plist;
623660
IPHONEOS_DEPLOYMENT_TARGET = 10.0;
624-
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks";
661+
LD_RUNPATH_SEARCH_PATHS = (
662+
"$(inherited)",
663+
"@executable_path/Frameworks",
664+
"@executable_path/../../Frameworks",
665+
);
625666
PRODUCT_BUNDLE_IDENTIFIER = com.onesignal.example.OneSignalNotificationServiceExtensionA;
626667
PRODUCT_NAME = "$(TARGET_NAME)";
627668
PROVISIONING_PROFILE_SPECIFIER = "";
@@ -650,7 +691,11 @@
650691
GCC_C_LANGUAGE_STANDARD = gnu11;
651692
INFOPLIST_FILE = OneSignalNotificationServiceExtension/Info.plist;
652693
IPHONEOS_DEPLOYMENT_TARGET = 10.0;
653-
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks";
694+
LD_RUNPATH_SEARCH_PATHS = (
695+
"$(inherited)",
696+
"@executable_path/Frameworks",
697+
"@executable_path/../../Frameworks",
698+
);
654699
PRODUCT_BUNDLE_IDENTIFIER = com.onesignal.example.OneSignalNotificationServiceExtensionA;
655700
PRODUCT_NAME = "$(TARGET_NAME)";
656701
PROVISIONING_PROFILE_SPECIFIER = "";

example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "0910"
3+
LastUpgradeVersion = "1300"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

example/ios/Runner/Info.plist

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,5 +48,7 @@
4848
</array>
4949
<key>UIViewControllerBasedStatusBarAppearance</key>
5050
<false/>
51+
<key>CADisableMinimumFrameDurationOnPhone</key>
52+
<true/>
5153
</dict>
5254
</plist>

0 commit comments

Comments
 (0)