Skip to content
This repository was archived by the owner on Apr 4, 2023. It is now read-only.

Commit cf25b02

Browse files
EddyVerbruggenEddyVerbruggen
committed
incompatible pod versions #1547 
1 parent 37fda4d commit cf25b02

File tree

13 files changed

+534
-32
lines changed

13 files changed

+534
-32
lines changed

‎demo-ng/package.json‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@
66
"nativescript": {
77
"id": "org.nativescript.firebasedemo.firestore",
88
"tns-android": {
9-
"version": "6.2.0"
9+
"version": "6.3.1"
1010
},
1111
"tns-ios": {
12-
"version": "6.2.0"
12+
"version": "6.3.0"
1313
}
1414
},
1515
"dependencies": {
@@ -24,12 +24,12 @@
2424
"@angular/router": "~8.1.0",
2525
"nativescript-angular": "~8.0.3",
2626
"nativescript-camera": "~4.5.0",
27-
"nativescript-imagepicker": "~6.2.0",
28-
"nativescript-plugin-firebase": "file:../publish/package/nativescript-plugin-firebase-10.3.3.tgz",
27+
"nativescript-imagepicker": "~6.3.0",
28+
"nativescript-plugin-firebase": "file:../publish/package/nativescript-plugin-firebase-10.4.0.tgz",
2929
"nativescript-theme-core": "~1.0.6",
3030
"reflect-metadata": "~0.1.13",
3131
"rxjs": "~6.5.2",
32-
"tns-core-modules": "~6.2.0",
32+
"tns-core-modules": "~6.3.2",
3333
"zone.js": "~0.10.0"
3434
},
3535
"devDependencies": {

‎demo-ng/webpack.config.js‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -284,6 +284,7 @@ module.exports = env => {
284284
{ from: { glob: "fonts/**" } },
285285
{ from: { glob: "**/*.jpg" } },
286286
{ from: { glob: "**/*.png" } },
287+
{ from: { glob: "**/custommodel/**" } },
287288
], { ignore: [`${relative(appPath, appResourcesFullPath)}/**`] }),
288289
new nsWebpack.GenerateNativeScriptEntryPointsPlugin("bundle"),
289290
// For instructions on how to set up workers with webpack

‎demo-push/package.json‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,17 @@
22
"nativescript": {
33
"id": "org.nativescript.firebasedemo",
44
"tns-ios": {
5-
"version": "6.1.0"
5+
"version": "6.3.0"
66
},
77
"tns-android": {
8-
"version": "6.1.0"
8+
"version": "6.3.1"
99
}
1010
},
1111
"dependencies": {
12-
"nativescript-plugin-firebase": "file:../publish/package/nativescript-plugin-firebase-10.3.3.tgz",
12+
"nativescript-plugin-firebase": "file:../publish/package/nativescript-plugin-firebase-10.4.0.tgz",
1313
"nativescript-theme-core": "~1.0.6",
1414
"nativescript-unit-test-runner": "0.7.0",
15-
"tns-core-modules": "~6.1.1"
15+
"tns-core-modules": "~6.3.2"
1616
},
1717
"devDependencies": {
1818
"babel-traverse": "6.12.0",
@@ -22,7 +22,7 @@
2222
"lazy": "1.0.11",
2323
"nativescript-css-loader": "~0.26.0",
2424
"nativescript-dev-webpack": "1.0.1",
25-
"tns-platform-declarations": "~6.1.1",
25+
"tns-platform-declarations": "~6.3.2",
2626
"tslint": "~5.4.3",
2727
"typescript": "3.4.5"
2828
},

‎demo-vue/package.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,17 +7,17 @@
77
"nativescript": {
88
"id": "org.nativescript.firebasedemo.firestore",
99
"tns-ios": {
10-
"version": "6.1.0"
10+
"version": "6.3.0"
1111
},
1212
"tns-android": {
13-
"version": "6.1.0"
13+
"version": "6.3.1"
1414
}
1515
},
1616
"dependencies": {
17-
"nativescript-plugin-firebase": "file:../publish/package/nativescript-plugin-firebase-10.3.3.tgz",
17+
"nativescript-plugin-firebase": "file:../publish/package/nativescript-plugin-firebase-10.4.0.tgz",
1818
"nativescript-theme-core": "~1.0.6",
1919
"nativescript-vue": "~2.4.0",
20-
"tns-core-modules": "~6.1.1"
20+
"tns-core-modules": "~6.3.2"
2121
},
2222
"devDependencies": {
2323
"@babel/core": "^7.0.0",

‎demo/package.json‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,18 @@
22
"nativescript": {
33
"id": "org.nativescript.firebasedemo",
44
"tns-ios": {
5-
"version": "6.1.1"
5+
"version": "6.3.0"
66
},
77
"tns-android": {
8-
"version": "6.1.2"
8+
"version": "6.3.1"
99
}
1010
},
1111
"dependencies": {
1212
"firebase-functions": "^2.0.5",
13-
"nativescript-plugin-firebase": "file:../publish/package/nativescript-plugin-firebase-10.3.3.tgz",
13+
"nativescript-plugin-firebase": "file:../publish/package/nativescript-plugin-firebase-10.4.0.tgz",
1414
"nativescript-theme-core": "^1.0.4",
1515
"nativescript-unit-test-runner": "0.7.0",
16-
"tns-core-modules": "~6.1.1"
16+
"tns-core-modules": "~6.3.2"
1717
},
1818
"devDependencies": {
1919
"@types/jasmine": "~2.8.0",
@@ -29,7 +29,7 @@
2929
"lazy": "1.0.11",
3030
"nativescript-css-loader": "~0.26.0",
3131
"nativescript-dev-webpack": "1.0.1",
32-
"tns-platform-declarations": "~6.0.6",
32+
"tns-platform-declarations": "~6.3.2",
3333
"tslint": "~5.4.3",
3434
"typescript": "3.4.5"
3535
},

‎publish/scripts/installer.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -357,7 +357,7 @@ function writePodFile(result) {
357357
// The MLVision pod requires a minimum of iOS 9, otherwise the build will fail
358358
(isPresent(result.ml_kit) ? `` : `#`) + `platform :ios, '9.0'
359359
360-
` + (!isSelected(result.external_push_client_only) ? `` : `#`) + `pod 'Firebase/Core', '~>6.13.0'
360+
` + (!isSelected(result.external_push_client_only) ? `` : `#`) + `pod 'Firebase/Core', '~>6.16.0'
361361
362362
# Analytics
363363
` + (isSelected(result.analytics) || (!isSelected(result.external_push_client_only) && !isPresent(result.analytics)) ? `` : `#`) + `pod 'Firebase/Analytics'
@@ -395,7 +395,7 @@ end`) + `
395395
` + (isSelected(result.messaging) ? `` : `#`) + `pod 'Firebase/Messaging'
396396
397397
# Firebase In-App Messaging
398-
` + (isSelected(result.in_app_messaging) ? `` : `#`) + `pod 'Firebase/InAppMessagingDisplay'
398+
` + (isSelected(result.in_app_messaging) ? `` : `#`) + `pod 'Firebase/InAppMessaging'
399399
400400
# Firebase Cloud Storage
401401
` + (isSelected(result.storage) ? `` : `#`) + `pod 'Firebase/Storage'

‎src/package.json‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "nativescript-plugin-firebase",
3-
"version": "10.3.3",
3+
"version": "10.4.0",
44
"description": "Fire. Base. Firebase!",
55
"main": "firebase",
66
"typings": "index.d.ts",
@@ -134,16 +134,16 @@
134134
"readmeFilename": "README.md",
135135
"dependencies": {
136136
"fs-extra": "~2.1.0",
137-
"nativescript-hook": "~0.2.4",
138-
"prompt-lite": "~0.1.0",
139-
"xcode": "~0.9.0",
140-
"semver": "^5.0.0"
137+
"nativescript-hook": "~0.2.5",
138+
"prompt-lite": "~0.1.1",
139+
"xcode": "~0.9.3",
140+
"semver": "~5.7.1"
141141
},
142142
"devDependencies": {
143-
"rimraf": "^2.6.2",
144-
"tns-core-modules": "~6.1.1",
145-
"tns-platform-declarations": "~6.1.1",
146-
"tslint": "^5.1.0",
143+
"rimraf": "~2.7.1",
144+
"tns-core-modules": "~6.3.2",
145+
"tns-platform-declarations": "~6.3.2",
146+
"tslint": "~5.20.1",
147147
"typescript": "~3.4.5"
148148
}
149149
}

‎src/platforms/ios/typings/objc!FirebaseCoreDiagnostics.d.ts‎

Lines changed: 156 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,156 @@
1+
2+
declare var FirebaseCoreDiagnosticsVersionNumber: number;
3+
4+
declare var FirebaseCoreDiagnosticsVersionString: interop.Reference<number>;
5+
6+
interface logs_proto_mobilesdk_ios_ICoreConfiguration {
7+
has_configuration_type: boolean;
8+
configuration_type: logs_proto_mobilesdk_ios_ICoreConfiguration_ConfigurationType;
9+
sdk_service_installed_count: number;
10+
sdk_service_installed: interop.Pointer | interop.Reference<logs_proto_mobilesdk_ios_ICoreConfiguration_ServiceType>;
11+
device_model: interop.Pointer | interop.Reference<pb_bytes_array_s>;
12+
app_id: interop.Pointer | interop.Reference<pb_bytes_array_s>;
13+
bundle_id: interop.Pointer | interop.Reference<pb_bytes_array_s>;
14+
has_pod_name: boolean;
15+
pod_name: logs_proto_mobilesdk_ios_ICoreConfiguration_PodName;
16+
icore_version: interop.Pointer | interop.Reference<pb_bytes_array_s>;
17+
sdk_version: interop.Pointer | interop.Reference<pb_bytes_array_s>;
18+
has_sdk_name: boolean;
19+
sdk_name: logs_proto_mobilesdk_ios_ICoreConfiguration_ServiceType;
20+
has_app_count: boolean;
21+
app_count: number;
22+
os_version: interop.Pointer | interop.Reference<pb_bytes_array_s>;
23+
min_supported_ios_version: interop.Pointer | interop.Reference<pb_bytes_array_s>;
24+
has_use_default_app: boolean;
25+
use_default_app: boolean;
26+
has_deployed_in_app_store: boolean;
27+
deployed_in_app_store: boolean;
28+
has_dynamic_framework_count: boolean;
29+
dynamic_framework_count: number;
30+
apple_framework_version: interop.Pointer | interop.Reference<pb_bytes_array_s>;
31+
has_using_zip_file: boolean;
32+
using_zip_file: boolean;
33+
has_deployment_type: boolean;
34+
deployment_type: logs_proto_mobilesdk_ios_ICoreConfiguration_DeploymentType;
35+
platform_info: interop.Pointer | interop.Reference<pb_bytes_array_s>;
36+
has_swizzling_enabled: boolean;
37+
swizzling_enabled: boolean;
38+
has_using_gdt: boolean;
39+
using_gdt: boolean;
40+
}
41+
declare var logs_proto_mobilesdk_ios_ICoreConfiguration: interop.StructType<logs_proto_mobilesdk_ios_ICoreConfiguration>;
42+
43+
declare const enum logs_proto_mobilesdk_ios_ICoreConfiguration_BuildType {
44+
45+
UNKNOWN_BUILD_TYPE = 0,
46+
47+
INTERNAL = 1,
48+
49+
EAP = 2,
50+
51+
PROD = 3
52+
}
53+
54+
declare const enum logs_proto_mobilesdk_ios_ICoreConfiguration_ConfigurationType {
55+
56+
UNKNOWN_CONFIGURATION_TYPE = 0,
57+
58+
CORE = 1,
59+
60+
SDK = 2
61+
}
62+
63+
declare const enum logs_proto_mobilesdk_ios_ICoreConfiguration_DeploymentType {
64+
65+
UNKNOWN = 0,
66+
67+
COCOAPODS = 1,
68+
69+
ZIP_FILE = 2,
70+
71+
CARTHAGE = 3,
72+
73+
SPM = 4
74+
}
75+
76+
declare const enum logs_proto_mobilesdk_ios_ICoreConfiguration_PodName {
77+
78+
UNKNOWN_POD_NAME = 0,
79+
80+
GOOGLE = 1,
81+
82+
FIREBASE = 2
83+
}
84+
85+
declare const enum logs_proto_mobilesdk_ios_ICoreConfiguration_ServiceType {
86+
87+
UNKNOWN_SDK_SERVICE = 0,
88+
89+
ICORE = 1,
90+
91+
ADMOB = 2,
92+
93+
APP_INVITE = 3,
94+
95+
SIGN_IN = 5,
96+
97+
GCM = 6,
98+
99+
MAPS = 7,
100+
101+
SCION = 8,
102+
103+
ANALYTICS = 9,
104+
105+
APP_INDEXING = 10,
106+
107+
CONFIG = 11,
108+
109+
DURABLE_DEEP_LINKS = 12,
110+
111+
CRASH = 13,
112+
113+
AUTH = 14,
114+
115+
DATABASE = 15,
116+
117+
STORAGE = 16,
118+
119+
MESSAGING = 17,
120+
121+
MEASUREMENT = 18,
122+
123+
REMOTE_CONFIG = 19,
124+
125+
DYNAMIC_LINKS = 20,
126+
127+
INVITES = 21,
128+
129+
AUTH_UI = 22,
130+
131+
FIRESTORE = 23,
132+
133+
PERFORMANCE = 24,
134+
135+
ML_VISION_ON_DEVICE_FACE = 26,
136+
137+
ML_VISION_ON_DEVICE_BARCODE = 27,
138+
139+
ML_VISION_ON_DEVICE_TEXT = 28,
140+
141+
ML_VISION_ON_DEVICE_LABEL = 29,
142+
143+
ML_MODEL_INTERPRETER = 30,
144+
145+
IN_APP_MESSAGING = 31,
146+
147+
FUNCTIONS = 32,
148+
149+
ML_NATURAL_LANGUAGE = 33,
150+
151+
ML_VISION_ON_DEVICE_AUTOML = 34,
152+
153+
ML_VISION_ON_DEVICE_OBJECT_DETECTION = 35
154+
}
155+
156+
declare var logs_proto_mobilesdk_ios_ICoreConfiguration_fields: interop.Reference<pb_field_s>;

‎src/platforms/ios/typings/objc!FirebaseFirestore.d.ts‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -310,6 +310,8 @@ declare class FIRQuery extends NSObject {
310310

311311
queryLimitedTo(limit: number): FIRQuery;
312312

313+
queryLimitedToLast(limit: number): FIRQuery;
314+
313315
queryOrderedByField(field: string): FIRQuery;
314316

315317
queryOrderedByFieldDescending(field: string, descending: boolean): FIRQuery;

‎src/platforms/ios/typings/objc!FirebaseInstallations.d.ts‎

Lines changed: 53 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,53 @@
1+
2+
declare var FIRInstallationIDDidChangeNotification: string;
3+
4+
declare class FIRInstallations extends NSObject {
5+
6+
static alloc(): FIRInstallations; // inherited from NSObject
7+
8+
static installations(): FIRInstallations;
9+
10+
static installationsWithApp(application: FIRApp): FIRInstallations;
11+
12+
static new(): FIRInstallations; // inherited from NSObject
13+
14+
authTokenForcingRefreshCompletion(forceRefresh: boolean, completion: (p1: FIRInstallationsAuthTokenResult, p2: NSError) => void): void;
15+
16+
authTokenWithCompletion(completion: (p1: FIRInstallationsAuthTokenResult, p2: NSError) => void): void;
17+
18+
deleteWithCompletion(completion: (p1: NSError) => void): void;
19+
20+
installationIDWithCompletion(completion: (p1: string, p2: NSError) => void): void;
21+
}
22+
23+
declare class FIRInstallationsAuthTokenResult extends NSObject {
24+
25+
static alloc(): FIRInstallationsAuthTokenResult; // inherited from NSObject
26+
27+
static new(): FIRInstallationsAuthTokenResult; // inherited from NSObject
28+
29+
readonly authToken: string;
30+
31+
readonly expirationDate: Date;
32+
}
33+
34+
declare const enum FIRInstallationsErrorCode {
35+
36+
Unknown = 0,
37+
38+
Keychain = 1,
39+
40+
ServerUnreachable = 2,
41+
42+
InvalidConfiguration = 3
43+
}
44+
45+
declare var FIRInstallationsVersionStr: string;
46+
47+
declare var FirebaseInstallationsVersionNumber: number;
48+
49+
declare var FirebaseInstallationsVersionString: interop.Reference<number>;
50+
51+
declare var kFIRInstallationIDDidChangeNotificationAppNameKey: string;
52+
53+
declare var kFirebaseInstallationsErrorDomain: string;

0 commit comments

Comments
 (0)