diff --git a/CHANGELOG.md b/CHANGELOG.md index 1d9d1f47..b2fb65a3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,13 @@ +# [3.2.0](https://github.com/NativeScript/firebase/compare/3.1.3...3.2.0) (2023-09-24) + + +### Features + +* add npm keywords ([#237](https://github.com/NativeScript/firebase/issues/237)) ([663fcf0](https://github.com/NativeScript/firebase/commit/663fcf00be65f86c2a15086e71f124526f3398c8)) +* switch to playintegrity ([095083c](https://github.com/NativeScript/firebase/commit/095083c6ebf6682c123b1cdf4c45a94813255041)) + + + ## [3.1.3](https://github.com/NativeScript/firebase/compare/3.1.2...3.1.3) (2023-07-19) diff --git a/apps/demo/package.json b/apps/demo/package.json index 6253bce2..faa22f78 100644 --- a/apps/demo/package.json +++ b/apps/demo/package.json @@ -27,7 +27,7 @@ "@nativescript/firebase-ui": "file:../../packages/firebase-ui" }, "devDependencies": { - "@nativescript/android": "~8.4.0", - "@nativescript/ios": "~8.4.0" + "@nativescript/android": "~8.5.3", + "@nativescript/ios": "~8.5.2" } } diff --git a/package.json b/package.json index a196346c..04d835b5 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "plugins", - "version": "3.1.3", + "version": "3.2.0", "license": "MIT", "scripts": { "postinstall": "husky install && npx ts-patch install", diff --git a/packages/firebase-admob/index.android.ts b/packages/firebase-admob/index.android.ts index 991bd39f..943803ad 100644 --- a/packages/firebase-admob/index.android.ts +++ b/packages/firebase-admob/index.android.ts @@ -590,7 +590,7 @@ export class BannerAdSize extends BannerAdSizeBase { } } - static createInLineAdaptiveBanner(width: number, maxHeight: number = 0, orientation: 'portrait' | 'landscape' | 'device' = 'device'): BannerAdSize { + static createInLineAdaptiveBanner(width: number, maxHeight = 0, orientation: 'portrait' | 'landscape' | 'device' = 'device'): BannerAdSize { if (maxHeight > 0) { BannerAdSize.fromNative(com.google.android.gms.ads.AdSize.getInlineAdaptiveBannerAdSize(width, maxHeight)); } @@ -676,7 +676,7 @@ export class Admob implements IAdmob { if (defaultAdmob) { return defaultAdmob; } - defaultAdmob = this; + defaultAdmob = this as Admob; } static init(): Promise<{ [key: string]: AdapterStatus }> { @@ -719,7 +719,7 @@ export class Admob implements IAdmob { } get requestConfiguration(): RequestConfiguration { - let ret: RequestConfiguration = {}; + const ret: RequestConfiguration = {}; const config = com.google.android.gms.ads.MobileAds.getRequestConfiguration(); switch (config.getTagForChildDirectedTreatment()) { diff --git a/packages/firebase-admob/package.json b/packages/firebase-admob/package.json index 6ce6ca8f..f129fb45 100644 --- a/packages/firebase-admob/package.json +++ b/packages/firebase-admob/package.json @@ -1,6 +1,6 @@ { "name": "@nativescript/firebase-admob", - "version": "3.1.3", + "version": "3.2.0", "description": "NativeScript Firebase - Admob", "main": "index", "typings": "index.d.ts", @@ -19,7 +19,10 @@ "JavaScript", "TypeScript", "iOS", - "Android" + "Android", + "Firebase", + "Ads", + "AdMob" ], "author": { "name": "NativeScript", diff --git a/packages/firebase-admob/platforms/android/firebase_admob.aar b/packages/firebase-admob/platforms/android/firebase_admob.aar index d899b616..c2f54ee4 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/package.json b/packages/firebase-analytics/package.json index aad3c0cb..685c36b3 100644 --- a/packages/firebase-analytics/package.json +++ b/packages/firebase-analytics/package.json @@ -1,6 +1,6 @@ { "name": "@nativescript/firebase-analytics", - "version": "3.1.3", + "version": "3.2.0", "description": "NativeScript Firebase - Analytics", "main": "index", "typings": "index.d.ts", @@ -26,7 +26,11 @@ "JavaScript", "TypeScript", "iOS", - "Android" + "Android", + "Firebase", + "Analytics", + "Tracking", + "Events" ], "author": { "name": "NativeScript", diff --git a/packages/firebase-analytics/platforms/android/include.gradle b/packages/firebase-analytics/platforms/android/include.gradle index 4fc05913..a0989f89 100644 --- a/packages/firebase-analytics/platforms/android/include.gradle +++ b/packages/firebase-analytics/platforms/android/include.gradle @@ -1,6 +1,5 @@ dependencies { - def computeFirebaseBomVersion = { -> project.hasProperty("firebaseBomVersion") ? firebaseBomVersion : "31.2.3" } + def computeFirebaseBomVersion = { -> project.hasProperty("firebaseBomVersion") ? firebaseBomVersion : "32.3.1" } 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 52b98626..7851af38 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.7.0' + pod 'Firebase/AnalyticsWithoutAdIdSupport', '~>10.13.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.7.0' + pod 'Firebase/Analytics', '~>10.13.0' end diff --git a/packages/firebase-app-check-debug/package.json b/packages/firebase-app-check-debug/package.json index 4271111c..35031ab6 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.1.3", + "version": "3.2.0", "description": "NativeScript Firebase - App Check", "main": "index", "typings": "index.d.ts", @@ -19,7 +19,12 @@ "JavaScript", "TypeScript", "iOS", - "Android" + "Android", + "Firebase", + "AppCheck", + "Attestation", + "Security", + "Tamper" ], "author": { "name": "NativeScript", 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 4e501faf..5dad4a1f 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 6eb8ea44..8d0fa785 100644 --- a/packages/firebase-app-check-debug/platforms/android/include.gradle +++ b/packages/firebase-app-check-debug/platforms/android/include.gradle @@ -1,6 +1,5 @@ dependencies { - def computeFirebaseBomVersion = { -> project.hasProperty("firebaseBomVersion") ? firebaseBomVersion : "31.2.3" } - implementation platform("com.google.firebase:firebase-bom:${computeFirebaseBomVersion}") - - implementation 'com.google.firebase:firebase-appcheck-debug' + def computeFirebaseBomVersion = { -> project.hasProperty("firebaseBomVersion") ? firebaseBomVersion : "32.3.1" } + 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 b6949168..69555796 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.7.0' \ No newline at end of file +pod 'Firebase/AppCheck', '~>10.13.0' \ No newline at end of file diff --git a/packages/firebase-app-check/index.android.ts b/packages/firebase-app-check/index.android.ts index 6ab83b47..72322242 100644 --- a/packages/firebase-app-check/index.android.ts +++ b/packages/firebase-app-check/index.android.ts @@ -130,7 +130,7 @@ export class AppCheck implements IAppCheck { if (customProvider) { this.native.installAppCheckProviderFactory(customProvider.native); } else { - this.native.installAppCheckProviderFactory(com.google.firebase.appcheck.safetynet.SafetyNetAppCheckProviderFactory.getInstance()); + this.native.installAppCheckProviderFactory(com.google.firebase.appcheck.playintegrity.PlayIntegrityAppCheckProviderFactory.getInstance()); } } diff --git a/packages/firebase-app-check/package.json b/packages/firebase-app-check/package.json index 9cdf56e5..1e85f641 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.1.3", + "version": "3.2.0", "description": "NativeScript Firebase - App Check", "main": "index", "typings": "index.d.ts", @@ -19,7 +19,12 @@ "JavaScript", "TypeScript", "iOS", - "Android" + "Android", + "Firebase", + "AppCheck", + "Attestation", + "Security", + "Tamper" ], "author": { "name": "NativeScript", 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 dbca0dc1..e08c3450 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 4f0b090a..ad5e1d18 100644 --- a/packages/firebase-app-check/platforms/android/include.gradle +++ b/packages/firebase-app-check/platforms/android/include.gradle @@ -1,6 +1,5 @@ dependencies { - def computeFirebaseBomVersion = { -> project.hasProperty("firebaseBomVersion") ? firebaseBomVersion : "31.2.3" } - implementation platform("com.google.firebase:firebase-bom:${computeFirebaseBomVersion}") - - implementation 'com.google.firebase:firebase-appcheck-safetynet' -} \ No newline at end of file + def computeFirebaseBomVersion = { -> project.hasProperty("firebaseBomVersion") ? firebaseBomVersion : "32.3.1" } + 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 b6949168..69555796 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.7.0' \ No newline at end of file +pod 'Firebase/AppCheck', '~>10.13.0' \ No newline at end of file diff --git a/packages/firebase-app-check/typings/android.d.ts b/packages/firebase-app-check/typings/android.d.ts index 2215cb80..9b015747 100644 --- a/packages/firebase-app-check/typings/android.d.ts +++ b/packages/firebase-app-check/typings/android.d.ts @@ -1,15 +1,13 @@ -declare module com { - export module google { - export module firebase { - export module appcheck { +declare namespace com { + export namespace google { + export namespace firebase { + export namespace appcheck { export class AppCheckProvider { public static class: java.lang.Class; /** * Constructs a new instance of the com.google.firebase.appcheck.AppCheckProvider interface with the provided implementation. An empty constructor exists calling super() when extending the interface class. */ - public constructor(implementation: { - getToken(): com.google.android.gms.tasks.Task; - }); + public constructor(implementation: { getToken(): com.google.android.gms.tasks.Task }); public constructor(); public getToken(): com.google.android.gms.tasks.Task; } @@ -18,18 +16,16 @@ declare module com { } } -declare module com { - export module google { - export module firebase { - export module appcheck { +declare namespace com { + export namespace google { + export namespace firebase { + export namespace appcheck { export class AppCheckProviderFactory { public static class: java.lang.Class; /** * Constructs a new instance of the com.google.firebase.appcheck.AppCheckProviderFactory interface with the provided implementation. An empty constructor exists calling super() when extending the interface class. */ - public constructor(implementation: { - create(param0: com.google.firebase.FirebaseApp): com.google.firebase.appcheck.AppCheckProvider; - }); + public constructor(implementation: { create(param0: com.google.firebase.FirebaseApp): com.google.firebase.appcheck.AppCheckProvider }); public constructor(); public create(param0: com.google.firebase.FirebaseApp): com.google.firebase.appcheck.AppCheckProvider; } @@ -38,10 +34,10 @@ declare module com { } } -declare module com { - export module google { - export module firebase { - export module appcheck { +declare namespace com { + export namespace google { + export namespace firebase { + export namespace appcheck { export abstract class AppCheckToken { public static class: java.lang.Class; public getExpireTimeMillis(): number; @@ -53,32 +49,15 @@ declare module com { } } -declare module com { - export module google { - export module firebase { - export module appcheck { - export abstract class AppCheckTokenResult { - public static class: java.lang.Class; - public getError(): com.google.firebase.FirebaseException; - public constructor(); - public getToken(): string; - } - } - } - } -} - -declare module com { - export module google { - export module firebase { - export module appcheck { +declare namespace com { + export namespace google { + export namespace firebase { + export namespace appcheck { export class BuildConfig { public static class: java.lang.Class; public static DEBUG: boolean; - public static APPLICATION_ID: string; + public static LIBRARY_PACKAGE_NAME: string; public static BUILD_TYPE: string; - public static FLAVOR: string; - public static VERSION_CODE: number; public static VERSION_NAME: string; public constructor(); } @@ -87,34 +66,30 @@ declare module com { } } -declare module com { - export module google { - export module firebase { - export module appcheck { - export abstract class FirebaseAppCheck extends com.google.firebase.appcheck.interop.InternalAppCheckTokenProvider { +declare namespace com { + export namespace google { + export namespace firebase { + export namespace appcheck { + export abstract class FirebaseAppCheck { public static class: java.lang.Class; public static getInstance(param0: com.google.firebase.FirebaseApp): com.google.firebase.appcheck.FirebaseAppCheck; - public addAppCheckTokenListener(param0: com.google.firebase.appcheck.interop.AppCheckTokenListener): void; public constructor(); public installAppCheckProviderFactory(param0: com.google.firebase.appcheck.AppCheckProviderFactory): void; public addAppCheckListener(param0: com.google.firebase.appcheck.FirebaseAppCheck.AppCheckListener): void; public installAppCheckProviderFactory(param0: com.google.firebase.appcheck.AppCheckProviderFactory, param1: boolean): void; - public removeAppCheckTokenListener(param0: com.google.firebase.appcheck.interop.AppCheckTokenListener): void; public setTokenAutoRefreshEnabled(param0: boolean): void; public static getInstance(): com.google.firebase.appcheck.FirebaseAppCheck; public removeAppCheckListener(param0: com.google.firebase.appcheck.FirebaseAppCheck.AppCheckListener): void; - public getToken(param0: boolean): com.google.android.gms.tasks.Task; + public getLimitedUseAppCheckToken(): com.google.android.gms.tasks.Task; public getAppCheckToken(param0: boolean): com.google.android.gms.tasks.Task; } - export module FirebaseAppCheck { + export namespace FirebaseAppCheck { export class AppCheckListener { public static class: java.lang.Class; /** * Constructs a new instance of the com.google.firebase.appcheck.FirebaseAppCheck$AppCheckListener interface with the provided implementation. An empty constructor exists calling super() when extending the interface class. */ - public constructor(implementation: { - onAppCheckTokenChanged(param0: com.google.firebase.appcheck.AppCheckToken): void; - }); + public constructor(implementation: { onAppCheckTokenChanged(param0: com.google.firebase.appcheck.AppCheckToken): void }); public constructor(); public onAppCheckTokenChanged(param0: com.google.firebase.appcheck.AppCheckToken): void; } @@ -124,10 +99,10 @@ declare module com { } } -declare module com { - export module google { - export module firebase { - export module appcheck { +declare namespace com { + export namespace google { + export namespace firebase { + export namespace appcheck { export class FirebaseAppCheckRegistrar { public static class: java.lang.Class; public constructor(); @@ -138,16 +113,16 @@ declare module com { } } -declare module com { - export module google { - export module firebase { - export module appcheck { - export module internal { +declare namespace com { + export namespace google { + export namespace firebase { + export namespace appcheck { + export namespace internal { export class AppCheckTokenResponse { public static class: java.lang.Class; public getTimeToLive(): string; public static fromJsonString(param0: string): com.google.firebase.appcheck.internal.AppCheckTokenResponse; - public getAttestationToken(): string; + public getToken(): string; } } } @@ -155,11 +130,11 @@ declare module com { } } -declare module com { - export module google { - export module firebase { - export module appcheck { - export module internal { +declare namespace com { + export namespace google { + export namespace firebase { + export namespace appcheck { + export namespace internal { export class DefaultAppCheckToken extends com.google.firebase.appcheck.AppCheckToken { public static class: java.lang.Class; public static constructFromRawToken(param0: string): com.google.firebase.appcheck.internal.DefaultAppCheckToken; @@ -173,15 +148,15 @@ declare module com { } } -declare module com { - export module google { - export module firebase { - export module appcheck { - export module internal { - export class DefaultAppCheckTokenResult extends com.google.firebase.appcheck.AppCheckTokenResult { +declare namespace com { + export namespace google { + export namespace firebase { + export namespace appcheck { + export namespace internal { + export class DefaultAppCheckTokenResult { public static class: java.lang.Class; public static constructFromAppCheckToken(param0: com.google.firebase.appcheck.AppCheckToken): com.google.firebase.appcheck.internal.DefaultAppCheckTokenResult; - public getError(): com.google.firebase.FirebaseException; + public getError(): java.lang.Exception; public static constructFromError(param0: com.google.firebase.FirebaseException): com.google.firebase.appcheck.internal.DefaultAppCheckTokenResult; public getToken(): string; } @@ -191,26 +166,28 @@ declare module com { } } -declare module com { - export module google { - export module firebase { - export module appcheck { - export module internal { +declare namespace com { + export namespace google { + export namespace firebase { + export namespace appcheck { + export namespace internal { export class DefaultFirebaseAppCheck extends com.google.firebase.appcheck.FirebaseAppCheck { public static class: java.lang.Class; public constructor(); public getAppCheckToken(param0: boolean): com.google.android.gms.tasks.Task; public addAppCheckListener(param0: com.google.firebase.appcheck.FirebaseAppCheck.AppCheckListener): void; - public constructor(param0: com.google.firebase.FirebaseApp, param1: com.google.firebase.inject.Provider, param2: com.google.firebase.inject.Provider); public getToken(param0: boolean): com.google.android.gms.tasks.Task; public getInstalledAppCheckProviderFactory(): com.google.firebase.appcheck.AppCheckProviderFactory; public removeAppCheckTokenListener(param0: com.google.firebase.appcheck.interop.AppCheckTokenListener): void; public removeAppCheckListener(param0: com.google.firebase.appcheck.FirebaseAppCheck.AppCheckListener): void; + public getLimitedUseToken(): com.google.android.gms.tasks.Task; public installAppCheckProviderFactory(param0: com.google.firebase.appcheck.AppCheckProviderFactory, param1: boolean): void; + public constructor(param0: com.google.firebase.FirebaseApp, param1: com.google.firebase.inject.Provider, param2: java.util.concurrent.Executor, param3: java.util.concurrent.Executor, param4: java.util.concurrent.Executor, param5: java.util.concurrent.ScheduledExecutorService); public resetAppCheckState(): void; public installAppCheckProviderFactory(param0: com.google.firebase.appcheck.AppCheckProviderFactory): void; public addAppCheckTokenListener(param0: com.google.firebase.appcheck.interop.AppCheckTokenListener): void; public setTokenAutoRefreshEnabled(param0: boolean): void; + public getLimitedUseAppCheckToken(): com.google.android.gms.tasks.Task; } } } @@ -218,11 +195,11 @@ declare module com { } } -declare module com { - export module google { - export module firebase { - export module appcheck { - export module internal { +declare namespace com { + export namespace google { + export namespace firebase { + export namespace appcheck { + export namespace internal { export class DefaultTokenRefresher { public static class: java.lang.Class; public scheduleRefresh(param0: number): void; @@ -234,11 +211,11 @@ declare module com { } } -declare module com { - export module google { - export module firebase { - export module appcheck { - export module internal { +declare namespace com { + export namespace google { + export namespace firebase { + export namespace appcheck { + export namespace internal { export class HttpErrorResponse { public static class: java.lang.Class; public getErrorMessage(): string; @@ -251,27 +228,28 @@ declare module com { } } -declare module com { - export module google { - export module firebase { - export module appcheck { - export module internal { +declare namespace com { + export namespace google { + export namespace firebase { + export namespace appcheck { + export namespace internal { export class NetworkClient { public static class: java.lang.Class; public static UNKNOWN: number; public static SAFETY_NET: number; public static DEBUG: number; - public exchangeAttestationForAppCheckToken(param0: native.Array, param1: number): com.google.firebase.appcheck.internal.AppCheckTokenResponse; + public static PLAY_INTEGRITY: number; + public generatePlayIntegrityChallenge(param0: androidNative.Array, param1: com.google.firebase.appcheck.internal.RetryManager): string; + public exchangeAttestationForAppCheckToken(param0: androidNative.Array, param1: number, param2: com.google.firebase.appcheck.internal.RetryManager): com.google.firebase.appcheck.internal.AppCheckTokenResponse; public constructor(param0: com.google.firebase.FirebaseApp); } - export module NetworkClient { + export namespace NetworkClient { export class AttestationTokenType { public static class: java.lang.Class; /** * Constructs a new instance of the com.google.firebase.appcheck.internal.NetworkClient$AttestationTokenType interface with the provided implementation. An empty constructor exists calling super() when extending the interface class. */ - public constructor(implementation: { - }); + public constructor(implementation: {}); public constructor(); } } @@ -281,23 +259,41 @@ declare module com { } } -declare module com { - export module google { - export module firebase { - export module appcheck { - export module internal { +declare namespace com { + export namespace google { + export namespace firebase { + export namespace appcheck { + export namespace internal { + export class RetryManager { + public static class: java.lang.Class; + public resetBackoffOnSuccess(): void; + public constructor(); + public canRetry(): boolean; + public updateBackoffOnFailure(param0: number): void; + } + } + } + } + } +} + +declare namespace com { + export namespace google { + export namespace firebase { + export namespace appcheck { + export namespace internal { export class StorageHelper { public static class: java.lang.Class; public saveAppCheckToken(param0: com.google.firebase.appcheck.AppCheckToken): void; public retrieveAppCheckToken(): com.google.firebase.appcheck.AppCheckToken; public constructor(param0: globalAndroid.content.Context, param1: string); } - export module StorageHelper { + export namespace StorageHelper { export class TokenType { public static class: java.lang.Class; public static DEFAULT_APP_CHECK_TOKEN: com.google.firebase.appcheck.internal.StorageHelper.TokenType; public static UNKNOWN_APP_CHECK_TOKEN: com.google.firebase.appcheck.internal.StorageHelper.TokenType; - public static values(): native.Array; + public static values(): androidNative.Array; public static valueOf(param0: string): com.google.firebase.appcheck.internal.StorageHelper.TokenType; } } @@ -307,11 +303,11 @@ declare module com { } } -declare module com { - export module google { - export module firebase { - export module appcheck { - export module internal { +declare namespace com { + export namespace google { + export namespace firebase { + export namespace appcheck { + export namespace internal { export class TokenRefreshManager { public static class: java.lang.Class; public maybeScheduleTokenRefresh(param0: com.google.firebase.appcheck.AppCheckToken): void; @@ -324,24 +320,22 @@ declare module com { } } -declare module com { - export module google { - export module firebase { - export module appcheck { - export module internal { - export module util { +declare namespace com { + export namespace google { + export namespace firebase { + export namespace appcheck { + export namespace internal { + export namespace util { export class Clock { public static class: java.lang.Class; /** * Constructs a new instance of the com.google.firebase.appcheck.internal.util.Clock interface with the provided implementation. An empty constructor exists calling super() when extending the interface class. */ - public constructor(implementation: { - currentTimeMillis(): number; - }); + public constructor(implementation: { currentTimeMillis(): number }); public constructor(); public currentTimeMillis(): number; } - export module Clock { + export namespace Clock { export class DefaultClock extends com.google.firebase.appcheck.internal.util.Clock { public static class: java.lang.Class; public currentTimeMillis(): number; @@ -355,12 +349,12 @@ declare module com { } } -declare module com { - export module google { - export module firebase { - export module appcheck { - export module internal { - export module util { +declare namespace com { + export namespace google { + export namespace firebase { + export namespace appcheck { + export namespace internal { + export namespace util { export class Logger { public static class: java.lang.Class; public static TAG: string; @@ -386,16 +380,16 @@ declare module com { } } -declare module com { - export module google { - export module firebase { - export module appcheck { - export module internal { - export module util { +declare namespace com { + export namespace google { + export namespace firebase { + export namespace appcheck { + export namespace internal { + export namespace util { export class TokenParser { public static class: java.lang.Class; public constructor(); - public static parseTokenClaims(param0: string): java.util.Map; + public static parseTokenClaims(param0: string): java.util.Map; } } } @@ -404,21 +398,18 @@ declare module com { } } -declare module com { - export module google { - export module firebase { - export module appcheck { - export module interop { - export class AppCheckTokenListener { - public static class: java.lang.Class; - /** - * Constructs a new instance of the com.google.firebase.appcheck.interop.AppCheckTokenListener interface with the provided implementation. An empty constructor exists calling super() when extending the interface class. - */ - public constructor(implementation: { - onAppCheckTokenChanged(param0: com.google.firebase.appcheck.AppCheckTokenResult): void; - }); +declare namespace com { + export namespace google { + export namespace firebase { + export namespace appcheck { + export namespace playintegrity { + export class BuildConfig { + public static class: java.lang.Class; + public static DEBUG: boolean; + public static LIBRARY_PACKAGE_NAME: string; + public static BUILD_TYPE: string; + public static VERSION_NAME: string; public constructor(); - public onAppCheckTokenChanged(param0: com.google.firebase.appcheck.AppCheckTokenResult): void; } } } @@ -426,20 +417,15 @@ declare module com { } } -declare module com { - export module google { - export module firebase { - export module appcheck { - export module interop { - export class BuildConfig { - public static class: java.lang.Class; - public static DEBUG: boolean; - public static APPLICATION_ID: string; - public static BUILD_TYPE: string; - public static FLAVOR: string; - public static VERSION_CODE: number; - public static VERSION_NAME: string; +declare namespace com { + export namespace google { + export namespace firebase { + export namespace appcheck { + export namespace playintegrity { + export class FirebaseAppCheckPlayIntegrityRegistrar { + public static class: java.lang.Class; public constructor(); + public getComponents(): java.util.List>; } } } @@ -447,25 +433,16 @@ declare module com { } } -declare module com { - export module google { - export module firebase { - export module appcheck { - export module interop { - export class InternalAppCheckTokenProvider { - public static class: java.lang.Class; - /** - * Constructs a new instance of the com.google.firebase.appcheck.interop.InternalAppCheckTokenProvider interface with the provided implementation. An empty constructor exists calling super() when extending the interface class. - */ - public constructor(implementation: { - getToken(param0: boolean): com.google.android.gms.tasks.Task; - addAppCheckTokenListener(param0: com.google.firebase.appcheck.interop.AppCheckTokenListener): void; - removeAppCheckTokenListener(param0: com.google.firebase.appcheck.interop.AppCheckTokenListener): void; - }); +declare namespace com { + export namespace google { + export namespace firebase { + export namespace appcheck { + export namespace playintegrity { + export class PlayIntegrityAppCheckProviderFactory extends com.google.firebase.appcheck.AppCheckProviderFactory { + public static class: java.lang.Class; public constructor(); - public getToken(param0: boolean): com.google.android.gms.tasks.Task; - public removeAppCheckTokenListener(param0: com.google.firebase.appcheck.interop.AppCheckTokenListener): void; - public addAppCheckTokenListener(param0: com.google.firebase.appcheck.interop.AppCheckTokenListener): void; + public static getInstance(): com.google.firebase.appcheck.playintegrity.PlayIntegrityAppCheckProviderFactory; + public create(param0: com.google.firebase.FirebaseApp): com.google.firebase.appcheck.AppCheckProvider; } } } @@ -473,20 +450,17 @@ declare module com { } } -declare module com { - export module google { - export module firebase { - export module appcheck { - export module safetynet { - export class BuildConfig { - public static class: java.lang.Class; - public static DEBUG: boolean; - public static APPLICATION_ID: string; - public static BUILD_TYPE: string; - public static FLAVOR: string; - public static VERSION_CODE: number; - public static VERSION_NAME: string; - public constructor(); +declare namespace com { + export namespace google { + export namespace firebase { + export namespace appcheck { + export namespace playintegrity { + export namespace internal { + export class ExchangePlayIntegrityTokenRequest { + public static class: java.lang.Class; + public constructor(param0: string); + public toJsonString(): string; + } } } } @@ -494,15 +468,17 @@ declare module com { } } -declare module com { - export module google { - export module firebase { - export module appcheck { - export module safetynet { - export class SafetyNetAppCheckProviderFactory extends com.google.firebase.appcheck.AppCheckProviderFactory { - public static class: java.lang.Class; - public static getInstance(): com.google.firebase.appcheck.safetynet.SafetyNetAppCheckProviderFactory; - public create(param0: com.google.firebase.FirebaseApp): com.google.firebase.appcheck.AppCheckProvider; +declare namespace com { + export namespace google { + export namespace firebase { + export namespace appcheck { + export namespace playintegrity { + export namespace internal { + export class GeneratePlayIntegrityChallengeRequest { + public static class: java.lang.Class; + public constructor(); + public toJsonString(): string; + } } } } @@ -510,16 +486,17 @@ declare module com { } } -declare module com { - export module google { - export module firebase { - export module appcheck { - export module safetynet { - export module internal { - export class ExchangeSafetyNetTokenRequest { - public static class: java.lang.Class; - public constructor(param0: string); - public toJsonString(): string; +declare namespace com { + export namespace google { + export namespace firebase { + export namespace appcheck { + export namespace playintegrity { + export namespace internal { + export class GeneratePlayIntegrityChallengeResponse { + public static class: java.lang.Class; + public static fromJsonString(param0: string): com.google.firebase.appcheck.playintegrity.internal.GeneratePlayIntegrityChallengeResponse; + public getTimeToLive(): string; + public getChallenge(): string; } } } @@ -528,18 +505,16 @@ declare module com { } } -declare module com { - export module google { - export module firebase { - export module appcheck { - export module safetynet { - export module internal { - export class SafetyNetAppCheckProvider extends com.google.firebase.appcheck.AppCheckProvider { - public static class: java.lang.Class; - public constructor(param0: com.google.firebase.FirebaseApp); - public exchangeSafetyNetJwsResultForToken(param0: string): com.google.android.gms.tasks.Task; +declare namespace com { + export namespace google { + export namespace firebase { + export namespace appcheck { + export namespace playintegrity { + export namespace internal { + export class PlayIntegrityAppCheckProvider extends com.google.firebase.appcheck.AppCheckProvider { + public static class: java.lang.Class; public getToken(): com.google.android.gms.tasks.Task; - public exchangeSafetyNetAttestationResponseForToken(param0: com.google.android.gms.safetynet.SafetyNetApi.AttestationResponse): com.google.android.gms.tasks.Task; + public constructor(param0: com.google.firebase.FirebaseApp, param1: java.util.concurrent.Executor, param2: java.util.concurrent.Executor); } } } @@ -549,4 +524,3 @@ declare module com { } //Generics information: - diff --git a/packages/firebase-auth/package.json b/packages/firebase-auth/package.json index 1f4ba6d3..4c3c2a0c 100644 --- a/packages/firebase-auth/package.json +++ b/packages/firebase-auth/package.json @@ -1,6 +1,6 @@ { "name": "@nativescript/firebase-auth", - "version": "3.1.3", + "version": "3.2.0", "description": "NativeScript Firebase - Auth", "main": "index", "typings": "index.d.ts", @@ -19,7 +19,21 @@ "JavaScript", "TypeScript", "iOS", - "Android" + "Android", + "Firebase", + "Auth", + "Authentication", + "Login", + "Log-in", + "Sign in", + "Sign-in", + "User", + "Apple", + "Facebook", + "Twitter", + "GitHub", + "Google", + "Phone Number" ], "author": { "name": "NativeScript", diff --git a/packages/firebase-auth/platforms/android/firebase_auth.aar b/packages/firebase-auth/platforms/android/firebase_auth.aar index 99000757..cd9bf048 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 1d7c9114..a64b6d91 100644 --- a/packages/firebase-auth/platforms/android/include.gradle +++ b/packages/firebase-auth/platforms/android/include.gradle @@ -1,6 +1,5 @@ dependencies { - def computeFirebaseBomVersion = { -> project.hasProperty("firebaseBomVersion") ? firebaseBomVersion : "31.2.3" } + def computeFirebaseBomVersion = { -> project.hasProperty("firebaseBomVersion") ? firebaseBomVersion : "32.3.1" } 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 215160b9..99bc83ff 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.7.0' \ No newline at end of file +pod 'Firebase/Auth', '~>10.13.0' \ No newline at end of file diff --git a/packages/firebase-core/package.json b/packages/firebase-core/package.json index 0c71ecec..67173590 100644 --- a/packages/firebase-core/package.json +++ b/packages/firebase-core/package.json @@ -1,6 +1,6 @@ { "name": "@nativescript/firebase-core", - "version": "3.1.3", + "version": "3.2.0", "description": "NativeScript Firebase - Core", "main": "index", "typings": "index.d.ts", @@ -19,7 +19,27 @@ "JavaScript", "TypeScript", "iOS", - "Android" + "Android", + "Firebase", + "Firestore", + "Database", + "Authentication", + "Push Notifications", + "Notifications", + "Messaging", + "Remote Configuration", + "Storage", + "Crashlytics", + "Analytics", + "Facebook", + "Google", + "Ads", + "AdMob", + "In-App Messaging", + "Performance Monitoring", + "Dynamic Links", + "Cloud Functions", + "Functions" ], "author": { "name": "NativeScript", diff --git a/packages/firebase-core/platforms/android/firebase_core.aar b/packages/firebase-core/platforms/android/firebase_core.aar index 33bcc69f..6918aa9d 100644 Binary files a/packages/firebase-core/platforms/android/firebase_core.aar and b/packages/firebase-core/platforms/android/firebase_core.aar differ diff --git a/packages/firebase-core/platforms/android/include.gradle b/packages/firebase-core/platforms/android/include.gradle index e7508300..8f6a9ee7 100644 --- a/packages/firebase-core/platforms/android/include.gradle +++ b/packages/firebase-core/platforms/android/include.gradle @@ -2,9 +2,6 @@ if (!project.hasProperty("tempBuild")) { apply plugin: 'com.google.gms.google-services' } dependencies { - def computeKotlinVersion = { -> project.hasProperty("kotlinVersion") ? kotlinVersion : "1.4.32" } - implementation "org.jetbrains.kotlin:kotlin-stdlib:$computeKotlinVersion" - - def computeFirebaseBomVersion = { -> project.hasProperty("firebaseBomVersion") ? firebaseBomVersion : "31.2.3" } + def computeFirebaseBomVersion = { -> project.hasProperty("firebaseBomVersion") ? firebaseBomVersion : "32.3.1" } implementation platform("com.google.firebase:firebase-bom:${computeFirebaseBomVersion}") } diff --git a/packages/firebase-crashlytics/README.md b/packages/firebase-crashlytics/README.md index d20a783d..2404dd55 100644 --- a/packages/firebase-crashlytics/README.md +++ b/packages/firebase-crashlytics/README.md @@ -145,7 +145,7 @@ The Crashlytics class has the following members. | --------- | --------------- | ----------- | | `ios` | | _readonly_ | | `android` | _readonly_ | -| `app` | [FirebaseApp]() | _readonly_ | +| `app` | [FirebaseApp](https://firebase.google.com/docs/reference/android/com/google/firebase/FirebaseApp) | _readonly_ | #### Methods diff --git a/packages/firebase-crashlytics/package.json b/packages/firebase-crashlytics/package.json index c32b63cb..f9f23be2 100644 --- a/packages/firebase-crashlytics/package.json +++ b/packages/firebase-crashlytics/package.json @@ -1,6 +1,6 @@ { "name": "@nativescript/firebase-crashlytics", - "version": "3.1.3", + "version": "3.2.0", "description": "NativeScript Firebase - Crashlytics", "main": "index", "typings": "index.d.ts", @@ -19,7 +19,14 @@ "JavaScript", "TypeScript", "iOS", - "Android" + "Android", + "Firebase", + "Crashlytics", + "Crash", + "Error", + "Logging", + "Tracking", + "Reporting" ], "author": { "name": "NativeScript", diff --git a/packages/firebase-crashlytics/platforms/android/firebase_crashlytics.aar b/packages/firebase-crashlytics/platforms/android/firebase_crashlytics.aar index 41c0f65c..7d99dd2c 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 cf902709..ada511b9 100644 --- a/packages/firebase-crashlytics/platforms/android/include.gradle +++ b/packages/firebase-crashlytics/platforms/android/include.gradle @@ -1,7 +1,6 @@ dependencies { - def computeFirebaseBomVersion = { -> project.hasProperty("firebaseBomVersion") ? firebaseBomVersion : "31.2.3" } + def computeFirebaseBomVersion = { -> project.hasProperty("firebaseBomVersion") ? firebaseBomVersion : "32.3.1" } 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 b03aba9c..2618d6f0 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.7.0' \ No newline at end of file +pod 'Firebase/Crashlytics', '~>10.13.0' \ No newline at end of file diff --git a/packages/firebase-database/index.android.ts b/packages/firebase-database/index.android.ts index 5f11ad32..bcf7fc7a 100644 --- a/packages/firebase-database/index.android.ts +++ b/packages/firebase-database/index.android.ts @@ -661,7 +661,7 @@ export class Database implements IDatabase { this._persistenceCacheSizeBytes = bytes; } catch (e) {} } - _persistenceEnabled: boolean = false; + _persistenceEnabled = false; get persistenceEnabled(): boolean { return this._persistenceEnabled; } diff --git a/packages/firebase-database/package.json b/packages/firebase-database/package.json index fd282aff..601bbff4 100644 --- a/packages/firebase-database/package.json +++ b/packages/firebase-database/package.json @@ -1,6 +1,6 @@ { "name": "@nativescript/firebase-database", - "version": "3.1.3", + "version": "3.2.0", "description": "NativeScript Firebase - Database", "main": "index", "typings": "index.d.ts", @@ -19,7 +19,14 @@ "JavaScript", "TypeScript", "iOS", - "Android" + "Android", + "Firebase", + "Database", + "Realtime", + "Offline", + "NoSQL", + "Query", + "Sync" ], "author": { "name": "NativeScript", diff --git a/packages/firebase-database/platforms/android/firebase_database.aar b/packages/firebase-database/platforms/android/firebase_database.aar index bda6a995..165438ec 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 9b3e2804..8bf0dba0 100644 --- a/packages/firebase-database/platforms/android/include.gradle +++ b/packages/firebase-database/platforms/android/include.gradle @@ -1,6 +1,5 @@ dependencies { - def computeFirebaseBomVersion = { -> project.hasProperty("firebaseBomVersion") ? firebaseBomVersion : "31.2.3" } + def computeFirebaseBomVersion = { -> project.hasProperty("firebaseBomVersion") ? firebaseBomVersion : "32.3.1" } 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 325b4048..43287cfe 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.7.0' \ No newline at end of file +pod 'Firebase/Database', '~>10.13.0' \ No newline at end of file diff --git a/packages/firebase-dynamic-links/package.json b/packages/firebase-dynamic-links/package.json index c04417af..6cda0352 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.1.3", + "version": "3.2.0", "description": "NativeScript Firebase - Dynamic Links", "main": "index", "typings": "index.d.ts", @@ -19,7 +19,11 @@ "JavaScript", "TypeScript", "iOS", - "Android" + "Android", + "Firebase", + "Dynamic Links", + "Deep Links", + "Routing" ], "author": { "name": "NativeScript", 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 387795bc..d958418f 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 9dbc283e..97e99551 100644 --- a/packages/firebase-dynamic-links/platforms/android/include.gradle +++ b/packages/firebase-dynamic-links/platforms/android/include.gradle @@ -1,7 +1,6 @@ dependencies { - def computeFirebaseBomVersion = { -> project.hasProperty("firebaseBomVersion") ? firebaseBomVersion : "31.2.3" } + def computeFirebaseBomVersion = { -> project.hasProperty("firebaseBomVersion") ? firebaseBomVersion : "32.3.1" } implementation platform("com.google.firebase:firebase-bom:${computeFirebaseBomVersion}") - implementation 'com.google.firebase:firebase-dynamic-links' implementation 'com.google.firebase:firebase-analytics' } \ No newline at end of file diff --git a/packages/firebase-dynamic-links/platforms/ios/Podfile b/packages/firebase-dynamic-links/platforms/ios/Podfile index f69406b5..6052d1fd 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.7.0' +pod 'Firebase/DynamicLinks', '~>10.13.0' pod 'GoogleUtilities', '~> 7.7' \ No newline at end of file diff --git a/packages/firebase-firestore/index.android.ts b/packages/firebase-firestore/index.android.ts index b8de2f0e..2695ec0c 100644 --- a/packages/firebase-firestore/index.android.ts +++ b/packages/firebase-firestore/index.android.ts @@ -86,7 +86,7 @@ function deserializeField(value) { } if (value instanceof java.util.Map) { - let dict = {}; + const dict = {}; const keys = value.keySet().toArray(); const size = keys.length; for (let i = 0, n = size; i < n; i++) { @@ -1145,7 +1145,7 @@ export class FieldValue implements IFieldValue { export class GeoPoint implements IGeoPoint { _native: com.google.firebase.firestore.GeoPoint; - constructor(latitude: number, longitude: number, native: boolean = false) { + constructor(latitude: number, longitude: number, native = false) { if (!native) { this._native = new com.google.firebase.firestore.GeoPoint(latitude, longitude); } diff --git a/packages/firebase-firestore/package.json b/packages/firebase-firestore/package.json index 5b1292a3..40058602 100644 --- a/packages/firebase-firestore/package.json +++ b/packages/firebase-firestore/package.json @@ -1,6 +1,6 @@ { "name": "@nativescript/firebase-firestore", - "version": "3.1.3", + "version": "3.2.0", "description": "NativeScript Firebase - Firestore", "main": "index", "typings": "index.d.ts", @@ -19,7 +19,17 @@ "JavaScript", "TypeScript", "iOS", - "Android" + "Android", + "Firebase", + "Firestore", + "Database", + "Realtime", + "Offline", + "NoSQL", + "Query", + "Sync", + "Document", + "Collection" ], "author": { "name": "NativeScript", diff --git a/packages/firebase-firestore/platforms/android/firebase_firestore.aar b/packages/firebase-firestore/platforms/android/firebase_firestore.aar index d2c408d3..f9db1303 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 ac682bfe..a211ae14 100644 --- a/packages/firebase-firestore/platforms/android/include.gradle +++ b/packages/firebase-firestore/platforms/android/include.gradle @@ -1,6 +1,5 @@ dependencies { - def computeFirebaseBomVersion = { -> project.hasProperty("firebaseBomVersion") ? firebaseBomVersion : "31.2.3" } - implementation platform("com.google.firebase:firebase-bom:${computeFirebaseBomVersion}") - - implementation 'com.google.firebase:firebase-firestore' + def computeFirebaseBomVersion = { -> project.hasProperty("firebaseBomVersion") ? firebaseBomVersion : "32.3.1" } + 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 db06f454..b23ef227 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.7.0' \ No newline at end of file +pod 'Firebase/Firestore', '~>10.13.0' \ No newline at end of file diff --git a/packages/firebase-functions/package.json b/packages/firebase-functions/package.json index e427cb65..f868eced 100644 --- a/packages/firebase-functions/package.json +++ b/packages/firebase-functions/package.json @@ -1,6 +1,6 @@ { "name": "@nativescript/firebase-functions", - "version": "3.1.3", + "version": "3.2.0", "description": "NativeScript Firebase - Functions", "main": "index", "typings": "index.d.ts", @@ -19,7 +19,10 @@ "JavaScript", "TypeScript", "iOS", - "Android" + "Android", + "Firebase", + "Cloud Functions", + "Functions" ], "author": { "name": "NativeScript", diff --git a/packages/firebase-functions/platforms/android/firebase_functions.aar b/packages/firebase-functions/platforms/android/firebase_functions.aar index be3a847b..cf0dfd3e 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 6bd1ac99..5cc59244 100644 --- a/packages/firebase-functions/platforms/android/include.gradle +++ b/packages/firebase-functions/platforms/android/include.gradle @@ -1,6 +1,5 @@ dependencies { - def computeFirebaseBomVersion = { -> project.hasProperty("firebaseBomVersion") ? firebaseBomVersion : "31.2.3" } + def computeFirebaseBomVersion = { -> project.hasProperty("firebaseBomVersion") ? firebaseBomVersion : "32.3.1" } 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 18557dff..98c2a954 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.7.0' +pod 'Firebase/Functions', '~>10.13.0' diff --git a/packages/firebase-in-app-messaging/package.json b/packages/firebase-in-app-messaging/package.json index a7d669a5..9e075083 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.1.3", + "version": "3.2.0", "description": "NativeScript Firebase - In App Messaging", "main": "index", "typings": "index.d.ts", @@ -19,7 +19,12 @@ "JavaScript", "TypeScript", "iOS", - "Android" + "Android", + "Firebase", + "Messaging", + "In App Messaging", + "Campaigns", + "Contextual" ], "author": { "name": "NativeScript", diff --git a/packages/firebase-in-app-messaging/platforms/android/include.gradle b/packages/firebase-in-app-messaging/platforms/android/include.gradle index 1786c843..93044a68 100644 --- a/packages/firebase-in-app-messaging/platforms/android/include.gradle +++ b/packages/firebase-in-app-messaging/platforms/android/include.gradle @@ -1,7 +1,6 @@ dependencies { - def computeFirebaseBomVersion = { -> project.hasProperty("firebaseBomVersion") ? firebaseBomVersion : "31.2.3" } + def computeFirebaseBomVersion = { -> project.hasProperty("firebaseBomVersion") ? firebaseBomVersion : "32.3.1" } implementation platform("com.google.firebase:firebase-bom:${computeFirebaseBomVersion}") - implementation 'com.google.firebase:firebase-inappmessaging-display' implementation 'com.google.firebase:firebase-analytics' } \ No newline at end of file diff --git a/packages/firebase-in-app-messaging/platforms/ios/Podfile b/packages/firebase-in-app-messaging/platforms/ios/Podfile index c5d3c806..8696fa6a 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.7.0' \ No newline at end of file +pod 'Firebase/InAppMessaging', '~>10.13.0' \ No newline at end of file diff --git a/packages/firebase-installations/index.android.ts b/packages/firebase-installations/index.android.ts index 9830ff79..c455b5bf 100644 --- a/packages/firebase-installations/index.android.ts +++ b/packages/firebase-installations/index.android.ts @@ -60,7 +60,7 @@ export class Installations implements IInstallations { ); }); } - getToken(forceRefresh: boolean = false): Promise { + getToken(forceRefresh = false): Promise { return new Promise((resolve, reject) => { org.nativescript.firebase.installations.FirebaseInstallations.getToken( this.native, diff --git a/packages/firebase-installations/package.json b/packages/firebase-installations/package.json index 4ac72933..fc34a613 100644 --- a/packages/firebase-installations/package.json +++ b/packages/firebase-installations/package.json @@ -1,6 +1,6 @@ { "name": "@nativescript/firebase-installations", - "version": "3.1.3", + "version": "3.2.0", "description": "NativeScript Firebase - Installations", "main": "index", "typings": "index.d.ts", @@ -19,7 +19,9 @@ "JavaScript", "TypeScript", "iOS", - "Android" + "Android", + "Firebase", + "Installations" ], "author": { "name": "NativeScript", diff --git a/packages/firebase-installations/platforms/android/firebase_installations.aar b/packages/firebase-installations/platforms/android/firebase_installations.aar index 522df44b..9e257a50 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 3888ec75..8593a67f 100644 --- a/packages/firebase-installations/platforms/android/include.gradle +++ b/packages/firebase-installations/platforms/android/include.gradle @@ -1,6 +1,5 @@ dependencies { - def computeFirebaseBomVersion = { -> project.hasProperty("firebaseBomVersion") ? firebaseBomVersion : "31.2.3" } + def computeFirebaseBomVersion = { -> project.hasProperty("firebaseBomVersion") ? firebaseBomVersion : "32.3.1" } 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 49078338..21abcf52 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.7.0' \ No newline at end of file +pod 'Firebase/Installations', '~>10.13.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 b37fb175..3c9c7af0 100644 --- a/packages/firebase-messaging-core/index.android.ts +++ b/packages/firebase-messaging-core/index.android.ts @@ -51,7 +51,7 @@ const onNotificationTapCallbacks: Set<(message: any) => void> = new Set(); let lastActivity: WeakRef; let requestPermissionLauncher: androidx.activity.result.ActivityResultLauncher; -let _permissionQueue: { resolve: Function; reject: Function }[] = []; +const _permissionQueue: { resolve: Function; reject: Function }[] = []; function register(args: any) { if (!lastActivity) { diff --git a/packages/firebase-messaging-core/package.json b/packages/firebase-messaging-core/package.json index 99491546..c75610c8 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.1.3", + "version": "3.2.0", "description": "NativeScript Push Messaging Core", "main": "index", "typings": "index.d.ts", @@ -19,7 +19,11 @@ "JavaScript", "TypeScript", "iOS", - "Android" + "Android", + "Firebase", + "Push Notifications", + "Notifications", + "Messaging" ], "author": { "name": "NativeScript", diff --git a/packages/firebase-messaging-core/platforms/android/firebase_messaging_core.aar b/packages/firebase-messaging-core/platforms/android/firebase_messaging_core.aar new file mode 100644 index 00000000..5d12941c Binary files /dev/null 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 4876e93f..200ad4c9 100644 --- a/packages/firebase-messaging-core/platforms/android/include.gradle +++ b/packages/firebase-messaging-core/platforms/android/include.gradle @@ -2,11 +2,7 @@ if (!project.hasProperty("tempBuild")) { apply plugin: 'com.google.gms.google-services' } dependencies { - def computeKotlinVersion = { -> project.hasProperty("kotlinVersion") ? kotlinVersion : "1.4.32" } - implementation "org.jetbrains.kotlin:kotlin-stdlib:$computeKotlinVersion" - - def computeFirebaseBomVersion = { -> project.hasProperty("firebaseBomVersion") ? firebaseBomVersion : "31.2.3" } + def computeFirebaseBomVersion = { -> project.hasProperty("firebaseBomVersion") ? firebaseBomVersion : "32.3.1" } 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 1cf06680..8dcf9412 100644 --- a/packages/firebase-messaging/package.json +++ b/packages/firebase-messaging/package.json @@ -1,6 +1,6 @@ { "name": "@nativescript/firebase-messaging", - "version": "3.1.3", + "version": "3.2.0", "description": "NativeScript Firebase - Messaging", "main": "index", "typings": "index.d.ts", @@ -19,7 +19,11 @@ "JavaScript", "TypeScript", "iOS", - "Android" + "Android", + "Firebase", + "Push Notifications", + "Notifications", + "Messaging" ], "author": { "name": "NativeScript", diff --git a/packages/firebase-messaging/platforms/android/include.gradle b/packages/firebase-messaging/platforms/android/include.gradle index 4fc05913..a0989f89 100644 --- a/packages/firebase-messaging/platforms/android/include.gradle +++ b/packages/firebase-messaging/platforms/android/include.gradle @@ -1,6 +1,5 @@ dependencies { - def computeFirebaseBomVersion = { -> project.hasProperty("firebaseBomVersion") ? firebaseBomVersion : "31.2.3" } + def computeFirebaseBomVersion = { -> project.hasProperty("firebaseBomVersion") ? firebaseBomVersion : "32.3.1" } 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 921ea74f..90d12e87 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.7.0' \ No newline at end of file +pod 'Firebase/Messaging', '~>10.13.0' \ No newline at end of file diff --git a/packages/firebase-performance/package.json b/packages/firebase-performance/package.json index 7954e332..dc3138c7 100644 --- a/packages/firebase-performance/package.json +++ b/packages/firebase-performance/package.json @@ -1,6 +1,6 @@ { "name": "@nativescript/firebase-performance", - "version": "3.1.3", + "version": "3.2.0", "description": "NativeScript Firebase - Performancee", "main": "index", "typings": "index.d.ts", @@ -19,7 +19,11 @@ "JavaScript", "TypeScript", "iOS", - "Android" + "Android", + "Firebase", + "Performance", + "Monitoring", + "Tracking" ], "author": { "name": "NativeScript", diff --git a/packages/firebase-performance/platforms/android/include.gradle b/packages/firebase-performance/platforms/android/include.gradle index 7651ea84..acf735b2 100644 --- a/packages/firebase-performance/platforms/android/include.gradle +++ b/packages/firebase-performance/platforms/android/include.gradle @@ -5,8 +5,7 @@ repositories { } dependencies { - def computeFirebaseBomVersion = { -> project.hasProperty("firebaseBomVersion") ? firebaseBomVersion : "31.2.3" } - implementation platform("com.google.firebase:firebase-bom:${computeFirebaseBomVersion}") - + def computeFirebaseBomVersion = { -> project.hasProperty("firebaseBomVersion") ? firebaseBomVersion : "32.3.1" } + 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 93b62d47..2263a8d4 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.7.0' \ No newline at end of file +pod 'Firebase/Performance', '~>10.13.0' \ No newline at end of file diff --git a/packages/firebase-remote-config/package.json b/packages/firebase-remote-config/package.json index a697d91f..20e7ebce 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.1.3", + "version": "3.2.0", "description": "NativeScript Firebase - Remote Config", "main": "index", "typings": "index.d.ts", @@ -19,7 +19,14 @@ "JavaScript", "TypeScript", "iOS", - "Android" + "Android", + "Firebase", + "Remote", + "Configuration", + "Config", + "Feature", + "Switch", + "Toggle" ], "author": { "name": "NativeScript", 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 32aed04f..8636604c 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 29ba4e60..816691d0 100644 --- a/packages/firebase-remote-config/platforms/android/include.gradle +++ b/packages/firebase-remote-config/platforms/android/include.gradle @@ -1,7 +1,6 @@ dependencies { - def computeFirebaseBomVersion = { -> project.hasProperty("firebaseBomVersion") ? firebaseBomVersion : "31.2.3" } + def computeFirebaseBomVersion = { -> project.hasProperty("firebaseBomVersion") ? firebaseBomVersion : "32.3.1" } implementation platform("com.google.firebase:firebase-bom:${computeFirebaseBomVersion}") - implementation 'com.google.firebase:firebase-config' implementation 'com.google.firebase:firebase-analytics' } \ No newline at end of file diff --git a/packages/firebase-remote-config/platforms/ios/Podfile b/packages/firebase-remote-config/platforms/ios/Podfile index 3548e036..0af1dc9d 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.7.0' \ No newline at end of file +pod 'Firebase/RemoteConfig', '~>10.13.0' \ No newline at end of file diff --git a/packages/firebase-storage/index.android.ts b/packages/firebase-storage/index.android.ts index 7221299b..793dab9c 100644 --- a/packages/firebase-storage/index.android.ts +++ b/packages/firebase-storage/index.android.ts @@ -239,10 +239,6 @@ export class Metadata implements IMetadata { return this.native.getBucket?.(); } - get cacheControl(): string { - return this.native.getCacheControl?.(); - } - private _createBuilder() { if (this._native) { this._builder = new com.google.firebase.storage.StorageMetadata.Builder(this._native); @@ -251,6 +247,10 @@ export class Metadata implements IMetadata { } } + get cacheControl(): string { + return this.native.getCacheControl?.(); + } + set cacheControl(value) { if (!this._builder) { this._createBuilder(); @@ -510,16 +510,18 @@ export class Reference implements IReference { putString(data: string, format: StringFormat = StringFormat.RAW, metadata?: Metadata): Task { switch (format) { case StringFormat.DATA_URL: - const base64 = b64WithoutPrefix(data); - const mime = getMIMEforBase64String(data); - - const meta = metadata || new Metadata(); - if (!metadata.contentType) { - meta.contentType = mime; - } + { + const base64 = b64WithoutPrefix(data); + const mime = getMIMEforBase64String(data); - org.nativescript.firebase.storage.FirebaseStorage.StorageReference.putString(this.native, base64, format, meta.native); + const meta = metadata || new Metadata(); + if (!metadata.contentType) { + meta.contentType = mime; + } + org.nativescript.firebase.storage.FirebaseStorage.StorageReference.putString(this.native, base64, format, meta.native); + } + break; default: return Task.fromNative(org.nativescript.firebase.storage.FirebaseStorage.StorageReference.putString(this.native, data, format, metadata?.native || null)); } diff --git a/packages/firebase-storage/index.ios.ts b/packages/firebase-storage/index.ios.ts index e27a6a6e..8515ccce 100644 --- a/packages/firebase-storage/index.ios.ts +++ b/packages/firebase-storage/index.ios.ts @@ -489,14 +489,16 @@ export class Reference implements IReference { nsData = NSData.alloc().initWithBase64EncodedStringOptions(data, 0); break; case StringFormat.BASE64URL: - let base64Encoded = data.replace(/-/g, '+').replace(/_/g, '/'); + { + let base64Encoded = data.replace(/-/g, '+').replace(/_/g, '/'); - while (base64Encoded.length % 4 != 0) { - base64Encoded = base64Encoded + '='; + while (base64Encoded.length % 4 != 0) { + base64Encoded = base64Encoded + '='; + } + nsData = NSData.alloc().initWithBase64EncodedStringOptions(data, 0); } - nsData = NSData.alloc().initWithBase64EncodedStringOptions(data, 0); break; - case StringFormat.DATA_URL: + case StringFormat.DATA_URL: { const base64 = b64WithoutPrefix(data); const mime = getMIMEforBase64String(data); @@ -505,12 +507,14 @@ export class Reference implements IReference { meta.contentType = mime; } return Task.fromNative(this.native.putDataMetadata(NSData.alloc().initWithBase64EncodedStringOptions(base64, 0), meta.native)); - default: + } + default: { const text = NSString.stringWithString(data); const nativeData = text.dataUsingEncoding(NSUTF8StringEncoding); const encodedString = nativeData.base64EncodedStringWithOptions(0); nsData = NSData.alloc().initWithBase64EncodedStringOptions(encodedString, 0); break; + } } if (metadata) { diff --git a/packages/firebase-storage/package.json b/packages/firebase-storage/package.json index a11d4ea3..b7df57a8 100644 --- a/packages/firebase-storage/package.json +++ b/packages/firebase-storage/package.json @@ -1,6 +1,6 @@ { "name": "@nativescript/firebase-storage", - "version": "3.1.3", + "version": "3.2.0", "description": "NativeScript Firebase - Storage", "main": "index", "typings": "index.d.ts", @@ -19,7 +19,19 @@ "JavaScript", "TypeScript", "iOS", - "Android" + "Android", + "Firebase", + "File", + "Storage", + "Cloud", + "Server", + "Object Storage", + "Upload", + "Download", + "Image", + "Audio", + "Video", + "Files" ], "author": { "name": "NativeScript", diff --git a/packages/firebase-storage/platforms/android/firebase_storage.aar b/packages/firebase-storage/platforms/android/firebase_storage.aar index 0ab48928..92de2208 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 a08f93dc..4b380d9b 100644 --- a/packages/firebase-storage/platforms/android/include.gradle +++ b/packages/firebase-storage/platforms/android/include.gradle @@ -1,6 +1,5 @@ dependencies { - def computeFirebaseBomVersion = { -> project.hasProperty("firebaseBomVersion") ? firebaseBomVersion : "31.2.3" } + def computeFirebaseBomVersion = { -> project.hasProperty("firebaseBomVersion") ? firebaseBomVersion : "32.3.1" } 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 a7c1cc24..c4245720 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.7.0' \ No newline at end of file +pod 'Firebase/Storage', '~>10.13.0' \ No newline at end of file diff --git a/packages/firebase-ui/index.ios.ts b/packages/firebase-ui/index.ios.ts index ebcdedf1..5ef14c10 100644 --- a/packages/firebase-ui/index.ios.ts +++ b/packages/firebase-ui/index.ios.ts @@ -185,9 +185,10 @@ export class EmailProvider extends ProviderBase { actionCodeSettings: ActionCodeSettings = null; - requireName: boolean = true; + requireName = true; + + _forceSameDevice = false; - _forceSameDevice: boolean = false; forceSameDevice() { this._forceSameDevice = true; return this; @@ -199,9 +200,9 @@ export class EmailProvider extends ProviderBase { return this; } - defaultEmail: string = ''; + defaultEmail = ''; - allowNewAccounts: boolean = true; + allowNewAccounts = true; getNative(ui: UI) { if (this.requireName) { @@ -216,9 +217,9 @@ export class PhoneProvider extends ProviderBase { super(); } - defaultNumber: string = ''; + defaultNumber = ''; - defaultCountryIso: string = ''; + defaultCountryIso = ''; blacklistedCountries: string[] = []; diff --git a/packages/firebase-ui/package.json b/packages/firebase-ui/package.json index 2460c663..403db2cb 100644 --- a/packages/firebase-ui/package.json +++ b/packages/firebase-ui/package.json @@ -1,6 +1,6 @@ { "name": "@nativescript/firebase-ui", - "version": "3.1.3", + "version": "3.2.0", "description": "NativeScript Firebase - UI", "main": "index", "typings": "index.d.ts", @@ -19,7 +19,25 @@ "JavaScript", "TypeScript", "iOS", - "Android" + "Android", + "Firebase", + "Auth", + "Authentication", + "Login", + "Log-in", + "Sign in", + "Sign-in", + "User", + "Apple", + "Facebook", + "Twitter", + "GitHub", + "Google", + "Email", + "Microsoft", + "Yahoo", + "Phone Number", + "UI" ], "author": { "name": "NativeScript", diff --git a/packages/firebase-ui/platforms/android/firebase_ui.aar b/packages/firebase-ui/platforms/android/firebase_ui.aar index 0a27ccb3..b64997f9 100644 Binary files a/packages/firebase-ui/platforms/android/firebase_ui.aar and b/packages/firebase-ui/platforms/android/firebase_ui.aar differ