Skip to content

Commit 8902b89

Browse files
authored
Merge pull request #149 from hansemannn/feature/ios-10.12.0
feat(ios): update Firebase iOS SDK to 10.12.0
2 parents 3de1414 + 654363b commit 8902b89

File tree

18 files changed

+26
-113
lines changed

18 files changed

+26
-113
lines changed

ios/Classes/FirebaseCloudmessagingModule.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
* Copyright (c) 2017-present by Hans Knöchel. All rights reserved.
66
*/
77

8-
#import "TiModule.h"
8+
#import <TitaniumKit/TitaniumKit.h>
99
#import <UserNotifications/UserNotifications.h>
1010

1111
@import FirebaseMessaging;

ios/Classes/FirebaseCloudmessagingModule.m

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,6 @@
66
*/
77

88
#import "FirebaseCloudmessagingModule.h"
9-
#import "TiBase.h"
10-
#import "TiHost.h"
11-
#import "TiUtils.h"
12-
#import "TiApp.h"
139

1410
@implementation FirebaseCloudmessagingModule
1511

ios/manifest

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,18 @@
22
# this is your module manifest and used by Titanium
33
# during compilation, packaging, distribution, etc.
44
#
5-
version: 8.0.0
5+
version: 9.0.0
66
apiversion: 2
77
architectures: arm64 x86_64
88
description: titanium-firebase-cloud-messaging
99
author: Hans Knoechel
1010
license: Apache 2
11-
mac: true
11+
mac: false
1212
copyright: Copyright (c) 2017-present by Hans Knoechel
1313

1414
# these should not be edited
1515
name: titanium-firebase-cloud-messaging
1616
moduleid: firebase.cloudmessaging
1717
guid: 36052f2b-8ddc-4177-b5a1-82c6b948f83d
1818
platform: iphone
19-
minsdk: 10.0.0
19+
minsdk: 11.0.0

ios/platform/FirebaseMessaging.xcframework/Info.plist

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -21,44 +21,49 @@
2121
</dict>
2222
<dict>
2323
<key>LibraryIdentifier</key>
24-
<string>macos-arm64_x86_64</string>
24+
<string>tvos-arm64</string>
2525
<key>LibraryPath</key>
2626
<string>FirebaseMessaging.framework</string>
2727
<key>SupportedArchitectures</key>
2828
<array>
2929
<string>arm64</string>
30-
<string>x86_64</string>
3130
</array>
3231
<key>SupportedPlatform</key>
33-
<string>macos</string>
32+
<string>tvos</string>
3433
</dict>
3534
<dict>
3635
<key>LibraryIdentifier</key>
37-
<string>ios-arm64</string>
36+
<string>tvos-arm64_x86_64-simulator</string>
3837
<key>LibraryPath</key>
3938
<string>FirebaseMessaging.framework</string>
4039
<key>SupportedArchitectures</key>
4140
<array>
4241
<string>arm64</string>
42+
<string>x86_64</string>
4343
</array>
4444
<key>SupportedPlatform</key>
45-
<string>ios</string>
45+
<string>tvos</string>
46+
<key>SupportedPlatformVariant</key>
47+
<string>simulator</string>
4648
</dict>
4749
<dict>
4850
<key>LibraryIdentifier</key>
49-
<string>tvos-arm64</string>
51+
<string>ios-arm64_x86_64-simulator</string>
5052
<key>LibraryPath</key>
5153
<string>FirebaseMessaging.framework</string>
5254
<key>SupportedArchitectures</key>
5355
<array>
5456
<string>arm64</string>
57+
<string>x86_64</string>
5558
</array>
5659
<key>SupportedPlatform</key>
57-
<string>tvos</string>
60+
<string>ios</string>
61+
<key>SupportedPlatformVariant</key>
62+
<string>simulator</string>
5863
</dict>
5964
<dict>
6065
<key>LibraryIdentifier</key>
61-
<string>tvos-arm64_x86_64-simulator</string>
66+
<string>macos-arm64_x86_64</string>
6267
<key>LibraryPath</key>
6368
<string>FirebaseMessaging.framework</string>
6469
<key>SupportedArchitectures</key>
@@ -67,24 +72,19 @@
6772
<string>x86_64</string>
6873
</array>
6974
<key>SupportedPlatform</key>
70-
<string>tvos</string>
71-
<key>SupportedPlatformVariant</key>
72-
<string>simulator</string>
75+
<string>macos</string>
7376
</dict>
7477
<dict>
7578
<key>LibraryIdentifier</key>
76-
<string>ios-arm64_x86_64-simulator</string>
79+
<string>ios-arm64</string>
7780
<key>LibraryPath</key>
7881
<string>FirebaseMessaging.framework</string>
7982
<key>SupportedArchitectures</key>
8083
<array>
8184
<string>arm64</string>
82-
<string>x86_64</string>
8385
</array>
8486
<key>SupportedPlatform</key>
8587
<string>ios</string>
86-
<key>SupportedPlatformVariant</key>
87-
<string>simulator</string>
8888
</dict>
8989
</array>
9090
<key>CFBundlePackageType</key>

ios/platform/FirebaseMessaging.xcframework/ios-arm64/FirebaseMessaging.framework/Info.plist

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<key>CFBundlePackageType</key>
1414
<string>FMWK</string>
1515
<key>CFBundleVersion</key>
16-
<string>9.6.0</string>
16+
<string>10.12.0</string>
1717
<key>DTSDKName</key>
1818
<string>iphonesimulator11.2</string>
1919
</dict>

ios/platform/FirebaseMessaging.xcframework/ios-arm64_x86_64-maccatalyst/FirebaseMessaging.framework/Info.plist

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<key>CFBundlePackageType</key>
1414
<string>FMWK</string>
1515
<key>CFBundleVersion</key>
16-
<string>9.6.0</string>
16+
<string>10.12.0</string>
1717
<key>DTSDKName</key>
1818
<string>iphonesimulator11.2</string>
1919
</dict>

ios/platform/FirebaseMessaging.xcframework/ios-arm64_x86_64-simulator/FirebaseMessaging.framework/Info.plist

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<key>CFBundlePackageType</key>
1414
<string>FMWK</string>
1515
<key>CFBundleVersion</key>
16-
<string>9.6.0</string>
16+
<string>10.12.0</string>
1717
<key>DTSDKName</key>
1818
<string>iphonesimulator11.2</string>
1919
</dict>

ios/platform/FirebaseMessaging.xcframework/macos-arm64_x86_64/FirebaseMessaging.framework/Info.plist

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<key>CFBundlePackageType</key>
1414
<string>FMWK</string>
1515
<key>CFBundleVersion</key>
16-
<string>9.6.0</string>
16+
<string>10.12.0</string>
1717
<key>DTSDKName</key>
1818
<string>iphonesimulator11.2</string>
1919
</dict>

ios/platform/FirebaseMessaging.xcframework/tvos-arm64/FirebaseMessaging.framework/Info.plist

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<key>CFBundlePackageType</key>
1414
<string>FMWK</string>
1515
<key>CFBundleVersion</key>
16-
<string>9.6.0</string>
16+
<string>10.12.0</string>
1717
<key>DTSDKName</key>
1818
<string>iphonesimulator11.2</string>
1919
</dict>

ios/platform/FirebaseMessaging.xcframework/tvos-arm64_x86_64-simulator/FirebaseMessaging.framework/Info.plist

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<key>CFBundlePackageType</key>
1414
<string>FMWK</string>
1515
<key>CFBundleVersion</key>
16-
<string>9.6.0</string>
16+
<string>10.12.0</string>
1717
<key>DTSDKName</key>
1818
<string>iphonesimulator11.2</string>
1919
</dict>

ios/titanium-firebase-cloud-messaging.xcodeproj/project.pbxproj

Lines changed: 0 additions & 83 deletions
Original file line numberDiff line numberDiff line change
@@ -6,21 +6,6 @@
66
objectVersion = 52;
77
objects = {
88

9-
/* Begin PBXAggregateTarget section */
10-
24416B8111C4CA220047AFDD /* Build & Test */ = {
11-
isa = PBXAggregateTarget;
12-
buildConfigurationList = 24416B8A11C4CA520047AFDD /* Build configuration list for PBXAggregateTarget "Build & Test" */;
13-
buildPhases = (
14-
24416B8011C4CA220047AFDD /* ShellScript */,
15-
);
16-
dependencies = (
17-
24416B8511C4CA280047AFDD /* PBXTargetDependency */,
18-
);
19-
name = "Build & Test";
20-
productName = "Build & test";
21-
};
22-
/* End PBXAggregateTarget section */
23-
249
/* Begin PBXBuildFile section */
2510
24DD6CF91134B3F500162E58 /* FirebaseCloudmessagingModule.h in Headers */ = {isa = PBXBuildFile; fileRef = 24DD6CF71134B3F500162E58 /* FirebaseCloudmessagingModule.h */; };
2611
24DD6CFA1134B3F500162E58 /* FirebaseCloudmessagingModule.m in Sources */ = {isa = PBXBuildFile; fileRef = 24DD6CF81134B3F500162E58 /* FirebaseCloudmessagingModule.m */; };
@@ -30,16 +15,6 @@
3015
AA747D9F0F9514B9006C5449 /* FirebaseCloudmessaging_Prefix.pch in Headers */ = {isa = PBXBuildFile; fileRef = AA747D9E0F9514B9006C5449 /* FirebaseCloudmessaging_Prefix.pch */; };
3116
/* End PBXBuildFile section */
3217

33-
/* Begin PBXContainerItemProxy section */
34-
24416B8411C4CA280047AFDD /* PBXContainerItemProxy */ = {
35-
isa = PBXContainerItemProxy;
36-
containerPortal = 0867D690FE84028FC02AAC07 /* Project object */;
37-
proxyType = 1;
38-
remoteGlobalIDString = D2AAC07D0554694100DB518D;
39-
remoteInfo = "titanium-firebase-cloud-messaging";
40-
};
41-
/* End PBXContainerItemProxy section */
42-
4318
/* Begin PBXFileReference section */
4419
24DD6CF71134B3F500162E58 /* FirebaseCloudmessagingModule.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = FirebaseCloudmessagingModule.h; path = Classes/FirebaseCloudmessagingModule.h; sourceTree = "<group>"; };
4520
24DD6CF81134B3F500162E58 /* FirebaseCloudmessagingModule.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = FirebaseCloudmessagingModule.m; path = Classes/FirebaseCloudmessagingModule.m; sourceTree = "<group>"; };
@@ -165,27 +140,10 @@
165140
projectRoot = "";
166141
targets = (
167142
D2AAC07D0554694100DB518D /* titanium-firebase-cloud-messaging */,
168-
24416B8111C4CA220047AFDD /* Build & Test */,
169143
);
170144
};
171145
/* End PBXProject section */
172146

173-
/* Begin PBXShellScriptBuildPhase section */
174-
24416B8011C4CA220047AFDD /* ShellScript */ = {
175-
isa = PBXShellScriptBuildPhase;
176-
buildActionMask = 2147483647;
177-
files = (
178-
);
179-
inputPaths = (
180-
);
181-
outputPaths = (
182-
);
183-
runOnlyForDeploymentPostprocessing = 0;
184-
shellPath = /bin/sh;
185-
shellScript = "# shell script goes here\n\npython \"${TITANIUM_SDK}/titanium.py\" run --dir=\"${PROJECT_DIR}\"\nexit $?\n";
186-
};
187-
/* End PBXShellScriptBuildPhase section */
188-
189147
/* Begin PBXSourcesBuildPhase section */
190148
D2AAC07B0554694100DB518D /* Sources */ = {
191149
isa = PBXSourcesBuildPhase;
@@ -198,14 +156,6 @@
198156
};
199157
/* End PBXSourcesBuildPhase section */
200158

201-
/* Begin PBXTargetDependency section */
202-
24416B8511C4CA280047AFDD /* PBXTargetDependency */ = {
203-
isa = PBXTargetDependency;
204-
target = D2AAC07D0554694100DB518D /* titanium-firebase-cloud-messaging */;
205-
targetProxy = 24416B8411C4CA280047AFDD /* PBXContainerItemProxy */;
206-
};
207-
/* End PBXTargetDependency section */
208-
209159
/* Begin XCBuildConfiguration section */
210160
1DEB921F08733DC00010E9CD /* Debug */ = {
211161
isa = XCBuildConfiguration;
@@ -415,30 +365,6 @@
415365
};
416366
name = Release;
417367
};
418-
24416B8211C4CA220047AFDD /* Debug */ = {
419-
isa = XCBuildConfiguration;
420-
baseConfigurationReference = 24DD6D1B1134B66800162E58 /* titanium.xcconfig */;
421-
buildSettings = {
422-
CLANG_ENABLE_OBJC_WEAK = YES;
423-
COPY_PHASE_STRIP = NO;
424-
GCC_DYNAMIC_NO_PIC = NO;
425-
GCC_OPTIMIZATION_LEVEL = 0;
426-
PRODUCT_NAME = "Build & test";
427-
};
428-
name = Debug;
429-
};
430-
24416B8311C4CA220047AFDD /* Release */ = {
431-
isa = XCBuildConfiguration;
432-
baseConfigurationReference = 24DD6D1B1134B66800162E58 /* titanium.xcconfig */;
433-
buildSettings = {
434-
CLANG_ENABLE_OBJC_WEAK = YES;
435-
COPY_PHASE_STRIP = YES;
436-
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
437-
PRODUCT_NAME = "Build & test";
438-
ZERO_LINK = NO;
439-
};
440-
name = Release;
441-
};
442368
/* End XCBuildConfiguration section */
443369

444370
/* Begin XCConfigurationList section */
@@ -460,15 +386,6 @@
460386
defaultConfigurationIsVisible = 0;
461387
defaultConfigurationName = Release;
462388
};
463-
24416B8A11C4CA520047AFDD /* Build configuration list for PBXAggregateTarget "Build & Test" */ = {
464-
isa = XCConfigurationList;
465-
buildConfigurations = (
466-
24416B8211C4CA220047AFDD /* Debug */,
467-
24416B8311C4CA220047AFDD /* Release */,
468-
);
469-
defaultConfigurationIsVisible = 0;
470-
defaultConfigurationName = Release;
471-
};
472389
/* End XCConfigurationList section */
473390
};
474391
rootObject = 0867D690FE84028FC02AAC07 /* Project object */;

ios/titanium.xcconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
// OF YOUR TITANIUM SDK YOU'RE BUILDING FOR
55
//
66
//
7-
TITANIUM_SDK_VERSION = 11.1.0.GA
7+
TITANIUM_SDK_VERSION = 10.1.1.GA
88

99
//
1010
// THESE SHOULD BE OK GENERALLY AS-IS

0 commit comments

Comments
 (0)