diff --git a/package.json b/package.json index 04d835b5..ad48e211 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "plugins", - "version": "3.2.0", + "version": "3.2.1", "license": "MIT", "scripts": { "postinstall": "husky install && npx ts-patch install", diff --git a/packages/firebase-admob/package.json b/packages/firebase-admob/package.json index f129fb45..10fb883a 100644 --- a/packages/firebase-admob/package.json +++ b/packages/firebase-admob/package.json @@ -1,6 +1,6 @@ { "name": "@nativescript/firebase-admob", - "version": "3.2.0", + "version": "3.2.1", "description": "NativeScript Firebase - Admob", "main": "index", "typings": "index.d.ts", diff --git a/packages/firebase-admob/platforms/android/firebase_admob.aar b/packages/firebase-admob/platforms/android/firebase_admob.aar index c2f54ee4..f7a3b366 100644 Binary files a/packages/firebase-admob/platforms/android/firebase_admob.aar and b/packages/firebase-admob/platforms/android/firebase_admob.aar differ diff --git a/packages/firebase-analytics/index.android.ts b/packages/firebase-analytics/index.android.ts index 4154f2c2..93a6f6f8 100644 --- a/packages/firebase-analytics/index.android.ts +++ b/packages/firebase-analytics/index.android.ts @@ -144,7 +144,7 @@ export class Analytics implements IAnalytics { } setConsent(consentSettings: Map): void { - const nativeMap = new java.util.HashMap(); + const nativeMap = new java.util.HashMap(consentSettings?.size ?? 0); consentSettings.forEach((value, key) => { let nativeKey; diff --git a/packages/firebase-analytics/package.json b/packages/firebase-analytics/package.json index 685c36b3..af0cdb88 100644 --- a/packages/firebase-analytics/package.json +++ b/packages/firebase-analytics/package.json @@ -1,6 +1,6 @@ { "name": "@nativescript/firebase-analytics", - "version": "3.2.0", + "version": "3.2.1", "description": "NativeScript Firebase - Analytics", "main": "index", "typings": "index.d.ts", diff --git a/packages/firebase-analytics/platforms/android/include.gradle b/packages/firebase-analytics/platforms/android/include.gradle index a0989f89..3195cad5 100644 --- a/packages/firebase-analytics/platforms/android/include.gradle +++ b/packages/firebase-analytics/platforms/android/include.gradle @@ -1,5 +1,5 @@ dependencies { - def computeFirebaseBomVersion = { -> project.hasProperty("firebaseBomVersion") ? firebaseBomVersion : "32.3.1" } + def computeFirebaseBomVersion = { -> project.hasProperty("firebaseBomVersion") ? firebaseBomVersion : "32.7.2" } implementation platform("com.google.firebase:firebase-bom:${computeFirebaseBomVersion}") implementation 'com.google.firebase:firebase-analytics' } \ No newline at end of file diff --git a/packages/firebase-analytics/platforms/ios/Podfile b/packages/firebase-analytics/platforms/ios/Podfile index 7851af38..2bab4e5d 100644 --- a/packages/firebase-analytics/platforms/ios/Podfile +++ b/packages/firebase-analytics/platforms/ios/Podfile @@ -4,9 +4,9 @@ platform :ios, '12.0' if defined?($NSFirebaseAnalyticsWithoutAdIdSupport) Pod::UI.puts "Using Firebase/AnalyticsWithoutAdIdSupport pod in place of default Firebase/Analytics" - pod 'Firebase/AnalyticsWithoutAdIdSupport', '~>10.13.0' + pod 'Firebase/AnalyticsWithoutAdIdSupport', '~>10.20.0' else Pod::UI.puts "Using default Firebase/Analytics with Ad Ids. May require App Tracking Transparency. Not allowed for Kids apps." Pod::UI.puts "You may set variable `$NSFirebaseAnalyticsWithoutAdIdSupport=true` in Podfile to use analytics without ad ids." - pod 'Firebase/Analytics', '~>10.13.0' + pod 'Firebase/Analytics', '~>10.20.0' end diff --git a/packages/firebase-analytics/typings/android.d.ts b/packages/firebase-analytics/typings/android.d.ts index 42a434a9..1592cdaf 100644 --- a/packages/firebase-analytics/typings/android.d.ts +++ b/packages/firebase-analytics/typings/android.d.ts @@ -1,39 +1,63 @@ -declare module com { - export module google { - export module firebase { - export module analytics { +declare namespace com { + export namespace google { + export namespace firebase { + export namespace analytics { + export class ConsentBuilder { + public static class: java.lang.Class; + public getAdPersonalization(): com.google.firebase.analytics.FirebaseAnalytics.ConsentStatus; + public asMap(): java.util.Map; + public setAdPersonalization(param0: com.google.firebase.analytics.FirebaseAnalytics.ConsentStatus): void; + public setAdStorage(param0: com.google.firebase.analytics.FirebaseAnalytics.ConsentStatus): void; + public constructor(); + public setAdUserData(param0: com.google.firebase.analytics.FirebaseAnalytics.ConsentStatus): void; + public getAdStorage(): com.google.firebase.analytics.FirebaseAnalytics.ConsentStatus; + public getAdUserData(): com.google.firebase.analytics.FirebaseAnalytics.ConsentStatus; + public setAnalyticsStorage(param0: com.google.firebase.analytics.FirebaseAnalytics.ConsentStatus): void; + public getAnalyticsStorage(): com.google.firebase.analytics.FirebaseAnalytics.ConsentStatus; + } + } + } + } +} + +declare namespace com { + export namespace google { + export namespace firebase { + export namespace analytics { export class FirebaseAnalytics { public static class: java.lang.Class; - public setConsent(param0: java.util.Map): void; public getAppInstanceId(): com.google.android.gms.tasks.Task; + public setConsent(param0: java.util.Map): void; public logEvent(param0: string, param1: globalAndroid.os.Bundle): void; public setDefaultEventParameters(param0: globalAndroid.os.Bundle): void; - public constructor(param0: any /* com.google.android.gms.internal.measurement.zzee*/); + public getSessionId(): com.google.android.gms.tasks.Task; public resetAnalyticsData(): void; public setUserProperty(param0: string, param1: string): void; public static getInstance(param0: globalAndroid.content.Context): com.google.firebase.analytics.FirebaseAnalytics; - public static getScionFrontendApiImplementation(param0: globalAndroid.content.Context, param1: globalAndroid.os.Bundle): any /* com.google.android.gms.measurement.internal.zzhx*/; + public getFirebaseInstanceId(): string; /** @deprecated */ public setCurrentScreen(param0: globalAndroid.app.Activity, param1: string, param2: string): void; - public getFirebaseInstanceId(): string; public setAnalyticsCollectionEnabled(param0: boolean): void; + public static getScionFrontendApiImplementation(param0: globalAndroid.content.Context, param1: globalAndroid.os.Bundle): any /* com.google.android.gms.measurement.internal.zzjz*/; public setUserId(param0: string): void; public setSessionTimeoutDuration(param0: number): void; } - export module FirebaseAnalytics { + export namespace FirebaseAnalytics { export class ConsentStatus { public static class: java.lang.Class; public static GRANTED: com.google.firebase.analytics.FirebaseAnalytics.ConsentStatus; public static DENIED: com.google.firebase.analytics.FirebaseAnalytics.ConsentStatus; + public static values(): androidNative.Array; public static valueOf(param0: string): com.google.firebase.analytics.FirebaseAnalytics.ConsentStatus; - public static values(): native.Array; } export class ConsentType { public static class: java.lang.Class; public static AD_STORAGE: com.google.firebase.analytics.FirebaseAnalytics.ConsentType; public static ANALYTICS_STORAGE: com.google.firebase.analytics.FirebaseAnalytics.ConsentType; + public static AD_USER_DATA: com.google.firebase.analytics.FirebaseAnalytics.ConsentType; + public static AD_PERSONALIZATION: com.google.firebase.analytics.FirebaseAnalytics.ConsentType; public static valueOf(param0: string): com.google.firebase.analytics.FirebaseAnalytics.ConsentType; - public static values(): native.Array; + public static values(): androidNative.Array; } export class Event { public static class: java.lang.Class; @@ -44,7 +68,6 @@ declare module com { public static APP_OPEN: string; public static BEGIN_CHECKOUT: string; public static CAMPAIGN_DETAILS: string; - public static ECOMMERCE_PURCHASE: string; public static GENERATE_LEAD: string; public static JOIN_GROUP: string; public static LEVEL_END: string; @@ -52,8 +75,6 @@ declare module com { public static LEVEL_UP: string; public static LOGIN: string; public static POST_SCORE: string; - public static PRESENT_OFFER: string; - public static PURCHASE_REFUND: string; public static SEARCH: string; public static SELECT_CONTENT: string; public static SHARE: string; @@ -68,8 +89,6 @@ declare module com { public static EARN_VIRTUAL_CURRENCY: string; public static SCREEN_VIEW: string; public static REMOVE_FROM_CART: string; - public static CHECKOUT_PROGRESS: string; - public static SET_CHECKOUT_OPTION: string; public static ADD_SHIPPING_INFO: string; public static PURCHASE: string; public static REFUND: string; @@ -98,12 +117,10 @@ declare module com { public static GROUP_ID: string; public static ITEM_CATEGORY: string; public static ITEM_ID: string; - public static ITEM_LOCATION_ID: string; public static ITEM_NAME: string; public static LOCATION: string; public static LEVEL: string; public static LEVEL_NAME: string; - public static SIGN_UP_METHOD: string; public static METHOD: string; public static NUMBER_OF_NIGHTS: string; public static NUMBER_OF_PASSENGERS: string; @@ -127,11 +144,12 @@ declare module com { public static CONTENT: string; public static ACLID: string; public static CP1: string; + public static CAMPAIGN_ID: string; + public static SOURCE_PLATFORM: string; + public static CREATIVE_FORMAT: string; + public static MARKETING_TACTIC: string; public static ITEM_BRAND: string; public static ITEM_VARIANT: string; - public static ITEM_LIST: string; - public static CHECKOUT_STEP: string; - public static CHECKOUT_OPTION: string; public static CREATIVE_NAME: string; public static CREATIVE_SLOT: string; public static AFFILIATION: string; @@ -165,24 +183,44 @@ declare module com { } } -declare module com { - export module google { - export module firebase { - export module analytics { - export module connector { +declare namespace com { + export namespace google { + export namespace firebase { + export namespace analytics { + export class ParametersBuilder { + public static class: java.lang.Class; + public constructor(); + public param(param0: string, param1: number): void; + public getBundle(): globalAndroid.os.Bundle; + // eslint-disable-next-line @typescript-eslint/adjacent-overload-signatures + public param(param0: string, param1: string): void; + public param(param0: string, param1: androidNative.Array): void; + public param(param0: string, param1: globalAndroid.os.Bundle): void; + } + } + } + } +} + +declare namespace com { + export namespace google { + export namespace firebase { + export namespace analytics { + export namespace connector { export class AnalyticsConnectorImpl { public static class: java.lang.Class; public static getInstance(param0: com.google.firebase.FirebaseApp, param1: globalAndroid.content.Context, param2: com.google.firebase.events.Subscriber): com.google.firebase.analytics.connector.AnalyticsConnector; - public setUserProperty(param0: string, param1: string, param2: any): void; public getMaxUserProperties(param0: string): number; + public setUserProperty(param0: string, param1: string, param2: any): void; public clearConditionalUserProperty(param0: string, param1: string, param2: globalAndroid.os.Bundle): void; + // eslint-disable-next-line @typescript-eslint/adjacent-overload-signatures public static getInstance(): com.google.firebase.analytics.connector.AnalyticsConnector; public static getInstance(param0: com.google.firebase.FirebaseApp): com.google.firebase.analytics.connector.AnalyticsConnector; public logEvent(param0: string, param1: string, param2: globalAndroid.os.Bundle): void; public registerAnalyticsConnectorListener(param0: string, param1: com.google.firebase.analytics.connector.AnalyticsConnector.AnalyticsConnectorListener): com.google.firebase.analytics.connector.AnalyticsConnector.AnalyticsConnectorHandle; - public setConditionalUserProperty(param0: com.google.firebase.analytics.connector.AnalyticsConnector.ConditionalUserProperty): void; public getConditionalUserProperties(param0: string, param1: string): java.util.List; - public getUserProperties(param0: boolean): java.util.Map; + public setConditionalUserProperty(param0: com.google.firebase.analytics.connector.AnalyticsConnector.ConditionalUserProperty): void; + public getUserProperties(param0: boolean): java.util.Map; } } } @@ -190,12 +228,12 @@ declare module com { } } -declare module com { - export module google { - export module firebase { - export module analytics { - export module connector { - export module internal { +declare namespace com { + export namespace google { + export namespace firebase { + export namespace analytics { + export namespace connector { + export namespace internal { export class AnalyticsConnectorRegistrar { public static class: java.lang.Class; public constructor(); @@ -208,22 +246,18 @@ declare module com { } } -declare module com { - export module google { - export module firebase { - export module analytics { - export module connector { - export module internal { +declare namespace com { + export namespace google { + export namespace firebase { + export namespace analytics { + export namespace connector { + export namespace internal { export class zza { public static class: java.lang.Class; /** * Constructs a new instance of the com.google.firebase.analytics.connector.internal.zza interface with the provided implementation. An empty constructor exists calling super() when extending the interface class. */ - public constructor(implementation: { - zza(): com.google.firebase.analytics.connector.AnalyticsConnector.AnalyticsConnectorListener; - zzb(param0: java.util.Set): void; - zzc(): void; - }); + public constructor(implementation: { zza(): com.google.firebase.analytics.connector.AnalyticsConnector.AnalyticsConnectorListener; zza(param0: java.util.Set): void; zzb(): void }); public constructor(); } } @@ -233,15 +267,14 @@ declare module com { } } -declare module com { - export module google { - export module firebase { - export module analytics { - export module connector { - export module internal { +declare namespace com { + export namespace google { + export namespace firebase { + export namespace analytics { + export namespace connector { + export namespace internal { export class zzb { public static class: java.lang.Class; - public create(param0: com.google.firebase.components.ComponentContainer): any; } } } @@ -250,14 +283,15 @@ declare module com { } } -declare module com { - export module google { - export module firebase { - export module analytics { - export module connector { - export module internal { +declare namespace com { + export namespace google { + export namespace firebase { + export namespace analytics { + export namespace connector { + export namespace internal { export class zzc { public static class: java.lang.Class; + public create(param0: com.google.firebase.components.ComponentContainer): any; } } } @@ -266,12 +300,12 @@ declare module com { } } -declare module com { - export module google { - export module firebase { - export module analytics { - export module connector { - export module internal { +declare namespace com { + export namespace google { + export namespace firebase { + export namespace analytics { + export namespace connector { + export namespace internal { export class zzd { public static class: java.lang.Class; public constructor(param0: any /* com.google.firebase.analytics.connector.internal.zze*/); @@ -284,12 +318,12 @@ declare module com { } } -declare module com { - export module google { - export module firebase { - export module analytics { - export module connector { - export module internal { +declare namespace com { + export namespace google { + export namespace firebase { + export namespace analytics { + export namespace connector { + export namespace internal { export class zze extends com.google.firebase.analytics.connector.internal.zza { public static class: java.lang.Class; public constructor(param0: com.google.android.gms.measurement.api.AppMeasurementSdk, param1: com.google.firebase.analytics.connector.AnalyticsConnector.AnalyticsConnectorListener); @@ -301,12 +335,12 @@ declare module com { } } -declare module com { - export module google { - export module firebase { - export module analytics { - export module connector { - export module internal { +declare namespace com { + export namespace google { + export namespace firebase { + export namespace analytics { + export namespace connector { + export namespace internal { export class zzf { public static class: java.lang.Class; public constructor(param0: any /* com.google.firebase.analytics.connector.internal.zzg*/); @@ -319,12 +353,12 @@ declare module com { } } -declare module com { - export module google { - export module firebase { - export module analytics { - export module connector { - export module internal { +declare namespace com { + export namespace google { + export namespace firebase { + export namespace analytics { + export namespace connector { + export namespace internal { export class zzg extends com.google.firebase.analytics.connector.internal.zza { public static class: java.lang.Class; public constructor(param0: com.google.android.gms.measurement.api.AppMeasurementSdk, param1: com.google.firebase.analytics.connector.AnalyticsConnector.AnalyticsConnectorListener); @@ -336,11 +370,11 @@ declare module com { } } -declare module com { - export module google { - export module firebase { - export module analytics { - export module connector { +declare namespace com { + export namespace google { + export namespace firebase { + export namespace analytics { + export namespace connector { export class zza { public static class: java.lang.Class; public execute(param0: java.lang.Runnable): void; @@ -351,11 +385,11 @@ declare module com { } } -declare module com { - export module google { - export module firebase { - export module analytics { - export module connector { +declare namespace com { + export namespace google { + export namespace firebase { + export namespace analytics { + export namespace connector { export class zzb { public static class: java.lang.Class; public handle(param0: com.google.firebase.events.Event): void; @@ -366,11 +400,57 @@ declare module com { } } -declare module com { - export module google { - export module firebase { - export module analytics { - export class zza { +declare namespace com { + export namespace google { + export namespace firebase { + export namespace analytics { + export namespace ktx { + export class ConsentBuilder { + public static class: java.lang.Class; + public getAnalyticsStorage(): com.google.firebase.analytics.FirebaseAnalytics.ConsentStatus; + public constructor(); + public getAdStorage(): com.google.firebase.analytics.FirebaseAnalytics.ConsentStatus; + public setAdStorage(param0: com.google.firebase.analytics.FirebaseAnalytics.ConsentStatus): void; + public asMap(): java.util.Map; + public setAnalyticsStorage(param0: com.google.firebase.analytics.FirebaseAnalytics.ConsentStatus): void; + } + } + } + } + } +} + +declare namespace com { + export namespace google { + export namespace firebase { + export namespace analytics { + export namespace ktx { + export class ParametersBuilder { + public static class: java.lang.Class; + /** @deprecated */ + public param(param0: string, param1: globalAndroid.os.Bundle): void; + public constructor(); + /** @deprecated */ + // eslint-disable-next-line @typescript-eslint/adjacent-overload-signatures + public param(param0: string, param1: number): void; + public getBundle(): globalAndroid.os.Bundle; + /** @deprecated */ + // eslint-disable-next-line @typescript-eslint/adjacent-overload-signatures + public param(param0: string, param1: string): void; + /** @deprecated */ + public param(param0: string, param1: androidNative.Array): void; + } + } + } + } + } +} + +declare namespace com { + export namespace google { + export namespace firebase { + export namespace analytics { + export class zza extends java.util.concurrent.Callable { public static class: java.lang.Class; } } @@ -378,22 +458,23 @@ declare module com { } } -declare module com { - export module google { - export module firebase { - export module analytics { - export class zzb extends java.util.concurrent.Callable { +declare namespace com { + export namespace google { + export namespace firebase { + export namespace analytics { + export class zzb { public static class: java.lang.Class; + public execute(param0: java.lang.Runnable): void; } } } } } -declare module com { - export module google { - export module firebase { - export module analytics { +declare namespace com { + export namespace google { + export namespace firebase { + export namespace analytics { export class zzc { public static class: java.lang.Class; } @@ -402,5 +483,16 @@ declare module com { } } -//Generics information: +declare namespace com { + export namespace google { + export namespace firebase { + export namespace analytics { + export class zzd extends java.util.concurrent.Callable { + public static class: java.lang.Class; + } + } + } + } +} +//Generics information: diff --git a/packages/firebase-analytics/typings/objc!FirebaseAnalytics.d.ts b/packages/firebase-analytics/typings/objc!FirebaseAnalytics.d.ts index 22e055b3..6caca78e 100644 --- a/packages/firebase-analytics/typings/objc!FirebaseAnalytics.d.ts +++ b/packages/firebase-analytics/typings/objc!FirebaseAnalytics.d.ts @@ -11,6 +11,8 @@ declare class FIRAnalytics extends NSObject { static initiateOnDeviceConversionMeasurementWithEmailAddress(emailAddress: string): void; + static initiateOnDeviceConversionMeasurementWithPhoneNumber(phoneNumber: string): void; + static logEventWithNameParameters(name: string, parameters: NSDictionary): void; static new(): FIRAnalytics; // inherited from NSObject @@ -36,8 +38,12 @@ declare var FIRConsentStatusDenied: string; declare var FIRConsentStatusGranted: string; +declare var FIRConsentTypeAdPersonalization: string; + declare var FIRConsentTypeAdStorage: string; +declare var FIRConsentTypeAdUserData: string; + declare var FIRConsentTypeAnalyticsStorage: string; declare var FirebaseAnalyticsVersionNumber: number; diff --git a/packages/firebase-app-check-debug/package.json b/packages/firebase-app-check-debug/package.json index 35031ab6..a41d2817 100644 --- a/packages/firebase-app-check-debug/package.json +++ b/packages/firebase-app-check-debug/package.json @@ -1,6 +1,6 @@ { "name": "@nativescript/firebase-app-check-debug", - "version": "3.2.0", + "version": "3.2.1", "description": "NativeScript Firebase - App Check", "main": "index", "typings": "index.d.ts", diff --git a/packages/firebase-app-check-debug/platforms/android/firebase_app_check_debug.aar b/packages/firebase-app-check-debug/platforms/android/firebase_app_check_debug.aar index 5dad4a1f..bc59ca18 100644 Binary files a/packages/firebase-app-check-debug/platforms/android/firebase_app_check_debug.aar and b/packages/firebase-app-check-debug/platforms/android/firebase_app_check_debug.aar differ diff --git a/packages/firebase-app-check-debug/platforms/android/include.gradle b/packages/firebase-app-check-debug/platforms/android/include.gradle index 8d0fa785..2ce6ed1f 100644 --- a/packages/firebase-app-check-debug/platforms/android/include.gradle +++ b/packages/firebase-app-check-debug/platforms/android/include.gradle @@ -1,5 +1,5 @@ dependencies { - def computeFirebaseBomVersion = { -> project.hasProperty("firebaseBomVersion") ? firebaseBomVersion : "32.3.1" } + def computeFirebaseBomVersion = { -> project.hasProperty("firebaseBomVersion") ? firebaseBomVersion : "32.7.2" } implementation platform("com.google.firebase:firebase-bom:${computeFirebaseBomVersion}") implementation 'com.google.firebase:firebase-appcheck-debug' } \ No newline at end of file diff --git a/packages/firebase-app-check-debug/platforms/ios/Podfile b/packages/firebase-app-check-debug/platforms/ios/Podfile index 69555796..242e441b 100644 --- a/packages/firebase-app-check-debug/platforms/ios/Podfile +++ b/packages/firebase-app-check-debug/platforms/ios/Podfile @@ -1,2 +1,2 @@ platform :ios, '12.0' -pod 'Firebase/AppCheck', '~>10.13.0' \ No newline at end of file +pod 'Firebase/AppCheck', '~>10.20.0' \ No newline at end of file diff --git a/packages/firebase-app-check-debug/typings/objc!FirebaseAppCheck.d.ts b/packages/firebase-app-check-debug/typings/objc!FirebaseAppCheck.d.ts index 703d91d5..7129639a 100644 --- a/packages/firebase-app-check-debug/typings/objc!FirebaseAppCheck.d.ts +++ b/packages/firebase-app-check-debug/typings/objc!FirebaseAppCheck.d.ts @@ -1,6 +1,4 @@ - declare class FIRAppAttestProvider extends NSObject implements FIRAppCheckProvider { - static alloc(): FIRAppAttestProvider; // inherited from NSObject static new(): FIRAppAttestProvider; // inherited from NSObject @@ -15,14 +13,16 @@ declare class FIRAppAttestProvider extends NSObject implements FIRAppCheckProvid readonly superclass: typeof NSObject; // inherited from NSObjectProtocol - readonly // inherited from NSObjectProtocol + readonly; // inherited from NSObjectProtocol - constructor(o: { app: FIRApp; }); + constructor(o: { app: FIRApp }); class(): typeof NSObject; conformsToProtocol(aProtocol: any /* Protocol */): boolean; + getLimitedUseTokenWithCompletion(handler: (p1: FIRAppCheckToken, p2: NSError) => void): void; + getTokenWithCompletion(handler: (p1: FIRAppCheckToken, p2: NSError) => void): void; initWithApp(app: FIRApp): this; @@ -46,8 +46,7 @@ declare class FIRAppAttestProvider extends NSObject implements FIRAppCheckProvid self(): this; } -declare class FIRAppCheck extends NSObject { - +declare class FIRAppCheck extends NSObject implements FIRAppCheckProtocol { static alloc(): FIRAppCheck; // inherited from NSObject static appCheck(): FIRAppCheck; @@ -60,13 +59,48 @@ declare class FIRAppCheck extends NSObject { isTokenAutoRefreshEnabled: boolean; + readonly debugDescription: string; // inherited from NSObjectProtocol + + readonly description: string; // inherited from NSObjectProtocol + + readonly hash: number; // inherited from NSObjectProtocol + + readonly isProxy: boolean; // inherited from NSObjectProtocol + + readonly superclass: typeof NSObject; // inherited from NSObjectProtocol + + readonly; // inherited from NSObjectProtocol + + class(): typeof NSObject; + + conformsToProtocol(aProtocol: any /* Protocol */): boolean; + + isEqual(object: any): boolean; + + isKindOfClass(aClass: typeof NSObject): boolean; + + isMemberOfClass(aClass: typeof NSObject): boolean; + + limitedUseTokenWithCompletion(handler: (p1: FIRAppCheckToken, p2: NSError) => void): void; + + performSelector(aSelector: string): any; + + performSelectorWithObject(aSelector: string, object: any): any; + + performSelectorWithObjectWithObject(aSelector: string, object1: any, object2: any): any; + + respondsToSelector(aSelector: string): boolean; + + retainCount(): number; + + self(): this; + tokenForcingRefreshCompletion(forcingRefresh: boolean, handler: (p1: FIRAppCheckToken, p2: NSError) => void): void; } declare var FIRAppCheckAppCheckTokenDidChangeNotification: string; declare class FIRAppCheckDebugProvider extends NSObject implements FIRAppCheckProvider { - static alloc(): FIRAppCheckDebugProvider; // inherited from NSObject static new(): FIRAppCheckDebugProvider; // inherited from NSObject @@ -81,9 +115,9 @@ declare class FIRAppCheckDebugProvider extends NSObject implements FIRAppCheckPr readonly superclass: typeof NSObject; // inherited from NSObjectProtocol - readonly // inherited from NSObjectProtocol + readonly; // inherited from NSObjectProtocol - constructor(o: { app: FIRApp; }); + constructor(o: { app: FIRApp }); class(): typeof NSObject; @@ -91,6 +125,8 @@ declare class FIRAppCheckDebugProvider extends NSObject implements FIRAppCheckPr currentDebugToken(): string; + getLimitedUseTokenWithCompletion(handler: (p1: FIRAppCheckToken, p2: NSError) => void): void; + getTokenWithCompletion(handler: (p1: FIRAppCheckToken, p2: NSError) => void): void; initWithApp(app: FIRApp): this; @@ -117,7 +153,6 @@ declare class FIRAppCheckDebugProvider extends NSObject implements FIRAppCheckPr } declare class FIRAppCheckDebugProviderFactory extends NSObject implements FIRAppCheckProviderFactory { - static alloc(): FIRAppCheckDebugProviderFactory; // inherited from NSObject static new(): FIRAppCheckDebugProviderFactory; // inherited from NSObject @@ -132,7 +167,7 @@ declare class FIRAppCheckDebugProviderFactory extends NSObject implements FIRApp readonly superclass: typeof NSObject; // inherited from NSObjectProtocol - readonly // inherited from NSObjectProtocol + readonly; // inherited from NSObjectProtocol class(): typeof NSObject; @@ -160,7 +195,6 @@ declare class FIRAppCheckDebugProviderFactory extends NSObject implements FIRApp } declare const enum FIRAppCheckErrorCode { - Unknown = 0, ServerUnreachable = 1, @@ -169,31 +203,28 @@ declare const enum FIRAppCheckErrorCode { Keychain = 3, - Unsupported = 4 + Unsupported = 4, } declare var FIRAppCheckErrorDomain: string; interface FIRAppCheckProvider extends NSObjectProtocol { + getLimitedUseTokenWithCompletion?(handler: (p1: FIRAppCheckToken, p2: NSError) => void): void; getTokenWithCompletion(handler: (p1: FIRAppCheckToken, p2: NSError) => void): void; } declare var FIRAppCheckProvider: { - prototype: FIRAppCheckProvider; }; interface FIRAppCheckProviderFactory extends NSObjectProtocol { - createProviderWithApp(app: FIRApp): FIRAppCheckProvider; } declare var FIRAppCheckProviderFactory: { - prototype: FIRAppCheckProviderFactory; }; declare class FIRAppCheckToken extends NSObject { - static alloc(): FIRAppCheckToken; // inherited from NSObject static new(): FIRAppCheckToken; // inherited from NSObject @@ -202,13 +233,12 @@ declare class FIRAppCheckToken extends NSObject { readonly token: string; - constructor(o: { token: string; expirationDate: Date; }); + constructor(o: { token: string; expirationDate: Date }); initWithTokenExpirationDate(token: string, expirationDate: Date): this; } declare class FIRDeviceCheckProvider extends NSObject implements FIRAppCheckProvider { - static alloc(): FIRDeviceCheckProvider; // inherited from NSObject static new(): FIRDeviceCheckProvider; // inherited from NSObject @@ -223,14 +253,16 @@ declare class FIRDeviceCheckProvider extends NSObject implements FIRAppCheckProv readonly superclass: typeof NSObject; // inherited from NSObjectProtocol - readonly // inherited from NSObjectProtocol + readonly; // inherited from NSObjectProtocol - constructor(o: { app: FIRApp; }); + constructor(o: { app: FIRApp }); class(): typeof NSObject; conformsToProtocol(aProtocol: any /* Protocol */): boolean; + getLimitedUseTokenWithCompletion(handler: (p1: FIRAppCheckToken, p2: NSError) => void): void; + getTokenWithCompletion(handler: (p1: FIRAppCheckToken, p2: NSError) => void): void; initWithApp(app: FIRApp): this; @@ -255,7 +287,6 @@ declare class FIRDeviceCheckProvider extends NSObject implements FIRAppCheckProv } declare class FIRDeviceCheckProviderFactory extends NSObject implements FIRAppCheckProviderFactory { - static alloc(): FIRDeviceCheckProviderFactory; // inherited from NSObject static new(): FIRDeviceCheckProviderFactory; // inherited from NSObject @@ -270,7 +301,7 @@ declare class FIRDeviceCheckProviderFactory extends NSObject implements FIRAppCh readonly superclass: typeof NSObject; // inherited from NSObjectProtocol - readonly // inherited from NSObjectProtocol + readonly; // inherited from NSObjectProtocol class(): typeof NSObject; diff --git a/packages/firebase-app-check-debug/typings/objc!FirebaseAppCheckInterop.d.ts b/packages/firebase-app-check-debug/typings/objc!FirebaseAppCheckInterop.d.ts index cd3aa059..a0251338 100644 --- a/packages/firebase-app-check-debug/typings/objc!FirebaseAppCheckInterop.d.ts +++ b/packages/firebase-app-check-debug/typings/objc!FirebaseAppCheckInterop.d.ts @@ -1,4 +1,6 @@ interface FIRAppCheckInterop { + getLimitedUseTokenWithCompletion?(handler: (p1: FIRAppCheckTokenResultInterop) => void): void; + getTokenForcingRefreshCompletion(forcingRefresh: boolean, handler: (p1: FIRAppCheckTokenResultInterop) => void): void; notificationAppNameKey(): string; @@ -11,6 +13,15 @@ declare var FIRAppCheckInterop: { prototype: FIRAppCheckInterop; }; +interface FIRAppCheckProtocol extends NSObjectProtocol { + limitedUseTokenWithCompletion(handler: (p1: FIRAppCheckToken, p2: NSError) => void): void; + + tokenForcingRefreshCompletion(forcingRefresh: boolean, handler: (p1: FIRAppCheckToken, p2: NSError) => void): void; +} +declare var FIRAppCheckProtocol: { + prototype: FIRAppCheckProtocol; +}; + interface FIRAppCheckTokenResultInterop extends NSObjectProtocol { error: NSError; diff --git a/packages/firebase-app-check/package.json b/packages/firebase-app-check/package.json index 1e85f641..87a548c4 100644 --- a/packages/firebase-app-check/package.json +++ b/packages/firebase-app-check/package.json @@ -1,6 +1,6 @@ { "name": "@nativescript/firebase-app-check", - "version": "3.2.0", + "version": "3.2.1", "description": "NativeScript Firebase - App Check", "main": "index", "typings": "index.d.ts", diff --git a/packages/firebase-app-check/platforms/android/firebase_app_check.aar b/packages/firebase-app-check/platforms/android/firebase_app_check.aar index e08c3450..dc462009 100644 Binary files a/packages/firebase-app-check/platforms/android/firebase_app_check.aar and b/packages/firebase-app-check/platforms/android/firebase_app_check.aar differ diff --git a/packages/firebase-app-check/platforms/android/include.gradle b/packages/firebase-app-check/platforms/android/include.gradle index ad5e1d18..1555454b 100644 --- a/packages/firebase-app-check/platforms/android/include.gradle +++ b/packages/firebase-app-check/platforms/android/include.gradle @@ -1,5 +1,5 @@ dependencies { - def computeFirebaseBomVersion = { -> project.hasProperty("firebaseBomVersion") ? firebaseBomVersion : "32.3.1" } + def computeFirebaseBomVersion = { -> project.hasProperty("firebaseBomVersion") ? firebaseBomVersion : "32.7.2" } implementation platform("com.google.firebase:firebase-bom:${computeFirebaseBomVersion}") implementation 'com.google.firebase:firebase-appcheck-playintegrity' } diff --git a/packages/firebase-app-check/platforms/ios/Podfile b/packages/firebase-app-check/platforms/ios/Podfile index 69555796..242e441b 100644 --- a/packages/firebase-app-check/platforms/ios/Podfile +++ b/packages/firebase-app-check/platforms/ios/Podfile @@ -1,2 +1,2 @@ platform :ios, '12.0' -pod 'Firebase/AppCheck', '~>10.13.0' \ No newline at end of file +pod 'Firebase/AppCheck', '~>10.20.0' \ No newline at end of file diff --git a/packages/firebase-app-check/typings/objc!FirebaseAppCheck.d.ts b/packages/firebase-app-check/typings/objc!FirebaseAppCheck.d.ts index 703d91d5..7129639a 100644 --- a/packages/firebase-app-check/typings/objc!FirebaseAppCheck.d.ts +++ b/packages/firebase-app-check/typings/objc!FirebaseAppCheck.d.ts @@ -1,6 +1,4 @@ - declare class FIRAppAttestProvider extends NSObject implements FIRAppCheckProvider { - static alloc(): FIRAppAttestProvider; // inherited from NSObject static new(): FIRAppAttestProvider; // inherited from NSObject @@ -15,14 +13,16 @@ declare class FIRAppAttestProvider extends NSObject implements FIRAppCheckProvid readonly superclass: typeof NSObject; // inherited from NSObjectProtocol - readonly // inherited from NSObjectProtocol + readonly; // inherited from NSObjectProtocol - constructor(o: { app: FIRApp; }); + constructor(o: { app: FIRApp }); class(): typeof NSObject; conformsToProtocol(aProtocol: any /* Protocol */): boolean; + getLimitedUseTokenWithCompletion(handler: (p1: FIRAppCheckToken, p2: NSError) => void): void; + getTokenWithCompletion(handler: (p1: FIRAppCheckToken, p2: NSError) => void): void; initWithApp(app: FIRApp): this; @@ -46,8 +46,7 @@ declare class FIRAppAttestProvider extends NSObject implements FIRAppCheckProvid self(): this; } -declare class FIRAppCheck extends NSObject { - +declare class FIRAppCheck extends NSObject implements FIRAppCheckProtocol { static alloc(): FIRAppCheck; // inherited from NSObject static appCheck(): FIRAppCheck; @@ -60,13 +59,48 @@ declare class FIRAppCheck extends NSObject { isTokenAutoRefreshEnabled: boolean; + readonly debugDescription: string; // inherited from NSObjectProtocol + + readonly description: string; // inherited from NSObjectProtocol + + readonly hash: number; // inherited from NSObjectProtocol + + readonly isProxy: boolean; // inherited from NSObjectProtocol + + readonly superclass: typeof NSObject; // inherited from NSObjectProtocol + + readonly; // inherited from NSObjectProtocol + + class(): typeof NSObject; + + conformsToProtocol(aProtocol: any /* Protocol */): boolean; + + isEqual(object: any): boolean; + + isKindOfClass(aClass: typeof NSObject): boolean; + + isMemberOfClass(aClass: typeof NSObject): boolean; + + limitedUseTokenWithCompletion(handler: (p1: FIRAppCheckToken, p2: NSError) => void): void; + + performSelector(aSelector: string): any; + + performSelectorWithObject(aSelector: string, object: any): any; + + performSelectorWithObjectWithObject(aSelector: string, object1: any, object2: any): any; + + respondsToSelector(aSelector: string): boolean; + + retainCount(): number; + + self(): this; + tokenForcingRefreshCompletion(forcingRefresh: boolean, handler: (p1: FIRAppCheckToken, p2: NSError) => void): void; } declare var FIRAppCheckAppCheckTokenDidChangeNotification: string; declare class FIRAppCheckDebugProvider extends NSObject implements FIRAppCheckProvider { - static alloc(): FIRAppCheckDebugProvider; // inherited from NSObject static new(): FIRAppCheckDebugProvider; // inherited from NSObject @@ -81,9 +115,9 @@ declare class FIRAppCheckDebugProvider extends NSObject implements FIRAppCheckPr readonly superclass: typeof NSObject; // inherited from NSObjectProtocol - readonly // inherited from NSObjectProtocol + readonly; // inherited from NSObjectProtocol - constructor(o: { app: FIRApp; }); + constructor(o: { app: FIRApp }); class(): typeof NSObject; @@ -91,6 +125,8 @@ declare class FIRAppCheckDebugProvider extends NSObject implements FIRAppCheckPr currentDebugToken(): string; + getLimitedUseTokenWithCompletion(handler: (p1: FIRAppCheckToken, p2: NSError) => void): void; + getTokenWithCompletion(handler: (p1: FIRAppCheckToken, p2: NSError) => void): void; initWithApp(app: FIRApp): this; @@ -117,7 +153,6 @@ declare class FIRAppCheckDebugProvider extends NSObject implements FIRAppCheckPr } declare class FIRAppCheckDebugProviderFactory extends NSObject implements FIRAppCheckProviderFactory { - static alloc(): FIRAppCheckDebugProviderFactory; // inherited from NSObject static new(): FIRAppCheckDebugProviderFactory; // inherited from NSObject @@ -132,7 +167,7 @@ declare class FIRAppCheckDebugProviderFactory extends NSObject implements FIRApp readonly superclass: typeof NSObject; // inherited from NSObjectProtocol - readonly // inherited from NSObjectProtocol + readonly; // inherited from NSObjectProtocol class(): typeof NSObject; @@ -160,7 +195,6 @@ declare class FIRAppCheckDebugProviderFactory extends NSObject implements FIRApp } declare const enum FIRAppCheckErrorCode { - Unknown = 0, ServerUnreachable = 1, @@ -169,31 +203,28 @@ declare const enum FIRAppCheckErrorCode { Keychain = 3, - Unsupported = 4 + Unsupported = 4, } declare var FIRAppCheckErrorDomain: string; interface FIRAppCheckProvider extends NSObjectProtocol { + getLimitedUseTokenWithCompletion?(handler: (p1: FIRAppCheckToken, p2: NSError) => void): void; getTokenWithCompletion(handler: (p1: FIRAppCheckToken, p2: NSError) => void): void; } declare var FIRAppCheckProvider: { - prototype: FIRAppCheckProvider; }; interface FIRAppCheckProviderFactory extends NSObjectProtocol { - createProviderWithApp(app: FIRApp): FIRAppCheckProvider; } declare var FIRAppCheckProviderFactory: { - prototype: FIRAppCheckProviderFactory; }; declare class FIRAppCheckToken extends NSObject { - static alloc(): FIRAppCheckToken; // inherited from NSObject static new(): FIRAppCheckToken; // inherited from NSObject @@ -202,13 +233,12 @@ declare class FIRAppCheckToken extends NSObject { readonly token: string; - constructor(o: { token: string; expirationDate: Date; }); + constructor(o: { token: string; expirationDate: Date }); initWithTokenExpirationDate(token: string, expirationDate: Date): this; } declare class FIRDeviceCheckProvider extends NSObject implements FIRAppCheckProvider { - static alloc(): FIRDeviceCheckProvider; // inherited from NSObject static new(): FIRDeviceCheckProvider; // inherited from NSObject @@ -223,14 +253,16 @@ declare class FIRDeviceCheckProvider extends NSObject implements FIRAppCheckProv readonly superclass: typeof NSObject; // inherited from NSObjectProtocol - readonly // inherited from NSObjectProtocol + readonly; // inherited from NSObjectProtocol - constructor(o: { app: FIRApp; }); + constructor(o: { app: FIRApp }); class(): typeof NSObject; conformsToProtocol(aProtocol: any /* Protocol */): boolean; + getLimitedUseTokenWithCompletion(handler: (p1: FIRAppCheckToken, p2: NSError) => void): void; + getTokenWithCompletion(handler: (p1: FIRAppCheckToken, p2: NSError) => void): void; initWithApp(app: FIRApp): this; @@ -255,7 +287,6 @@ declare class FIRDeviceCheckProvider extends NSObject implements FIRAppCheckProv } declare class FIRDeviceCheckProviderFactory extends NSObject implements FIRAppCheckProviderFactory { - static alloc(): FIRDeviceCheckProviderFactory; // inherited from NSObject static new(): FIRDeviceCheckProviderFactory; // inherited from NSObject @@ -270,7 +301,7 @@ declare class FIRDeviceCheckProviderFactory extends NSObject implements FIRAppCh readonly superclass: typeof NSObject; // inherited from NSObjectProtocol - readonly // inherited from NSObjectProtocol + readonly; // inherited from NSObjectProtocol class(): typeof NSObject; diff --git a/packages/firebase-app-check/typings/objc!FirebaseAppCheckInterop.d.ts b/packages/firebase-app-check/typings/objc!FirebaseAppCheckInterop.d.ts index cd3aa059..a0251338 100644 --- a/packages/firebase-app-check/typings/objc!FirebaseAppCheckInterop.d.ts +++ b/packages/firebase-app-check/typings/objc!FirebaseAppCheckInterop.d.ts @@ -1,4 +1,6 @@ interface FIRAppCheckInterop { + getLimitedUseTokenWithCompletion?(handler: (p1: FIRAppCheckTokenResultInterop) => void): void; + getTokenForcingRefreshCompletion(forcingRefresh: boolean, handler: (p1: FIRAppCheckTokenResultInterop) => void): void; notificationAppNameKey(): string; @@ -11,6 +13,15 @@ declare var FIRAppCheckInterop: { prototype: FIRAppCheckInterop; }; +interface FIRAppCheckProtocol extends NSObjectProtocol { + limitedUseTokenWithCompletion(handler: (p1: FIRAppCheckToken, p2: NSError) => void): void; + + tokenForcingRefreshCompletion(forcingRefresh: boolean, handler: (p1: FIRAppCheckToken, p2: NSError) => void): void; +} +declare var FIRAppCheckProtocol: { + prototype: FIRAppCheckProtocol; +}; + interface FIRAppCheckTokenResultInterop extends NSObjectProtocol { error: NSError; diff --git a/packages/firebase-auth/common.d.ts b/packages/firebase-auth/common.d.ts new file mode 100644 index 00000000..3eaaf8f4 --- /dev/null +++ b/packages/firebase-auth/common.d.ts @@ -0,0 +1,9 @@ +export declare enum ActionCodeInfoOperation { + Unknown = 'Unknown', + PasswordReset = 'PasswordReset', + VerifyEmail = 'VerifyEmail', + RecoverEmail = 'RecoverEmail', + EmailLink = 'EmailLink', + VerifyAndChangeEmail = 'VerifyAndChangeEmail', + RevertSecondFactorAddition = 'RevertSecondFactorAddition', +} diff --git a/packages/firebase-auth/index.android.ts b/packages/firebase-auth/index.android.ts index a1399903..ed468f6a 100644 --- a/packages/firebase-auth/index.android.ts +++ b/packages/firebase-auth/index.android.ts @@ -968,7 +968,6 @@ export class Auth implements IAuth { return defaultAuth; } defaultAuth = this; - this._native = com.google.firebase.auth.FirebaseAuth.getInstance(); } } @@ -1413,6 +1412,9 @@ export class Auth implements IAuth { } get native() { + if (!this._native) { + this._native = com.google.firebase.auth.FirebaseAuth.getInstance(); + } return this._native; } diff --git a/packages/firebase-auth/package.json b/packages/firebase-auth/package.json index 4c3c2a0c..6f7d057d 100644 --- a/packages/firebase-auth/package.json +++ b/packages/firebase-auth/package.json @@ -1,6 +1,6 @@ { "name": "@nativescript/firebase-auth", - "version": "3.2.0", + "version": "3.2.1", "description": "NativeScript Firebase - Auth", "main": "index", "typings": "index.d.ts", diff --git a/packages/firebase-auth/platforms/android/firebase_auth.aar b/packages/firebase-auth/platforms/android/firebase_auth.aar index cd9bf048..d9a87721 100644 Binary files a/packages/firebase-auth/platforms/android/firebase_auth.aar and b/packages/firebase-auth/platforms/android/firebase_auth.aar differ diff --git a/packages/firebase-auth/platforms/android/include.gradle b/packages/firebase-auth/platforms/android/include.gradle index a64b6d91..e3735e35 100644 --- a/packages/firebase-auth/platforms/android/include.gradle +++ b/packages/firebase-auth/platforms/android/include.gradle @@ -1,5 +1,5 @@ dependencies { - def computeFirebaseBomVersion = { -> project.hasProperty("firebaseBomVersion") ? firebaseBomVersion : "32.3.1" } + def computeFirebaseBomVersion = { -> project.hasProperty("firebaseBomVersion") ? firebaseBomVersion : "32.7.2" } implementation platform("com.google.firebase:firebase-bom:${computeFirebaseBomVersion}") implementation 'com.google.firebase:firebase-auth' } \ No newline at end of file diff --git a/packages/firebase-auth/platforms/ios/Podfile b/packages/firebase-auth/platforms/ios/Podfile index 99bc83ff..ed418216 100644 --- a/packages/firebase-auth/platforms/ios/Podfile +++ b/packages/firebase-auth/platforms/ios/Podfile @@ -1,2 +1,2 @@ platform :ios, '12.0' -pod 'Firebase/Auth', '~>10.13.0' \ No newline at end of file +pod 'Firebase/Auth', '~>10.20.0' \ No newline at end of file diff --git a/packages/firebase-auth/typings/objc!FirebaseAuth.d.ts b/packages/firebase-auth/typings/objc!FirebaseAuth.d.ts index b393708c..7702cf1e 100644 --- a/packages/firebase-auth/typings/objc!FirebaseAuth.d.ts +++ b/packages/firebase-auth/typings/objc!FirebaseAuth.d.ts @@ -97,6 +97,8 @@ declare class FIRAuth extends NSObject { readonly currentUser: FIRUser; + customAuthDomain: string; + languageCode: string; settings: FIRAuthSettings; @@ -127,12 +129,16 @@ declare class FIRAuth extends NSObject { getStoredUserForAccessGroupError(accessGroup: string): FIRUser; + initializeRecaptchaConfigWithCompletion(completion: (p1: NSError) => void): void; + isSignInWithEmailLink(link: string): boolean; removeAuthStateDidChangeListener(listenerHandle: NSObjectProtocol): void; removeIDTokenDidChangeListener(listenerHandle: NSObjectProtocol): void; + revokeTokenWithAuthorizationCodeCompletion(authorizationCode: string, completion: (p1: NSError) => void): void; + sendPasswordResetWithEmailActionCodeSettingsCompletion(email: string, actionCodeSettings: FIRActionCodeSettings, completion: (p1: NSError) => void): void; sendPasswordResetWithEmailCompletion(email: string, completion: (p1: NSError) => void): void; @@ -343,11 +349,29 @@ declare const enum FIRAuthErrorCode { EmailChangeNeedsVerification = 17090, + MissingClientIdentifier = 17093, + MissingOrInvalidNonce = 17094, BlockingCloudFunctionError = 17105, - MissingClientIdentifier = 17993, + RecaptchaNotEnabled = 17200, + + MissingRecaptchaToken = 17201, + + InvalidRecaptchaToken = 17202, + + InvalidRecaptchaAction = 17203, + + MissingClientType = 17204, + + MissingRecaptchaVersion = 17205, + + InvalidRecaptchaVersion = 17206, + + InvalidReqType = 17207, + + RecaptchaSDKNotLinked = 17208, KeychainError = 17995, @@ -680,6 +704,38 @@ declare class FIRPhoneMultiFactorInfo extends FIRMultiFactorInfo { readonly phoneNumber: string; } +declare class FIRTOTPMultiFactorAssertion extends FIRMultiFactorAssertion { + static alloc(): FIRTOTPMultiFactorAssertion; // inherited from NSObject + + static new(): FIRTOTPMultiFactorAssertion; // inherited from NSObject +} + +declare class FIRTOTPMultiFactorGenerator extends NSObject { + static alloc(): FIRTOTPMultiFactorGenerator; // inherited from NSObject + + static assertionForEnrollmentWithSecretOneTimePassword(secret: FIRTOTPSecret, oneTimePassword: string): FIRTOTPMultiFactorAssertion; + + static assertionForSignInWithEnrollmentIDOneTimePassword(enrollmentID: string, oneTimePassword: string): FIRTOTPMultiFactorAssertion; + + static generateSecretWithMultiFactorSessionCompletion(session: FIRMultiFactorSession, completion: (p1: FIRTOTPSecret, p2: NSError) => void): void; + + static new(): FIRTOTPMultiFactorGenerator; // inherited from NSObject +} + +declare var FIRTOTPMultiFactorID: string; + +declare class FIRTOTPSecret extends NSObject { + static alloc(): FIRTOTPSecret; // inherited from NSObject + + static new(): FIRTOTPSecret; // inherited from NSObject + + generateQRCodeURLWithAccountNameIssuer(accountName: string, issuer: string): string; + + openInOTPAppWithQRCodeURL(QRCodeURL: string): void; + + sharedSecretKey(): string; +} + declare class FIRTwitterAuthProvider extends NSObject { static alloc(): FIRTwitterAuthProvider; // inherited from NSObject diff --git a/packages/firebase-core/index.android.ts b/packages/firebase-core/index.android.ts index 596d0d42..865603a1 100644 --- a/packages/firebase-core/index.android.ts +++ b/packages/firebase-core/index.android.ts @@ -313,7 +313,7 @@ export class Firebase { app = com.google.firebase.FirebaseApp.initializeApp(Utils.android.getApplicationContext(), nativeOptions.build(), name); } else { if (defaultApp) { - defaultApp; + return defaultApp; } isDefault = true; if (nativeOptions) { @@ -323,10 +323,11 @@ export class Firebase { } } + console.log(app); + if (app && typeof configOrName === 'object' && typeof configOrName.automaticResourceManagement === 'boolean') { app.setAutomaticResourceManagementEnabled(configOrName.automaticDataCollectionEnabled); } - const fbApp = FirebaseApp.fromNative(app); if (isDefault) { diff --git a/packages/firebase-core/package.json b/packages/firebase-core/package.json index 67173590..43a4abca 100644 --- a/packages/firebase-core/package.json +++ b/packages/firebase-core/package.json @@ -1,6 +1,6 @@ { "name": "@nativescript/firebase-core", - "version": "3.2.0", + "version": "3.2.1", "description": "NativeScript Firebase - Core", "main": "index", "typings": "index.d.ts", diff --git a/packages/firebase-core/platforms/android/buildscript.gradle b/packages/firebase-core/platforms/android/buildscript.gradle index c4bb0d28..80d0122b 100644 --- a/packages/firebase-core/platforms/android/buildscript.gradle +++ b/packages/firebase-core/platforms/android/buildscript.gradle @@ -4,5 +4,5 @@ repositories { } dependencies { - classpath 'com.google.gms:google-services:4.3.15' + classpath 'com.google.gms:google-services:4.4.1' } \ No newline at end of file diff --git a/packages/firebase-core/platforms/android/include.gradle b/packages/firebase-core/platforms/android/include.gradle index 8f6a9ee7..e193ac45 100644 --- a/packages/firebase-core/platforms/android/include.gradle +++ b/packages/firebase-core/platforms/android/include.gradle @@ -1,7 +1,7 @@ -if (!project.hasProperty("tempBuild")) { - apply plugin: 'com.google.gms.google-services' -} +// if (!project.hasProperty("tempBuild")) { +// apply plugin: 'com.google.gms.google-services' +// } dependencies { - def computeFirebaseBomVersion = { -> project.hasProperty("firebaseBomVersion") ? firebaseBomVersion : "32.3.1" } + def computeFirebaseBomVersion = { -> project.hasProperty("firebaseBomVersion") ? firebaseBomVersion : "32.7.2" } implementation platform("com.google.firebase:firebase-bom:${computeFirebaseBomVersion}") } diff --git a/packages/firebase-core/typings/objc!FirebaseCoreExtension.d.ts b/packages/firebase-core/typings/objc!FirebaseCoreExtension.d.ts index 3b8b41a6..a065bfd4 100644 --- a/packages/firebase-core/typings/objc!FirebaseCoreExtension.d.ts +++ b/packages/firebase-core/typings/objc!FirebaseCoreExtension.d.ts @@ -75,6 +75,8 @@ declare class FIRDependency extends NSObject { readonly protocol: any /* Protocol */; } +declare function FIRGetLoggerLevel(): FIRLoggerLevel; + declare function FIRHeaderValueFromHeartbeatsPayload(heartbeatsPayload: FIRHeartbeatsPayload): string; declare class FIRHeartbeatLogger extends NSObject implements FIRHeartbeatLoggerProtocol { diff --git a/packages/firebase-core/typings/objc!FirebaseCoreInternal.d.ts b/packages/firebase-core/typings/objc!FirebaseCoreInternal.d.ts index eaadd7b1..054e55d3 100644 --- a/packages/firebase-core/typings/objc!FirebaseCoreInternal.d.ts +++ b/packages/firebase-core/typings/objc!FirebaseCoreInternal.d.ts @@ -14,6 +14,22 @@ declare class FIRHeartbeatController extends NSObject { log(agent: string): void; } +declare class FIRHeartbeatLoggingTestUtils extends NSObject { + static alloc(): FIRHeartbeatLoggingTestUtils; // inherited from NSObject + + static assertEncodedPayloadStringIsEqualToLiteralStringWithError(encoded: string, literal: string): boolean; + + static new(): FIRHeartbeatLoggingTestUtils; // inherited from NSObject + + static removeUnderlyingHeartbeatStorageContainersAndReturnError(): boolean; + + static readonly dateFormatter: NSDateFormatter; + + static readonly emptyHeartbeatsPayload: FIRHeartbeatsPayload; + + static readonly nonEmptyHeartbeatsPayload: FIRHeartbeatsPayload; +} + declare class FIRHeartbeatsPayload extends NSObject { static alloc(): FIRHeartbeatsPayload; // inherited from NSObject diff --git a/packages/firebase-crashlytics/package.json b/packages/firebase-crashlytics/package.json index f9f23be2..6cc4a1b7 100644 --- a/packages/firebase-crashlytics/package.json +++ b/packages/firebase-crashlytics/package.json @@ -1,6 +1,6 @@ { "name": "@nativescript/firebase-crashlytics", - "version": "3.2.0", + "version": "3.2.1", "description": "NativeScript Firebase - Crashlytics", "main": "index", "typings": "index.d.ts", diff --git a/packages/firebase-crashlytics/platforms/android/firebase_crashlytics.aar b/packages/firebase-crashlytics/platforms/android/firebase_crashlytics.aar index 7d99dd2c..c2e684b1 100644 Binary files a/packages/firebase-crashlytics/platforms/android/firebase_crashlytics.aar and b/packages/firebase-crashlytics/platforms/android/firebase_crashlytics.aar differ diff --git a/packages/firebase-crashlytics/platforms/android/include.gradle b/packages/firebase-crashlytics/platforms/android/include.gradle index ada511b9..43e67a3d 100644 --- a/packages/firebase-crashlytics/platforms/android/include.gradle +++ b/packages/firebase-crashlytics/platforms/android/include.gradle @@ -1,5 +1,5 @@ dependencies { - def computeFirebaseBomVersion = { -> project.hasProperty("firebaseBomVersion") ? firebaseBomVersion : "32.3.1" } + def computeFirebaseBomVersion = { -> project.hasProperty("firebaseBomVersion") ? firebaseBomVersion : "32.7.2" } implementation platform("com.google.firebase:firebase-bom:${computeFirebaseBomVersion}") implementation 'com.google.firebase:firebase-crashlytics' implementation 'com.google.firebase:firebase-analytics' diff --git a/packages/firebase-crashlytics/platforms/ios/Podfile b/packages/firebase-crashlytics/platforms/ios/Podfile index 2618d6f0..7890304b 100644 --- a/packages/firebase-crashlytics/platforms/ios/Podfile +++ b/packages/firebase-crashlytics/platforms/ios/Podfile @@ -1,2 +1,2 @@ platform :ios, '12.0' -pod 'Firebase/Crashlytics', '~>10.13.0' \ No newline at end of file +pod 'Firebase/Crashlytics', '~>10.20.0' \ No newline at end of file diff --git a/packages/firebase-database/package.json b/packages/firebase-database/package.json index 601bbff4..21e4dddf 100644 --- a/packages/firebase-database/package.json +++ b/packages/firebase-database/package.json @@ -1,6 +1,6 @@ { "name": "@nativescript/firebase-database", - "version": "3.2.0", + "version": "3.2.1", "description": "NativeScript Firebase - Database", "main": "index", "typings": "index.d.ts", diff --git a/packages/firebase-database/platforms/android/firebase_database.aar b/packages/firebase-database/platforms/android/firebase_database.aar index 165438ec..48679736 100644 Binary files a/packages/firebase-database/platforms/android/firebase_database.aar and b/packages/firebase-database/platforms/android/firebase_database.aar differ diff --git a/packages/firebase-database/platforms/android/include.gradle b/packages/firebase-database/platforms/android/include.gradle index 8bf0dba0..6b117752 100644 --- a/packages/firebase-database/platforms/android/include.gradle +++ b/packages/firebase-database/platforms/android/include.gradle @@ -1,5 +1,5 @@ dependencies { - def computeFirebaseBomVersion = { -> project.hasProperty("firebaseBomVersion") ? firebaseBomVersion : "32.3.1" } + def computeFirebaseBomVersion = { -> project.hasProperty("firebaseBomVersion") ? firebaseBomVersion : "32.7.2" } implementation platform("com.google.firebase:firebase-bom:${computeFirebaseBomVersion}") implementation 'com.google.firebase:firebase-database' } \ No newline at end of file diff --git a/packages/firebase-database/platforms/ios/Podfile b/packages/firebase-database/platforms/ios/Podfile index 43287cfe..ed42faba 100644 --- a/packages/firebase-database/platforms/ios/Podfile +++ b/packages/firebase-database/platforms/ios/Podfile @@ -1,2 +1,2 @@ platform :ios, '12.0' -pod 'Firebase/Database', '~>10.13.0' \ No newline at end of file +pod 'Firebase/Database', '~>10.20.0' \ No newline at end of file diff --git a/packages/firebase-database/typings/objc!FirebaseDatabase.d.ts b/packages/firebase-database/typings/objc!FirebaseDatabase.d.ts index c7b381de..c45ee9a6 100644 --- a/packages/firebase-database/typings/objc!FirebaseDatabase.d.ts +++ b/packages/firebase-database/typings/objc!FirebaseDatabase.d.ts @@ -57,8 +57,6 @@ declare class FIRDatabase extends NSObject { readonly app: FIRApp; - callbackQueue: NSObject; - persistenceCacheSizeBytes: number; persistenceEnabled: boolean; @@ -78,15 +76,39 @@ declare class FIRDatabase extends NSObject { useEmulatorWithHostPort(host: string, port: number): void; } -declare class FIRDatabaseQuery extends NSObject { +declare class FIRDatabaseQuery extends NSObject implements FUIDataObservable { static alloc(): FIRDatabaseQuery; // inherited from NSObject static new(): FIRDatabaseQuery; // inherited from NSObject readonly ref: FIRDatabaseReference; + readonly debugDescription: string; // inherited from NSObjectProtocol + + readonly description: string; // inherited from NSObjectProtocol + + readonly hash: number; // inherited from NSObjectProtocol + + readonly isProxy: boolean; // inherited from NSObjectProtocol + + readonly superclass: typeof NSObject; // inherited from NSObjectProtocol + + readonly; // inherited from NSObjectProtocol + + child(path: string): FUIDataObservable; + + class(): typeof NSObject; + + conformsToProtocol(aProtocol: any /* Protocol */): boolean; + getDataWithCompletionBlock(block: (p1: NSError, p2: FIRDataSnapshot) => void): void; + isEqual(object: any): boolean; + + isKindOfClass(aClass: typeof NSObject): boolean; + + isMemberOfClass(aClass: typeof NSObject): boolean; + keepSynced(keepSynced: boolean): void; observeEventTypeAndPreviousSiblingKeyWithBlock(eventType: FIRDataEventType, block: (p1: FIRDataSnapshot, p2: string) => void): number; @@ -105,6 +127,12 @@ declare class FIRDatabaseQuery extends NSObject { observeSingleEventOfTypeWithBlockWithCancelBlock(eventType: FIRDataEventType, block: (p1: FIRDataSnapshot) => void, cancelBlock: (p1: NSError) => void): void; + performSelector(aSelector: string): any; + + performSelectorWithObject(aSelector: string, object: any): any; + + performSelectorWithObjectWithObject(aSelector: string, object1: any, object2: any): any; + queryEndingAtValue(endValue: any): FIRDatabaseQuery; queryEndingAtValueChildKey(endValue: any, childKey: string): FIRDatabaseQuery; @@ -140,6 +168,12 @@ declare class FIRDatabaseQuery extends NSObject { removeAllObservers(): void; removeObserverWithHandle(handle: number): void; + + respondsToSelector(aSelector: string): boolean; + + retainCount(): number; + + self(): this; } declare class FIRDatabaseReference extends FIRDatabaseQuery { diff --git a/packages/firebase-dynamic-links/package.json b/packages/firebase-dynamic-links/package.json index 6cda0352..27305fca 100644 --- a/packages/firebase-dynamic-links/package.json +++ b/packages/firebase-dynamic-links/package.json @@ -1,6 +1,6 @@ { "name": "@nativescript/firebase-dynamic-links", - "version": "3.2.0", + "version": "3.2.1", "description": "NativeScript Firebase - Dynamic Links", "main": "index", "typings": "index.d.ts", diff --git a/packages/firebase-dynamic-links/platforms/android/firebase_dynamic_links.aar b/packages/firebase-dynamic-links/platforms/android/firebase_dynamic_links.aar index d958418f..bf040649 100644 Binary files a/packages/firebase-dynamic-links/platforms/android/firebase_dynamic_links.aar and b/packages/firebase-dynamic-links/platforms/android/firebase_dynamic_links.aar differ diff --git a/packages/firebase-dynamic-links/platforms/android/include.gradle b/packages/firebase-dynamic-links/platforms/android/include.gradle index 97e99551..9a648c3e 100644 --- a/packages/firebase-dynamic-links/platforms/android/include.gradle +++ b/packages/firebase-dynamic-links/platforms/android/include.gradle @@ -1,5 +1,5 @@ dependencies { - def computeFirebaseBomVersion = { -> project.hasProperty("firebaseBomVersion") ? firebaseBomVersion : "32.3.1" } + def computeFirebaseBomVersion = { -> project.hasProperty("firebaseBomVersion") ? firebaseBomVersion : "32.7.2" } implementation platform("com.google.firebase:firebase-bom:${computeFirebaseBomVersion}") implementation 'com.google.firebase:firebase-dynamic-links' implementation 'com.google.firebase:firebase-analytics' diff --git a/packages/firebase-dynamic-links/platforms/ios/Podfile b/packages/firebase-dynamic-links/platforms/ios/Podfile index 6052d1fd..6e0d046a 100644 --- a/packages/firebase-dynamic-links/platforms/ios/Podfile +++ b/packages/firebase-dynamic-links/platforms/ios/Podfile @@ -1,3 +1,3 @@ platform :ios, '12.0' -pod 'Firebase/DynamicLinks', '~>10.13.0' +pod 'Firebase/DynamicLinks', '~>10.20.0' pod 'GoogleUtilities', '~> 7.7' \ No newline at end of file diff --git a/packages/firebase-firestore/package.json b/packages/firebase-firestore/package.json index 40058602..6d5fcd54 100644 --- a/packages/firebase-firestore/package.json +++ b/packages/firebase-firestore/package.json @@ -1,6 +1,6 @@ { "name": "@nativescript/firebase-firestore", - "version": "3.2.0", + "version": "3.2.1", "description": "NativeScript Firebase - Firestore", "main": "index", "typings": "index.d.ts", diff --git a/packages/firebase-firestore/platforms/android/firebase_firestore.aar b/packages/firebase-firestore/platforms/android/firebase_firestore.aar index f9db1303..dd593710 100644 Binary files a/packages/firebase-firestore/platforms/android/firebase_firestore.aar and b/packages/firebase-firestore/platforms/android/firebase_firestore.aar differ diff --git a/packages/firebase-firestore/platforms/android/include.gradle b/packages/firebase-firestore/platforms/android/include.gradle index a211ae14..eae54660 100644 --- a/packages/firebase-firestore/platforms/android/include.gradle +++ b/packages/firebase-firestore/platforms/android/include.gradle @@ -1,5 +1,5 @@ dependencies { - def computeFirebaseBomVersion = { -> project.hasProperty("firebaseBomVersion") ? firebaseBomVersion : "32.3.1" } + def computeFirebaseBomVersion = { -> project.hasProperty("firebaseBomVersion") ? firebaseBomVersion : "32.7.2" } implementation platform("com.google.firebase:firebase-bom:${computeFirebaseBomVersion}") implementation 'com.google.firebase:firebase-firestore' } \ No newline at end of file diff --git a/packages/firebase-firestore/platforms/ios/Podfile b/packages/firebase-firestore/platforms/ios/Podfile index b23ef227..e4c8507e 100644 --- a/packages/firebase-firestore/platforms/ios/Podfile +++ b/packages/firebase-firestore/platforms/ios/Podfile @@ -1,2 +1,2 @@ platform :ios, '12.0' -pod 'Firebase/Firestore', '~>10.13.0' \ No newline at end of file +pod 'Firebase/Firestore', '~>10.20.0' \ No newline at end of file diff --git a/packages/firebase-firestore/typings/objc!FirebaseFirestore.d.ts b/packages/firebase-firestore/typings/objc!FirebaseFirestore.d.ts index 0427f869..68db4bba 100644 --- a/packages/firebase-firestore/typings/objc!FirebaseFirestore.d.ts +++ b/packages/firebase-firestore/typings/objc!FirebaseFirestore.d.ts @@ -1,608 +1,3 @@ -declare class FIRAggregateQuery extends NSObject { - static alloc(): FIRAggregateQuery; // inherited from NSObject - - static new(): FIRAggregateQuery; // inherited from NSObject - - readonly query: FIRQuery; - - aggregationWithSourceCompletion(source: FIRAggregateSource, completion: (p1: FIRAggregateQuerySnapshot, p2: NSError) => void): void; -} - -declare class FIRAggregateQuerySnapshot extends NSObject { - static alloc(): FIRAggregateQuerySnapshot; // inherited from NSObject - - static new(): FIRAggregateQuerySnapshot; // inherited from NSObject - - readonly count: number; - - readonly query: FIRAggregateQuery; -} - -declare const enum FIRAggregateSource { - Server = 0, -} - -declare class FIRCollectionReference extends FIRQuery { - static alloc(): FIRCollectionReference; // inherited from NSObject - - static new(): FIRCollectionReference; // inherited from NSObject - - readonly collectionID: string; - - readonly parent: FIRDocumentReference; - - readonly path: string; - - addDocumentWithData(data: NSDictionary): FIRDocumentReference; - - addDocumentWithDataCompletion(data: NSDictionary, completion: (p1: NSError) => void): FIRDocumentReference; - - documentWithAutoID(): FIRDocumentReference; - - documentWithPath(documentPath: string): FIRDocumentReference; -} - -declare class FIRDocumentChange extends NSObject { - static alloc(): FIRDocumentChange; // inherited from NSObject - - static new(): FIRDocumentChange; // inherited from NSObject - - readonly document: FIRQueryDocumentSnapshot; - - readonly newIndex: number; - - readonly oldIndex: number; - - readonly type: FIRDocumentChangeType; -} - -declare const enum FIRDocumentChangeType { - Added = 0, - - Modified = 1, - - Removed = 2, -} - -declare class FIRDocumentReference extends NSObject { - static alloc(): FIRDocumentReference; // inherited from NSObject - - static new(): FIRDocumentReference; // inherited from NSObject - - readonly documentID: string; - - readonly firestore: FIRFirestore; - - readonly parent: FIRCollectionReference; - - readonly path: string; - - addSnapshotListener(listener: (p1: FIRDocumentSnapshot, p2: NSError) => void): FIRListenerRegistration; - - addSnapshotListenerWithIncludeMetadataChangesListener(includeMetadataChanges: boolean, listener: (p1: FIRDocumentSnapshot, p2: NSError) => void): FIRListenerRegistration; - - collectionWithPath(collectionPath: string): FIRCollectionReference; - - deleteDocument(): void; - - deleteDocumentWithCompletion(completion: (p1: NSError) => void): void; - - getDocumentWithCompletion(completion: (p1: FIRDocumentSnapshot, p2: NSError) => void): void; - - getDocumentWithSourceCompletion(source: FIRFirestoreSource, completion: (p1: FIRDocumentSnapshot, p2: NSError) => void): void; - - setData(documentData: NSDictionary): void; - - setDataCompletion(documentData: NSDictionary, completion: (p1: NSError) => void): void; - - setDataMerge(documentData: NSDictionary, merge: boolean): void; - - setDataMergeCompletion(documentData: NSDictionary, merge: boolean, completion: (p1: NSError) => void): void; - - setDataMergeFields(documentData: NSDictionary, mergeFields: NSArray | any[]): void; - - setDataMergeFieldsCompletion(documentData: NSDictionary, mergeFields: NSArray | any[], completion: (p1: NSError) => void): void; - - updateData(fields: NSDictionary): void; - - updateDataCompletion(fields: NSDictionary, completion: (p1: NSError) => void): void; -} - -declare class FIRDocumentSnapshot extends NSObject { - static alloc(): FIRDocumentSnapshot; // inherited from NSObject - - static new(): FIRDocumentSnapshot; // inherited from NSObject - - readonly documentID: string; - - readonly exists: boolean; - - readonly metadata: FIRSnapshotMetadata; - - readonly reference: FIRDocumentReference; - - data(): NSDictionary; - - dataWithServerTimestampBehavior(serverTimestampBehavior: FIRServerTimestampBehavior): NSDictionary; - - objectForKeyedSubscript(key: any): any; - - valueForField(field: any): any; - - valueForFieldServerTimestampBehavior(field: any, serverTimestampBehavior: FIRServerTimestampBehavior): any; -} - -declare class FIRFieldPath extends NSObject implements NSCopying { - static alloc(): FIRFieldPath; // inherited from NSObject - - static documentID(): FIRFieldPath; - - static new(): FIRFieldPath; // inherited from NSObject - - constructor(o: { fields: NSArray | string[] }); - - copyWithZone(zone: interop.Pointer | interop.Reference): any; - - initWithFields(fieldNames: NSArray | string[]): this; -} - -declare class FIRFieldValue extends NSObject { - static alloc(): FIRFieldValue; // inherited from NSObject - - static fieldValueForArrayRemove(elements: NSArray | any[]): FIRFieldValue; - - static fieldValueForArrayUnion(elements: NSArray | any[]): FIRFieldValue; - - static fieldValueForDelete(): FIRFieldValue; - - static fieldValueForDoubleIncrement(d: number): FIRFieldValue; - - static fieldValueForIntegerIncrement(l: number): FIRFieldValue; - - static fieldValueForServerTimestamp(): FIRFieldValue; - - static new(): FIRFieldValue; // inherited from NSObject -} - -declare class FIRFilter extends NSObject { - static alloc(): FIRFilter; // inherited from NSObject - - static andFilterWithFilters(filters: NSArray | FIRFilter[]): FIRFilter; - - static filterWhereFieldArrayContains(field: string, value: any): FIRFilter; - - static filterWhereFieldArrayContainsAny(field: string, values: NSArray | any[]): FIRFilter; - - static filterWhereFieldIn(field: string, values: NSArray | any[]): FIRFilter; - - static filterWhereFieldIsEqualTo(field: string, value: any): FIRFilter; - - static filterWhereFieldIsGreaterThan(field: string, value: any): FIRFilter; - - static filterWhereFieldIsGreaterThanOrEqualTo(field: string, value: any): FIRFilter; - - static filterWhereFieldIsLessThan(field: string, value: any): FIRFilter; - - static filterWhereFieldIsLessThanOrEqualTo(field: string, value: any): FIRFilter; - - static filterWhereFieldIsNotEqualTo(field: string, value: any): FIRFilter; - - static filterWhereFieldNotIn(field: string, values: NSArray | any[]): FIRFilter; - - static filterWhereFieldPathArrayContains(path: FIRFieldPath, value: any): FIRFilter; - - static filterWhereFieldPathArrayContainsAny(path: FIRFieldPath, values: NSArray | any[]): FIRFilter; - - static filterWhereFieldPathIn(path: FIRFieldPath, values: NSArray | any[]): FIRFilter; - - static filterWhereFieldPathIsEqualTo(path: FIRFieldPath, value: any): FIRFilter; - - static filterWhereFieldPathIsGreaterThan(path: FIRFieldPath, value: any): FIRFilter; - - static filterWhereFieldPathIsGreaterThanOrEqualTo(path: FIRFieldPath, value: any): FIRFilter; - - static filterWhereFieldPathIsLessThan(path: FIRFieldPath, value: any): FIRFilter; - - static filterWhereFieldPathIsLessThanOrEqualTo(path: FIRFieldPath, value: any): FIRFilter; - - static filterWhereFieldPathIsNotEqualTo(path: FIRFieldPath, value: any): FIRFilter; - - static filterWhereFieldPathNotIn(path: FIRFieldPath, values: NSArray | any[]): FIRFilter; - - static new(): FIRFilter; // inherited from NSObject - - static orFilterWithFilters(filters: NSArray | FIRFilter[]): FIRFilter; -} - -declare class FIRFirestore extends NSObject { - static alloc(): FIRFirestore; // inherited from NSObject - - static enableLogging(logging: boolean): void; - - static firestore(): FIRFirestore; - - static firestoreForApp(app: FIRApp): FIRFirestore; - - static new(): FIRFirestore; // inherited from NSObject - - readonly app: FIRApp; - - settings: FIRFirestoreSettings; - - addSnapshotsInSyncListener(listener: () => void): FIRListenerRegistration; - - batch(): FIRWriteBatch; - - clearPersistenceWithCompletion(completion: (p1: NSError) => void): void; - - collectionGroupWithID(collectionID: string): FIRQuery; - - collectionWithPath(collectionPath: string): FIRCollectionReference; - - disableNetworkWithCompletion(completion: (p1: NSError) => void): void; - - documentWithPath(documentPath: string): FIRDocumentReference; - - enableNetworkWithCompletion(completion: (p1: NSError) => void): void; - - getQueryNamedCompletion(name: string, completion: (p1: FIRQuery) => void): void; - - loadBundle(bundleData: NSData): FIRLoadBundleTask; - - loadBundleCompletion(bundleData: NSData, completion: (p1: FIRLoadBundleTaskProgress, p2: NSError) => void): FIRLoadBundleTask; - - loadBundleStream(bundleStream: NSInputStream): FIRLoadBundleTask; - - loadBundleStreamCompletion(bundleStream: NSInputStream, completion: (p1: FIRLoadBundleTaskProgress, p2: NSError) => void): FIRLoadBundleTask; - - runTransactionWithBlockCompletion(updateBlock: (p1: FIRTransaction, p2: interop.Pointer | interop.Reference) => any, completion: (p1: any, p2: NSError) => void): void; - - runTransactionWithOptionsBlockCompletion(options: FIRTransactionOptions, updateBlock: (p1: FIRTransaction, p2: interop.Pointer | interop.Reference) => any, completion: (p1: any, p2: NSError) => void): void; - - setIndexConfigurationFromJSONCompletion(json: string, completion: (p1: NSError) => void): void; - - setIndexConfigurationFromStreamCompletion(stream: NSInputStream, completion: (p1: NSError) => void): void; - - terminateWithCompletion(completion: (p1: NSError) => void): void; - - useEmulatorWithHostPort(host: string, port: number): void; - - waitForPendingWritesWithCompletion(completion: (p1: NSError) => void): void; -} - -declare const enum FIRFirestoreErrorCode { - OK = 0, - - Cancelled = 1, - - Unknown = 2, - - InvalidArgument = 3, - - DeadlineExceeded = 4, - - NotFound = 5, - - AlreadyExists = 6, - - PermissionDenied = 7, - - ResourceExhausted = 8, - - FailedPrecondition = 9, - - Aborted = 10, - - OutOfRange = 11, - - Unimplemented = 12, - - Internal = 13, - - Unavailable = 14, - - DataLoss = 15, - - Unauthenticated = 16, -} - -declare var FIRFirestoreErrorDomain: string; - -declare class FIRFirestoreSettings extends NSObject implements NSCopying { - static alloc(): FIRFirestoreSettings; // inherited from NSObject - - static new(): FIRFirestoreSettings; // inherited from NSObject - - cacheSizeBytes: number; - - dispatchQueue: NSObject; - - host: string; - - persistenceEnabled: boolean; - - sslEnabled: boolean; - - copyWithZone(zone: interop.Pointer | interop.Reference): any; -} - -declare const enum FIRFirestoreSource { - Default = 0, - - Server = 1, - - Cache = 2, -} - -declare class FIRGeoPoint extends NSObject implements NSCopying { - static alloc(): FIRGeoPoint; // inherited from NSObject - - static new(): FIRGeoPoint; // inherited from NSObject - - readonly latitude: number; - - readonly longitude: number; - - constructor(o: { latitude: number; longitude: number }); - - copyWithZone(zone: interop.Pointer | interop.Reference): any; - - initWithLatitudeLongitude(latitude: number, longitude: number): this; -} - -interface FIRListenerRegistration extends NSObjectProtocol { - remove(): void; -} -declare var FIRListenerRegistration: { - prototype: FIRListenerRegistration; -}; - -declare class FIRLoadBundleTask extends NSObject { - static alloc(): FIRLoadBundleTask; // inherited from NSObject - - static new(): FIRLoadBundleTask; // inherited from NSObject - - addObserver(observer: (p1: FIRLoadBundleTaskProgress) => void): number; - - removeAllObservers(): void; - - removeObserverWithHandle(handle: number): void; -} - -declare class FIRLoadBundleTaskProgress extends NSObject { - static alloc(): FIRLoadBundleTaskProgress; // inherited from NSObject - - static new(): FIRLoadBundleTaskProgress; // inherited from NSObject - - readonly bytesLoaded: number; - - readonly documentsLoaded: number; - - readonly state: FIRLoadBundleTaskState; - - readonly totalBytes: number; - - readonly totalDocuments: number; -} - -declare const enum FIRLoadBundleTaskState { - Error = 0, - - InProgress = 1, - - Success = 2, -} - -declare class FIRQuery extends NSObject { - static alloc(): FIRQuery; // inherited from NSObject - - static new(): FIRQuery; // inherited from NSObject - - readonly count: FIRAggregateQuery; - - readonly firestore: FIRFirestore; - - addSnapshotListener(listener: (p1: FIRQuerySnapshot, p2: NSError) => void): FIRListenerRegistration; - - addSnapshotListenerWithIncludeMetadataChangesListener(includeMetadataChanges: boolean, listener: (p1: FIRQuerySnapshot, p2: NSError) => void): FIRListenerRegistration; - - getDocumentsWithCompletion(completion: (p1: FIRQuerySnapshot, p2: NSError) => void): void; - - getDocumentsWithSourceCompletion(source: FIRFirestoreSource, completion: (p1: FIRQuerySnapshot, p2: NSError) => void): void; - - queryEndingAtDocument(document: FIRDocumentSnapshot): FIRQuery; - - queryEndingAtValues(fieldValues: NSArray | any[]): FIRQuery; - - queryEndingBeforeDocument(document: FIRDocumentSnapshot): FIRQuery; - - queryEndingBeforeValues(fieldValues: NSArray | any[]): FIRQuery; - - queryFilteredUsingPredicate(predicate: NSPredicate): FIRQuery; - - queryLimitedTo(limit: number): FIRQuery; - - queryLimitedToLast(limit: number): FIRQuery; - - queryOrderedByField(field: string): FIRQuery; - - queryOrderedByFieldDescending(field: string, descending: boolean): FIRQuery; - - queryOrderedByFieldPath(path: FIRFieldPath): FIRQuery; - - queryOrderedByFieldPathDescending(path: FIRFieldPath, descending: boolean): FIRQuery; - - queryStartingAfterDocument(document: FIRDocumentSnapshot): FIRQuery; - - queryStartingAfterValues(fieldValues: NSArray | any[]): FIRQuery; - - queryStartingAtDocument(document: FIRDocumentSnapshot): FIRQuery; - - queryStartingAtValues(fieldValues: NSArray | any[]): FIRQuery; - - queryWhereFieldArrayContains(field: string, value: any): FIRQuery; - - queryWhereFieldArrayContainsAny(field: string, values: NSArray | any[]): FIRQuery; - - queryWhereFieldIn(field: string, values: NSArray | any[]): FIRQuery; - - queryWhereFieldIsEqualTo(field: string, value: any): FIRQuery; - - queryWhereFieldIsGreaterThan(field: string, value: any): FIRQuery; - - queryWhereFieldIsGreaterThanOrEqualTo(field: string, value: any): FIRQuery; - - queryWhereFieldIsLessThan(field: string, value: any): FIRQuery; - - queryWhereFieldIsLessThanOrEqualTo(field: string, value: any): FIRQuery; - - queryWhereFieldIsNotEqualTo(field: string, value: any): FIRQuery; - - queryWhereFieldNotIn(field: string, values: NSArray | any[]): FIRQuery; - - queryWhereFieldPathArrayContains(path: FIRFieldPath, value: any): FIRQuery; - - queryWhereFieldPathArrayContainsAny(path: FIRFieldPath, values: NSArray | any[]): FIRQuery; - - queryWhereFieldPathIn(path: FIRFieldPath, values: NSArray | any[]): FIRQuery; - - queryWhereFieldPathIsEqualTo(path: FIRFieldPath, value: any): FIRQuery; - - queryWhereFieldPathIsGreaterThan(path: FIRFieldPath, value: any): FIRQuery; - - queryWhereFieldPathIsGreaterThanOrEqualTo(path: FIRFieldPath, value: any): FIRQuery; - - queryWhereFieldPathIsLessThan(path: FIRFieldPath, value: any): FIRQuery; - - queryWhereFieldPathIsLessThanOrEqualTo(path: FIRFieldPath, value: any): FIRQuery; - - queryWhereFieldPathIsNotEqualTo(path: FIRFieldPath, value: any): FIRQuery; - - queryWhereFieldPathNotIn(path: FIRFieldPath, values: NSArray | any[]): FIRQuery; - - queryWhereFilter(filter: FIRFilter): FIRQuery; -} - -declare class FIRQueryDocumentSnapshot extends FIRDocumentSnapshot { - static alloc(): FIRQueryDocumentSnapshot; // inherited from NSObject - - static new(): FIRQueryDocumentSnapshot; // inherited from NSObject -} - -declare class FIRQuerySnapshot extends NSObject { - static alloc(): FIRQuerySnapshot; // inherited from NSObject - - static new(): FIRQuerySnapshot; // inherited from NSObject - - readonly count: number; - - readonly documentChanges: NSArray; - - readonly documents: NSArray; - - readonly empty: boolean; - - readonly metadata: FIRSnapshotMetadata; - - readonly query: FIRQuery; - - documentChangesWithIncludeMetadataChanges(includeMetadataChanges: boolean): NSArray; -} - -declare const enum FIRServerTimestampBehavior { - None = 0, - - Estimate = 1, - - Previous = 2, -} - -declare class FIRSnapshotMetadata extends NSObject { - static alloc(): FIRSnapshotMetadata; // inherited from NSObject - - static new(): FIRSnapshotMetadata; // inherited from NSObject - - readonly fromCache: boolean; - - readonly pendingWrites: boolean; -} - -declare class FIRTimestamp extends NSObject implements NSCopying { - static alloc(): FIRTimestamp; // inherited from NSObject - - static new(): FIRTimestamp; // inherited from NSObject - - static timestamp(): FIRTimestamp; - - static timestampWithDate(date: Date): FIRTimestamp; - - static timestampWithSecondsNanoseconds(seconds: number, nanoseconds: number): FIRTimestamp; - - readonly nanoseconds: number; - - readonly seconds: number; - - constructor(o: { seconds: number; nanoseconds: number }); - - compare(other: FIRTimestamp): NSComparisonResult; - - copyWithZone(zone: interop.Pointer | interop.Reference): any; - - dateValue(): Date; - - initWithSecondsNanoseconds(seconds: number, nanoseconds: number): this; -} - -declare class FIRTransaction extends NSObject { - static alloc(): FIRTransaction; // inherited from NSObject - - static new(): FIRTransaction; // inherited from NSObject - - deleteDocument(document: FIRDocumentReference): FIRTransaction; - - getDocumentError(document: FIRDocumentReference): FIRDocumentSnapshot; - - setDataForDocument(data: NSDictionary, document: FIRDocumentReference): FIRTransaction; - - setDataForDocumentMerge(data: NSDictionary, document: FIRDocumentReference, merge: boolean): FIRTransaction; - - setDataForDocumentMergeFields(data: NSDictionary, document: FIRDocumentReference, mergeFields: NSArray | any[]): FIRTransaction; - - updateDataForDocument(fields: NSDictionary, document: FIRDocumentReference): FIRTransaction; -} - -declare class FIRTransactionOptions extends NSObject implements NSCopying { - static alloc(): FIRTransactionOptions; // inherited from NSObject - - static new(): FIRTransactionOptions; // inherited from NSObject - - maxAttempts: number; - - copyWithZone(zone: interop.Pointer | interop.Reference): any; -} - -declare class FIRWriteBatch extends NSObject { - static alloc(): FIRWriteBatch; // inherited from NSObject - - static new(): FIRWriteBatch; // inherited from NSObject - - commit(): void; - - commitWithCompletion(completion: (p1: NSError) => void): void; - - deleteDocument(document: FIRDocumentReference): FIRWriteBatch; - - setDataForDocument(data: NSDictionary, document: FIRDocumentReference): FIRWriteBatch; - - setDataForDocumentMerge(data: NSDictionary, document: FIRDocumentReference, merge: boolean): FIRWriteBatch; - - setDataForDocumentMergeFields(data: NSDictionary, document: FIRDocumentReference, mergeFields: NSArray | any[]): FIRWriteBatch; - - updateDataForDocument(fields: NSDictionary, document: FIRDocumentReference): FIRWriteBatch; -} - declare var FirebaseFirestoreVersionNumber: number; declare var FirebaseFirestoreVersionString: interop.Reference; - -declare var kFIRFirestoreCacheSizeUnlimited: number; diff --git a/packages/firebase-firestore/typings/objc!FirebaseFirestoreInternal.d.ts b/packages/firebase-firestore/typings/objc!FirebaseFirestoreInternal.d.ts new file mode 100644 index 00000000..31f60688 --- /dev/null +++ b/packages/firebase-firestore/typings/objc!FirebaseFirestoreInternal.d.ts @@ -0,0 +1,700 @@ +declare class FIRAggregateField extends NSObject { + static aggregateFieldForAverageOfField(field: string): FIRAggregateField; + + static aggregateFieldForAverageOfFieldPath(fieldPath: FIRFieldPath): FIRAggregateField; + + static aggregateFieldForCount(): FIRAggregateField; + + static aggregateFieldForSumOfField(field: string): FIRAggregateField; + + static aggregateFieldForSumOfFieldPath(fieldPath: FIRFieldPath): FIRAggregateField; + + static alloc(): FIRAggregateField; // inherited from NSObject + + static new(): FIRAggregateField; // inherited from NSObject +} + +declare class FIRAggregateQuery extends NSObject { + static alloc(): FIRAggregateQuery; // inherited from NSObject + + static new(): FIRAggregateQuery; // inherited from NSObject + + readonly query: FIRQuery; + + aggregationWithSourceCompletion(source: FIRAggregateSource, completion: (p1: FIRAggregateQuerySnapshot, p2: NSError) => void): void; +} + +declare class FIRAggregateQuerySnapshot extends NSObject { + static alloc(): FIRAggregateQuerySnapshot; // inherited from NSObject + + static new(): FIRAggregateQuerySnapshot; // inherited from NSObject + + readonly count: number; + + readonly query: FIRAggregateQuery; + + valueForAggregateField(aggregateField: FIRAggregateField): any; +} + +declare const enum FIRAggregateSource { + Server = 0, +} + +declare class FIRCollectionReference extends FIRQuery { + static alloc(): FIRCollectionReference; // inherited from NSObject + + static new(): FIRCollectionReference; // inherited from NSObject + + readonly collectionID: string; + + readonly parent: FIRDocumentReference; + + readonly path: string; + + addDocumentWithData(data: NSDictionary): FIRDocumentReference; + + addDocumentWithDataCompletion(data: NSDictionary, completion: (p1: NSError) => void): FIRDocumentReference; + + documentWithAutoID(): FIRDocumentReference; + + documentWithPath(documentPath: string): FIRDocumentReference; +} + +declare class FIRDocumentChange extends NSObject { + static alloc(): FIRDocumentChange; // inherited from NSObject + + static new(): FIRDocumentChange; // inherited from NSObject + + readonly document: FIRQueryDocumentSnapshot; + + readonly newIndex: number; + + readonly oldIndex: number; + + readonly type: FIRDocumentChangeType; +} + +declare const enum FIRDocumentChangeType { + Added = 0, + + Modified = 1, + + Removed = 2, +} + +declare class FIRDocumentReference extends NSObject { + static alloc(): FIRDocumentReference; // inherited from NSObject + + static new(): FIRDocumentReference; // inherited from NSObject + + readonly documentID: string; + + readonly firestore: FIRFirestore; + + readonly parent: FIRCollectionReference; + + readonly path: string; + + addSnapshotListener(listener: (p1: FIRDocumentSnapshot, p2: NSError) => void): FIRListenerRegistration; + + addSnapshotListenerWithIncludeMetadataChangesListener(includeMetadataChanges: boolean, listener: (p1: FIRDocumentSnapshot, p2: NSError) => void): FIRListenerRegistration; + + collectionWithPath(collectionPath: string): FIRCollectionReference; + + deleteDocument(): void; + + deleteDocumentWithCompletion(completion: (p1: NSError) => void): void; + + getDocumentWithCompletion(completion: (p1: FIRDocumentSnapshot, p2: NSError) => void): void; + + getDocumentWithSourceCompletion(source: FIRFirestoreSource, completion: (p1: FIRDocumentSnapshot, p2: NSError) => void): void; + + setData(documentData: NSDictionary): void; + + setDataCompletion(documentData: NSDictionary, completion: (p1: NSError) => void): void; + + setDataMerge(documentData: NSDictionary, merge: boolean): void; + + setDataMergeCompletion(documentData: NSDictionary, merge: boolean, completion: (p1: NSError) => void): void; + + setDataMergeFields(documentData: NSDictionary, mergeFields: NSArray | any[]): void; + + setDataMergeFieldsCompletion(documentData: NSDictionary, mergeFields: NSArray | any[], completion: (p1: NSError) => void): void; + + updateData(fields: NSDictionary): void; + + updateDataCompletion(fields: NSDictionary, completion: (p1: NSError) => void): void; +} + +declare class FIRDocumentSnapshot extends NSObject { + static alloc(): FIRDocumentSnapshot; // inherited from NSObject + + static new(): FIRDocumentSnapshot; // inherited from NSObject + + readonly documentID: string; + + readonly exists: boolean; + + readonly metadata: FIRSnapshotMetadata; + + readonly reference: FIRDocumentReference; + + data(): NSDictionary; + + dataWithServerTimestampBehavior(serverTimestampBehavior: FIRServerTimestampBehavior): NSDictionary; + + objectForKeyedSubscript(key: any): any; + + valueForField(field: any): any; + + valueForFieldServerTimestampBehavior(field: any, serverTimestampBehavior: FIRServerTimestampBehavior): any; +} + +declare class FIRFieldPath extends NSObject implements NSCopying { + static alloc(): FIRFieldPath; // inherited from NSObject + + static documentID(): FIRFieldPath; + + static new(): FIRFieldPath; // inherited from NSObject + + constructor(o: { fields: NSArray | string[] }); + + copyWithZone(zone: interop.Pointer | interop.Reference): any; + + initWithFields(fieldNames: NSArray | string[]): this; +} + +declare class FIRFieldValue extends NSObject { + static alloc(): FIRFieldValue; // inherited from NSObject + + static fieldValueForArrayRemove(elements: NSArray | any[]): FIRFieldValue; + + static fieldValueForArrayUnion(elements: NSArray | any[]): FIRFieldValue; + + static fieldValueForDelete(): FIRFieldValue; + + static fieldValueForDoubleIncrement(d: number): FIRFieldValue; + + static fieldValueForIntegerIncrement(l: number): FIRFieldValue; + + static fieldValueForServerTimestamp(): FIRFieldValue; + + static new(): FIRFieldValue; // inherited from NSObject +} + +declare class FIRFilter extends NSObject { + static alloc(): FIRFilter; // inherited from NSObject + + static andFilterWithFilters(filters: NSArray | FIRFilter[]): FIRFilter; + + static filterWhereFieldArrayContains(field: string, value: any): FIRFilter; + + static filterWhereFieldArrayContainsAny(field: string, values: NSArray | any[]): FIRFilter; + + static filterWhereFieldIn(field: string, values: NSArray | any[]): FIRFilter; + + static filterWhereFieldIsEqualTo(field: string, value: any): FIRFilter; + + static filterWhereFieldIsGreaterThan(field: string, value: any): FIRFilter; + + static filterWhereFieldIsGreaterThanOrEqualTo(field: string, value: any): FIRFilter; + + static filterWhereFieldIsLessThan(field: string, value: any): FIRFilter; + + static filterWhereFieldIsLessThanOrEqualTo(field: string, value: any): FIRFilter; + + static filterWhereFieldIsNotEqualTo(field: string, value: any): FIRFilter; + + static filterWhereFieldNotIn(field: string, values: NSArray | any[]): FIRFilter; + + static filterWhereFieldPathArrayContains(path: FIRFieldPath, value: any): FIRFilter; + + static filterWhereFieldPathArrayContainsAny(path: FIRFieldPath, values: NSArray | any[]): FIRFilter; + + static filterWhereFieldPathIn(path: FIRFieldPath, values: NSArray | any[]): FIRFilter; + + static filterWhereFieldPathIsEqualTo(path: FIRFieldPath, value: any): FIRFilter; + + static filterWhereFieldPathIsGreaterThan(path: FIRFieldPath, value: any): FIRFilter; + + static filterWhereFieldPathIsGreaterThanOrEqualTo(path: FIRFieldPath, value: any): FIRFilter; + + static filterWhereFieldPathIsLessThan(path: FIRFieldPath, value: any): FIRFilter; + + static filterWhereFieldPathIsLessThanOrEqualTo(path: FIRFieldPath, value: any): FIRFilter; + + static filterWhereFieldPathIsNotEqualTo(path: FIRFieldPath, value: any): FIRFilter; + + static filterWhereFieldPathNotIn(path: FIRFieldPath, values: NSArray | any[]): FIRFilter; + + static new(): FIRFilter; // inherited from NSObject + + static orFilterWithFilters(filters: NSArray | FIRFilter[]): FIRFilter; +} + +declare class FIRFirestore extends NSObject { + static alloc(): FIRFirestore; // inherited from NSObject + + static enableLogging(logging: boolean): void; + + static firestore(): FIRFirestore; + + static firestoreForApp(app: FIRApp): FIRFirestore; + + static firestoreForAppDatabase(app: FIRApp, database: string): FIRFirestore; + + static firestoreForDatabase(database: string): FIRFirestore; + + static new(): FIRFirestore; // inherited from NSObject + + readonly app: FIRApp; + + readonly persistentCacheIndexManager: FIRPersistentCacheIndexManager; + + settings: FIRFirestoreSettings; + + addSnapshotsInSyncListener(listener: () => void): FIRListenerRegistration; + + batch(): FIRWriteBatch; + + clearPersistenceWithCompletion(completion: (p1: NSError) => void): void; + + collectionGroupWithID(collectionID: string): FIRQuery; + + collectionWithPath(collectionPath: string): FIRCollectionReference; + + disableNetworkWithCompletion(completion: (p1: NSError) => void): void; + + documentWithPath(documentPath: string): FIRDocumentReference; + + enableNetworkWithCompletion(completion: (p1: NSError) => void): void; + + getQueryNamedCompletion(name: string, completion: (p1: FIRQuery) => void): void; + + loadBundle(bundleData: NSData): FIRLoadBundleTask; + + loadBundleCompletion(bundleData: NSData, completion: (p1: FIRLoadBundleTaskProgress, p2: NSError) => void): FIRLoadBundleTask; + + loadBundleStream(bundleStream: NSInputStream): FIRLoadBundleTask; + + loadBundleStreamCompletion(bundleStream: NSInputStream, completion: (p1: FIRLoadBundleTaskProgress, p2: NSError) => void): FIRLoadBundleTask; + + runTransactionWithBlockCompletion(updateBlock: (p1: FIRTransaction, p2: interop.Pointer | interop.Reference) => any, completion: (p1: any, p2: NSError) => void): void; + + runTransactionWithOptionsBlockCompletion(options: FIRTransactionOptions, updateBlock: (p1: FIRTransaction, p2: interop.Pointer | interop.Reference) => any, completion: (p1: any, p2: NSError) => void): void; + + setIndexConfigurationFromJSONCompletion(json: string, completion: (p1: NSError) => void): void; + + setIndexConfigurationFromStreamCompletion(stream: NSInputStream, completion: (p1: NSError) => void): void; + + terminateWithCompletion(completion: (p1: NSError) => void): void; + + useEmulatorWithHostPort(host: string, port: number): void; + + waitForPendingWritesWithCompletion(completion: (p1: NSError) => void): void; +} + +declare const enum FIRFirestoreErrorCode { + OK = 0, + + Cancelled = 1, + + Unknown = 2, + + InvalidArgument = 3, + + DeadlineExceeded = 4, + + NotFound = 5, + + AlreadyExists = 6, + + PermissionDenied = 7, + + ResourceExhausted = 8, + + FailedPrecondition = 9, + + Aborted = 10, + + OutOfRange = 11, + + Unimplemented = 12, + + Internal = 13, + + Unavailable = 14, + + DataLoss = 15, + + Unauthenticated = 16, +} + +declare var FIRFirestoreErrorDomain: string; + +declare class FIRFirestoreSettings extends NSObject implements NSCopying { + static alloc(): FIRFirestoreSettings; // inherited from NSObject + + static new(): FIRFirestoreSettings; // inherited from NSObject + + cacheSettings: any; + + cacheSizeBytes: number; + + host: string; + + persistenceEnabled: boolean; + + sslEnabled: boolean; + + copyWithZone(zone: interop.Pointer | interop.Reference): any; +} + +declare const enum FIRFirestoreSource { + Default = 0, + + Server = 1, + + Cache = 2, +} + +declare class FIRGeoPoint extends NSObject implements NSCopying { + static alloc(): FIRGeoPoint; // inherited from NSObject + + static new(): FIRGeoPoint; // inherited from NSObject + + readonly latitude: number; + + readonly longitude: number; + + constructor(o: { latitude: number; longitude: number }); + + copyWithZone(zone: interop.Pointer | interop.Reference): any; + + initWithLatitudeLongitude(latitude: number, longitude: number): this; +} + +interface FIRListenerRegistration extends NSObjectProtocol { + remove(): void; +} +declare var FIRListenerRegistration: { + prototype: FIRListenerRegistration; +}; + +declare class FIRLoadBundleTask extends NSObject { + static alloc(): FIRLoadBundleTask; // inherited from NSObject + + static new(): FIRLoadBundleTask; // inherited from NSObject + + addObserver(observer: (p1: FIRLoadBundleTaskProgress) => void): number; + + removeAllObservers(): void; + + removeObserverWithHandle(handle: number): void; +} + +declare class FIRLoadBundleTaskProgress extends NSObject { + static alloc(): FIRLoadBundleTaskProgress; // inherited from NSObject + + static new(): FIRLoadBundleTaskProgress; // inherited from NSObject + + readonly bytesLoaded: number; + + readonly documentsLoaded: number; + + readonly state: FIRLoadBundleTaskState; + + readonly totalBytes: number; + + readonly totalDocuments: number; +} + +declare const enum FIRLoadBundleTaskState { + Error = 0, + + InProgress = 1, + + Success = 2, +} + +interface FIRLocalCacheSettings {} +declare var FIRLocalCacheSettings: { + prototype: FIRLocalCacheSettings; +}; + +declare class FIRMemoryCacheSettings extends NSObject implements FIRLocalCacheSettings, NSCopying { + static alloc(): FIRMemoryCacheSettings; // inherited from NSObject + + static new(): FIRMemoryCacheSettings; // inherited from NSObject + + constructor(o: { garbageCollectorSettings: any }); + + copyWithZone(zone: interop.Pointer | interop.Reference): any; + + initWithGarbageCollectorSettings(settings: any): this; +} + +declare class FIRMemoryEagerGCSettings extends NSObject implements FIRMemoryGarbageCollectorSettings, NSCopying { + static alloc(): FIRMemoryEagerGCSettings; // inherited from NSObject + + static new(): FIRMemoryEagerGCSettings; // inherited from NSObject + + copyWithZone(zone: interop.Pointer | interop.Reference): any; +} + +interface FIRMemoryGarbageCollectorSettings {} +declare var FIRMemoryGarbageCollectorSettings: { + prototype: FIRMemoryGarbageCollectorSettings; +}; + +declare class FIRMemoryLRUGCSettings extends NSObject implements FIRMemoryGarbageCollectorSettings, NSCopying { + static alloc(): FIRMemoryLRUGCSettings; // inherited from NSObject + + static new(): FIRMemoryLRUGCSettings; // inherited from NSObject + + constructor(o: { sizeBytes: number }); + + copyWithZone(zone: interop.Pointer | interop.Reference): any; + + initWithSizeBytes(size: number): this; +} + +declare class FIRPersistentCacheIndexManager extends NSObject { + static alloc(): FIRPersistentCacheIndexManager; // inherited from NSObject + + static new(): FIRPersistentCacheIndexManager; // inherited from NSObject + + deleteAllIndexes(): void; + + disableIndexAutoCreation(): void; + + enableIndexAutoCreation(): void; +} + +declare class FIRPersistentCacheSettings extends NSObject implements FIRLocalCacheSettings, NSCopying { + static alloc(): FIRPersistentCacheSettings; // inherited from NSObject + + static new(): FIRPersistentCacheSettings; // inherited from NSObject + + constructor(o: { sizeBytes: number }); + + copyWithZone(zone: interop.Pointer | interop.Reference): any; + + initWithSizeBytes(size: number): this; +} + +declare class FIRQuery extends NSObject { + static alloc(): FIRQuery; // inherited from NSObject + + static new(): FIRQuery; // inherited from NSObject + + readonly count: FIRAggregateQuery; + + readonly firestore: FIRFirestore; + + addSnapshotListener(listener: (p1: FIRQuerySnapshot, p2: NSError) => void): FIRListenerRegistration; + + addSnapshotListenerWithIncludeMetadataChangesListener(includeMetadataChanges: boolean, listener: (p1: FIRQuerySnapshot, p2: NSError) => void): FIRListenerRegistration; + + aggregate(aggregateFields: NSArray | FIRAggregateField[]): FIRAggregateQuery; + + getDocumentsWithCompletion(completion: (p1: FIRQuerySnapshot, p2: NSError) => void): void; + + getDocumentsWithSourceCompletion(source: FIRFirestoreSource, completion: (p1: FIRQuerySnapshot, p2: NSError) => void): void; + + queryEndingAtDocument(document: FIRDocumentSnapshot): FIRQuery; + + queryEndingAtValues(fieldValues: NSArray | any[]): FIRQuery; + + queryEndingBeforeDocument(document: FIRDocumentSnapshot): FIRQuery; + + queryEndingBeforeValues(fieldValues: NSArray | any[]): FIRQuery; + + queryFilteredUsingPredicate(predicate: NSPredicate): FIRQuery; + + queryLimitedTo(limit: number): FIRQuery; + + queryLimitedToLast(limit: number): FIRQuery; + + queryOrderedByField(field: string): FIRQuery; + + queryOrderedByFieldDescending(field: string, descending: boolean): FIRQuery; + + queryOrderedByFieldPath(path: FIRFieldPath): FIRQuery; + + queryOrderedByFieldPathDescending(path: FIRFieldPath, descending: boolean): FIRQuery; + + queryStartingAfterDocument(document: FIRDocumentSnapshot): FIRQuery; + + queryStartingAfterValues(fieldValues: NSArray | any[]): FIRQuery; + + queryStartingAtDocument(document: FIRDocumentSnapshot): FIRQuery; + + queryStartingAtValues(fieldValues: NSArray | any[]): FIRQuery; + + queryWhereFieldArrayContains(field: string, value: any): FIRQuery; + + queryWhereFieldArrayContainsAny(field: string, values: NSArray | any[]): FIRQuery; + + queryWhereFieldIn(field: string, values: NSArray | any[]): FIRQuery; + + queryWhereFieldIsEqualTo(field: string, value: any): FIRQuery; + + queryWhereFieldIsGreaterThan(field: string, value: any): FIRQuery; + + queryWhereFieldIsGreaterThanOrEqualTo(field: string, value: any): FIRQuery; + + queryWhereFieldIsLessThan(field: string, value: any): FIRQuery; + + queryWhereFieldIsLessThanOrEqualTo(field: string, value: any): FIRQuery; + + queryWhereFieldIsNotEqualTo(field: string, value: any): FIRQuery; + + queryWhereFieldNotIn(field: string, values: NSArray | any[]): FIRQuery; + + queryWhereFieldPathArrayContains(path: FIRFieldPath, value: any): FIRQuery; + + queryWhereFieldPathArrayContainsAny(path: FIRFieldPath, values: NSArray | any[]): FIRQuery; + + queryWhereFieldPathIn(path: FIRFieldPath, values: NSArray | any[]): FIRQuery; + + queryWhereFieldPathIsEqualTo(path: FIRFieldPath, value: any): FIRQuery; + + queryWhereFieldPathIsGreaterThan(path: FIRFieldPath, value: any): FIRQuery; + + queryWhereFieldPathIsGreaterThanOrEqualTo(path: FIRFieldPath, value: any): FIRQuery; + + queryWhereFieldPathIsLessThan(path: FIRFieldPath, value: any): FIRQuery; + + queryWhereFieldPathIsLessThanOrEqualTo(path: FIRFieldPath, value: any): FIRQuery; + + queryWhereFieldPathIsNotEqualTo(path: FIRFieldPath, value: any): FIRQuery; + + queryWhereFieldPathNotIn(path: FIRFieldPath, values: NSArray | any[]): FIRQuery; + + queryWhereFilter(filter: FIRFilter): FIRQuery; +} + +declare class FIRQueryDocumentSnapshot extends FIRDocumentSnapshot { + static alloc(): FIRQueryDocumentSnapshot; // inherited from NSObject + + static new(): FIRQueryDocumentSnapshot; // inherited from NSObject +} + +declare class FIRQuerySnapshot extends NSObject { + static alloc(): FIRQuerySnapshot; // inherited from NSObject + + static new(): FIRQuerySnapshot; // inherited from NSObject + + readonly count: number; + + readonly documentChanges: NSArray; + + readonly documents: NSArray; + + readonly empty: boolean; + + readonly metadata: FIRSnapshotMetadata; + + readonly query: FIRQuery; + + documentChangesWithIncludeMetadataChanges(includeMetadataChanges: boolean): NSArray; +} + +declare const enum FIRServerTimestampBehavior { + None = 0, + + Estimate = 1, + + Previous = 2, +} + +declare class FIRSnapshotMetadata extends NSObject { + static alloc(): FIRSnapshotMetadata; // inherited from NSObject + + static new(): FIRSnapshotMetadata; // inherited from NSObject + + readonly fromCache: boolean; + + readonly pendingWrites: boolean; +} + +declare class FIRTimestamp extends NSObject implements NSCopying { + static alloc(): FIRTimestamp; // inherited from NSObject + + static new(): FIRTimestamp; // inherited from NSObject + + static timestamp(): FIRTimestamp; + + static timestampWithDate(date: Date): FIRTimestamp; + + static timestampWithSecondsNanoseconds(seconds: number, nanoseconds: number): FIRTimestamp; + + readonly nanoseconds: number; + + readonly seconds: number; + + constructor(o: { seconds: number; nanoseconds: number }); + + compare(other: FIRTimestamp): NSComparisonResult; + + copyWithZone(zone: interop.Pointer | interop.Reference): any; + + dateValue(): Date; + + initWithSecondsNanoseconds(seconds: number, nanoseconds: number): this; +} + +declare class FIRTransaction extends NSObject { + static alloc(): FIRTransaction; // inherited from NSObject + + static new(): FIRTransaction; // inherited from NSObject + + deleteDocument(document: FIRDocumentReference): FIRTransaction; + + getDocumentError(document: FIRDocumentReference): FIRDocumentSnapshot; + + setDataForDocument(data: NSDictionary, document: FIRDocumentReference): FIRTransaction; + + setDataForDocumentMerge(data: NSDictionary, document: FIRDocumentReference, merge: boolean): FIRTransaction; + + setDataForDocumentMergeFields(data: NSDictionary, document: FIRDocumentReference, mergeFields: NSArray | any[]): FIRTransaction; + + updateDataForDocument(fields: NSDictionary, document: FIRDocumentReference): FIRTransaction; +} + +declare class FIRTransactionOptions extends NSObject implements NSCopying { + static alloc(): FIRTransactionOptions; // inherited from NSObject + + static new(): FIRTransactionOptions; // inherited from NSObject + + maxAttempts: number; + + copyWithZone(zone: interop.Pointer | interop.Reference): any; +} + +declare class FIRWriteBatch extends NSObject { + static alloc(): FIRWriteBatch; // inherited from NSObject + + static new(): FIRWriteBatch; // inherited from NSObject + + commit(): void; + + commitWithCompletion(completion: (p1: NSError) => void): void; + + deleteDocument(document: FIRDocumentReference): FIRWriteBatch; + + setDataForDocument(data: NSDictionary, document: FIRDocumentReference): FIRWriteBatch; + + setDataForDocumentMerge(data: NSDictionary, document: FIRDocumentReference, merge: boolean): FIRWriteBatch; + + setDataForDocumentMergeFields(data: NSDictionary, document: FIRDocumentReference, mergeFields: NSArray | any[]): FIRWriteBatch; + + updateDataForDocument(fields: NSDictionary, document: FIRDocumentReference): FIRWriteBatch; +} + +declare var FirebaseFirestoreInternalVersionNumber: number; + +declare var FirebaseFirestoreInternalVersionString: interop.Reference; + +declare var kFIRFirestoreCacheSizeUnlimited: number; diff --git a/packages/firebase-functions/package.json b/packages/firebase-functions/package.json index f868eced..72396bd4 100644 --- a/packages/firebase-functions/package.json +++ b/packages/firebase-functions/package.json @@ -1,6 +1,6 @@ { "name": "@nativescript/firebase-functions", - "version": "3.2.0", + "version": "3.2.1", "description": "NativeScript Firebase - Functions", "main": "index", "typings": "index.d.ts", diff --git a/packages/firebase-functions/platforms/android/firebase_functions.aar b/packages/firebase-functions/platforms/android/firebase_functions.aar index cf0dfd3e..2dbebf25 100644 Binary files a/packages/firebase-functions/platforms/android/firebase_functions.aar and b/packages/firebase-functions/platforms/android/firebase_functions.aar differ diff --git a/packages/firebase-functions/platforms/android/include.gradle b/packages/firebase-functions/platforms/android/include.gradle index 5cc59244..55f31ca8 100644 --- a/packages/firebase-functions/platforms/android/include.gradle +++ b/packages/firebase-functions/platforms/android/include.gradle @@ -1,5 +1,5 @@ dependencies { - def computeFirebaseBomVersion = { -> project.hasProperty("firebaseBomVersion") ? firebaseBomVersion : "32.3.1" } + def computeFirebaseBomVersion = { -> project.hasProperty("firebaseBomVersion") ? firebaseBomVersion : "32.7.2" } implementation platform("com.google.firebase:firebase-bom:${computeFirebaseBomVersion}") implementation 'com.google.firebase:firebase-functions' } diff --git a/packages/firebase-functions/platforms/ios/Podfile b/packages/firebase-functions/platforms/ios/Podfile index 98c2a954..aff1f03c 100644 --- a/packages/firebase-functions/platforms/ios/Podfile +++ b/packages/firebase-functions/platforms/ios/Podfile @@ -1,2 +1,2 @@ platform :ios, '12.0' -pod 'Firebase/Functions', '~>10.13.0' +pod 'Firebase/Functions', '~>10.20.0' diff --git a/packages/firebase-functions/typings/objc!FirebaseFunctions.d.ts b/packages/firebase-functions/typings/objc!FirebaseFunctions.d.ts index 28708cf1..6bcb4748 100644 --- a/packages/firebase-functions/typings/objc!FirebaseFunctions.d.ts +++ b/packages/firebase-functions/typings/objc!FirebaseFunctions.d.ts @@ -17,8 +17,12 @@ declare class FIRFunctions extends NSObject { HTTPSCallableWithName(name: string): FIRHTTPSCallable; + HTTPSCallableWithNameOptions(name: string, options: FIRHTTPSCallableOptions): FIRHTTPSCallable; + HTTPSCallableWithURL(url: NSURL): FIRHTTPSCallable; + HTTPSCallableWithURLOptions(url: NSURL, options: FIRHTTPSCallableOptions): FIRHTTPSCallable; + useEmulatorWithHostPort(host: string, port: number): void; } @@ -70,6 +74,18 @@ declare class FIRHTTPSCallable extends NSObject { callWithObjectCompletion(data: any, completion: (p1: FIRHTTPSCallableResult, p2: NSError) => void): void; } +declare class FIRHTTPSCallableOptions extends NSObject { + static alloc(): FIRHTTPSCallableOptions; // inherited from NSObject + + static new(): FIRHTTPSCallableOptions; // inherited from NSObject + + readonly requireLimitedUseAppCheckTokens: boolean; + + constructor(o: { requireLimitedUseAppCheckTokens: boolean }); + + initWithRequireLimitedUseAppCheckTokens(requireLimitedUseAppCheckTokens: boolean): this; +} + declare class FIRHTTPSCallableResult extends NSObject { static alloc(): FIRHTTPSCallableResult; // inherited from NSObject diff --git a/packages/firebase-in-app-messaging/package.json b/packages/firebase-in-app-messaging/package.json index 9e075083..1f0f3cc8 100644 --- a/packages/firebase-in-app-messaging/package.json +++ b/packages/firebase-in-app-messaging/package.json @@ -1,6 +1,6 @@ { "name": "@nativescript/firebase-in-app-messaging", - "version": "3.2.0", + "version": "3.2.1", "description": "NativeScript Firebase - In App Messaging", "main": "index", "typings": "index.d.ts", diff --git a/packages/firebase-in-app-messaging/platforms/android/include.gradle b/packages/firebase-in-app-messaging/platforms/android/include.gradle index 93044a68..54088c1a 100644 --- a/packages/firebase-in-app-messaging/platforms/android/include.gradle +++ b/packages/firebase-in-app-messaging/platforms/android/include.gradle @@ -1,5 +1,5 @@ dependencies { - def computeFirebaseBomVersion = { -> project.hasProperty("firebaseBomVersion") ? firebaseBomVersion : "32.3.1" } + def computeFirebaseBomVersion = { -> project.hasProperty("firebaseBomVersion") ? firebaseBomVersion : "32.7.2" } implementation platform("com.google.firebase:firebase-bom:${computeFirebaseBomVersion}") implementation 'com.google.firebase:firebase-inappmessaging-display' implementation 'com.google.firebase:firebase-analytics' diff --git a/packages/firebase-in-app-messaging/platforms/ios/Podfile b/packages/firebase-in-app-messaging/platforms/ios/Podfile index 8696fa6a..7f8ee276 100644 --- a/packages/firebase-in-app-messaging/platforms/ios/Podfile +++ b/packages/firebase-in-app-messaging/platforms/ios/Podfile @@ -1,2 +1,2 @@ platform :ios, '12.0' -pod 'Firebase/InAppMessaging', '~>10.13.0' \ No newline at end of file +pod 'Firebase/InAppMessaging', '~>10.20.0' \ No newline at end of file diff --git a/packages/firebase-installations/package.json b/packages/firebase-installations/package.json index fc34a613..d082e87b 100644 --- a/packages/firebase-installations/package.json +++ b/packages/firebase-installations/package.json @@ -1,6 +1,6 @@ { "name": "@nativescript/firebase-installations", - "version": "3.2.0", + "version": "3.2.1", "description": "NativeScript Firebase - Installations", "main": "index", "typings": "index.d.ts", diff --git a/packages/firebase-installations/platforms/android/firebase_installations.aar b/packages/firebase-installations/platforms/android/firebase_installations.aar index 9e257a50..907c45b3 100644 Binary files a/packages/firebase-installations/platforms/android/firebase_installations.aar and b/packages/firebase-installations/platforms/android/firebase_installations.aar differ diff --git a/packages/firebase-installations/platforms/android/include.gradle b/packages/firebase-installations/platforms/android/include.gradle index 8593a67f..971e8cae 100644 --- a/packages/firebase-installations/platforms/android/include.gradle +++ b/packages/firebase-installations/platforms/android/include.gradle @@ -1,5 +1,5 @@ dependencies { - def computeFirebaseBomVersion = { -> project.hasProperty("firebaseBomVersion") ? firebaseBomVersion : "32.3.1" } + def computeFirebaseBomVersion = { -> project.hasProperty("firebaseBomVersion") ? firebaseBomVersion : "32.7.2" } implementation platform("com.google.firebase:firebase-bom:${computeFirebaseBomVersion}") implementation 'com.google.firebase:firebase-installations' } \ No newline at end of file diff --git a/packages/firebase-installations/platforms/ios/Podfile b/packages/firebase-installations/platforms/ios/Podfile index 21abcf52..9c0a04a2 100644 --- a/packages/firebase-installations/platforms/ios/Podfile +++ b/packages/firebase-installations/platforms/ios/Podfile @@ -1,2 +1,2 @@ platform :ios, '12.0' -pod 'Firebase/Installations', '~>10.13.0' \ No newline at end of file +pod 'Firebase/Installations', '~>10.20.0' \ No newline at end of file diff --git a/packages/firebase-messaging-core/index.android.ts b/packages/firebase-messaging-core/index.android.ts index 3c9c7af0..9d3c5c5f 100644 --- a/packages/firebase-messaging-core/index.android.ts +++ b/packages/firebase-messaging-core/index.android.ts @@ -167,8 +167,6 @@ export class MessagingCore implements IMessagingCore { } defaultInstance = this; - this._native = com.google.firebase.messaging.FirebaseMessaging.getInstance(); - org.nativescript.firebase.messaging.FirebaseMessaging.init(Utils.android.getApplicationContext()); ensureCallback(); @@ -206,6 +204,13 @@ export class MessagingCore implements IMessagingCore { return new MessagingCore(); } + get native() { + if (!this._native) { + this._native = com.google.firebase.messaging.FirebaseMessaging.getInstance(); + } + return this._native; + } + _newIntentCallback(args: AndroidActivityNewIntentEventData) { org.nativescript.firebase.messaging.FirebaseMessaging.handleActivityIntent(args.intent); } diff --git a/packages/firebase-messaging-core/package.json b/packages/firebase-messaging-core/package.json index c75610c8..08408e5a 100644 --- a/packages/firebase-messaging-core/package.json +++ b/packages/firebase-messaging-core/package.json @@ -1,6 +1,6 @@ { "name": "@nativescript/firebase-messaging-core", - "version": "3.2.0", + "version": "3.2.1", "description": "NativeScript Push Messaging Core", "main": "index", "typings": "index.d.ts", diff --git a/packages/firebase-messaging-core/platforms/android/firebase_messaging_core.aar b/packages/firebase-messaging-core/platforms/android/firebase_messaging_core.aar index 5d12941c..692c8a0d 100644 Binary files a/packages/firebase-messaging-core/platforms/android/firebase_messaging_core.aar and b/packages/firebase-messaging-core/platforms/android/firebase_messaging_core.aar differ diff --git a/packages/firebase-messaging-core/platforms/android/include.gradle b/packages/firebase-messaging-core/platforms/android/include.gradle index 200ad4c9..61784d36 100644 --- a/packages/firebase-messaging-core/platforms/android/include.gradle +++ b/packages/firebase-messaging-core/platforms/android/include.gradle @@ -2,7 +2,7 @@ if (!project.hasProperty("tempBuild")) { apply plugin: 'com.google.gms.google-services' } dependencies { - def computeFirebaseBomVersion = { -> project.hasProperty("firebaseBomVersion") ? firebaseBomVersion : "32.3.1" } + def computeFirebaseBomVersion = { -> project.hasProperty("firebaseBomVersion") ? firebaseBomVersion : "32.7.2" } implementation platform("com.google.firebase:firebase-bom:${computeFirebaseBomVersion}") implementation 'com.google.firebase:firebase-messaging' } diff --git a/packages/firebase-messaging/package.json b/packages/firebase-messaging/package.json index 8dcf9412..b143cc9d 100644 --- a/packages/firebase-messaging/package.json +++ b/packages/firebase-messaging/package.json @@ -1,6 +1,6 @@ { "name": "@nativescript/firebase-messaging", - "version": "3.2.0", + "version": "3.2.1", "description": "NativeScript Firebase - Messaging", "main": "index", "typings": "index.d.ts", diff --git a/packages/firebase-messaging/platforms/android/include.gradle b/packages/firebase-messaging/platforms/android/include.gradle index a0989f89..3195cad5 100644 --- a/packages/firebase-messaging/platforms/android/include.gradle +++ b/packages/firebase-messaging/platforms/android/include.gradle @@ -1,5 +1,5 @@ dependencies { - def computeFirebaseBomVersion = { -> project.hasProperty("firebaseBomVersion") ? firebaseBomVersion : "32.3.1" } + def computeFirebaseBomVersion = { -> project.hasProperty("firebaseBomVersion") ? firebaseBomVersion : "32.7.2" } implementation platform("com.google.firebase:firebase-bom:${computeFirebaseBomVersion}") implementation 'com.google.firebase:firebase-analytics' } \ No newline at end of file diff --git a/packages/firebase-messaging/platforms/ios/Podfile b/packages/firebase-messaging/platforms/ios/Podfile index 90d12e87..7f1e8b34 100644 --- a/packages/firebase-messaging/platforms/ios/Podfile +++ b/packages/firebase-messaging/platforms/ios/Podfile @@ -1,2 +1,2 @@ platform :ios, '12.0' -pod 'Firebase/Messaging', '~>10.13.0' \ No newline at end of file +pod 'Firebase/Messaging', '~>10.20.0' \ No newline at end of file diff --git a/packages/firebase-performance/package.json b/packages/firebase-performance/package.json index dc3138c7..22790883 100644 --- a/packages/firebase-performance/package.json +++ b/packages/firebase-performance/package.json @@ -1,6 +1,6 @@ { "name": "@nativescript/firebase-performance", - "version": "3.2.0", + "version": "3.2.1", "description": "NativeScript Firebase - Performancee", "main": "index", "typings": "index.d.ts", diff --git a/packages/firebase-performance/platforms/android/include.gradle b/packages/firebase-performance/platforms/android/include.gradle index acf735b2..ec7b7c88 100644 --- a/packages/firebase-performance/platforms/android/include.gradle +++ b/packages/firebase-performance/platforms/android/include.gradle @@ -5,7 +5,7 @@ repositories { } dependencies { - def computeFirebaseBomVersion = { -> project.hasProperty("firebaseBomVersion") ? firebaseBomVersion : "32.3.1" } + def computeFirebaseBomVersion = { -> project.hasProperty("firebaseBomVersion") ? firebaseBomVersion : "32.7.2" } implementation platform("com.google.firebase:firebase-bom:${computeFirebaseBomVersion}") implementation 'com.google.firebase:firebase-perf' } diff --git a/packages/firebase-performance/platforms/ios/Podfile b/packages/firebase-performance/platforms/ios/Podfile index 2263a8d4..43271f20 100644 --- a/packages/firebase-performance/platforms/ios/Podfile +++ b/packages/firebase-performance/platforms/ios/Podfile @@ -1,2 +1,2 @@ platform :ios, '12.0' -pod 'Firebase/Performance', '~>10.13.0' \ No newline at end of file +pod 'Firebase/Performance', '~>10.20.0' \ No newline at end of file diff --git a/packages/firebase-remote-config/package.json b/packages/firebase-remote-config/package.json index 20e7ebce..0b7cff40 100644 --- a/packages/firebase-remote-config/package.json +++ b/packages/firebase-remote-config/package.json @@ -1,6 +1,6 @@ { "name": "@nativescript/firebase-remote-config", - "version": "3.2.0", + "version": "3.2.1", "description": "NativeScript Firebase - Remote Config", "main": "index", "typings": "index.d.ts", diff --git a/packages/firebase-remote-config/platforms/android/firebase_remote_config.aar b/packages/firebase-remote-config/platforms/android/firebase_remote_config.aar index 8636604c..9c7d7b3d 100644 Binary files a/packages/firebase-remote-config/platforms/android/firebase_remote_config.aar and b/packages/firebase-remote-config/platforms/android/firebase_remote_config.aar differ diff --git a/packages/firebase-remote-config/platforms/android/include.gradle b/packages/firebase-remote-config/platforms/android/include.gradle index 816691d0..1ee8f1b6 100644 --- a/packages/firebase-remote-config/platforms/android/include.gradle +++ b/packages/firebase-remote-config/platforms/android/include.gradle @@ -1,5 +1,5 @@ dependencies { - def computeFirebaseBomVersion = { -> project.hasProperty("firebaseBomVersion") ? firebaseBomVersion : "32.3.1" } + def computeFirebaseBomVersion = { -> project.hasProperty("firebaseBomVersion") ? firebaseBomVersion : "32.7.2" } implementation platform("com.google.firebase:firebase-bom:${computeFirebaseBomVersion}") implementation 'com.google.firebase:firebase-config' implementation 'com.google.firebase:firebase-analytics' diff --git a/packages/firebase-remote-config/platforms/ios/Podfile b/packages/firebase-remote-config/platforms/ios/Podfile index 0af1dc9d..6bef6a5c 100644 --- a/packages/firebase-remote-config/platforms/ios/Podfile +++ b/packages/firebase-remote-config/platforms/ios/Podfile @@ -1,2 +1,2 @@ platform :ios, '12.0' -pod 'Firebase/RemoteConfig', '~>10.13.0' \ No newline at end of file +pod 'Firebase/RemoteConfig', '~>10.20.0' \ No newline at end of file diff --git a/packages/firebase-storage/package.json b/packages/firebase-storage/package.json index b7df57a8..7f13de1b 100644 --- a/packages/firebase-storage/package.json +++ b/packages/firebase-storage/package.json @@ -1,6 +1,6 @@ { "name": "@nativescript/firebase-storage", - "version": "3.2.0", + "version": "3.2.1", "description": "NativeScript Firebase - Storage", "main": "index", "typings": "index.d.ts", diff --git a/packages/firebase-storage/platforms/android/firebase_storage.aar b/packages/firebase-storage/platforms/android/firebase_storage.aar index 92de2208..c74f832d 100644 Binary files a/packages/firebase-storage/platforms/android/firebase_storage.aar and b/packages/firebase-storage/platforms/android/firebase_storage.aar differ diff --git a/packages/firebase-storage/platforms/android/include.gradle b/packages/firebase-storage/platforms/android/include.gradle index 4b380d9b..e73e8a42 100644 --- a/packages/firebase-storage/platforms/android/include.gradle +++ b/packages/firebase-storage/platforms/android/include.gradle @@ -1,5 +1,5 @@ dependencies { - def computeFirebaseBomVersion = { -> project.hasProperty("firebaseBomVersion") ? firebaseBomVersion : "32.3.1" } + def computeFirebaseBomVersion = { -> project.hasProperty("firebaseBomVersion") ? firebaseBomVersion : "32.7.2" } implementation platform("com.google.firebase:firebase-bom:${computeFirebaseBomVersion}") implementation 'com.google.firebase:firebase-storage' } \ No newline at end of file diff --git a/packages/firebase-storage/platforms/ios/Podfile b/packages/firebase-storage/platforms/ios/Podfile index c4245720..c3f30474 100644 --- a/packages/firebase-storage/platforms/ios/Podfile +++ b/packages/firebase-storage/platforms/ios/Podfile @@ -1,2 +1,2 @@ platform :ios, '12.0' -pod 'Firebase/Storage', '~>10.13.0' \ No newline at end of file +pod 'Firebase/Storage', '~>10.20.0' \ No newline at end of file diff --git a/packages/firebase-storage/typings/objc!FirebaseStorage.d.ts b/packages/firebase-storage/typings/objc!FirebaseStorage.d.ts index e285bdc2..9bbc097a 100644 --- a/packages/firebase-storage/typings/objc!FirebaseStorage.d.ts +++ b/packages/firebase-storage/typings/objc!FirebaseStorage.d.ts @@ -13,8 +13,6 @@ declare class FIRStorage extends NSObject { readonly app: FIRApp; - callbackQueue: NSObject; - maxDownloadRetryTime: number; maxOperationRetryTime: number; @@ -32,11 +30,13 @@ declare class FIRStorage extends NSObject { useEmulatorWithHostPort(host: string, port: number): void; } -declare class FIRStorageDownloadTask extends FIRStorageObservableTask implements FIRStorageTaskManagement { +declare class FIRStorageDownloadTask extends FIRStorageObservableTask implements FIRStorageTaskManagement, SDWebImageOperation { static alloc(): FIRStorageDownloadTask; // inherited from NSObject static new(): FIRStorageDownloadTask; // inherited from NSObject + readonly cancelled: boolean; // inherited from SDWebImageOperation + readonly debugDescription: string; // inherited from NSObjectProtocol readonly description: string; // inherited from NSObjectProtocol diff --git a/packages/firebase-ui/package.json b/packages/firebase-ui/package.json index 403db2cb..dd516dbb 100644 --- a/packages/firebase-ui/package.json +++ b/packages/firebase-ui/package.json @@ -1,6 +1,6 @@ { "name": "@nativescript/firebase-ui", - "version": "3.2.0", + "version": "3.2.1", "description": "NativeScript Firebase - UI", "main": "index", "typings": "index.d.ts", diff --git a/packages/firebase-ui/platforms/android/firebase_ui.aar b/packages/firebase-ui/platforms/android/firebase_ui.aar index b64997f9..fbe1c11b 100644 Binary files a/packages/firebase-ui/platforms/android/firebase_ui.aar and b/packages/firebase-ui/platforms/android/firebase_ui.aar differ