feat: v2

fixes: #88
fixes: #77
breaking(android): min sdk is now API 19 (kitkat) for Analytics, Firestore, Messaging & Dynamic Links

apps/demo/src/app.ts

@@ -37,16 +37,19 @@ dynamicLinks.onLink((link) => {
 });
 
 const messaging = firebase().messaging();
-messaging.onMessage((message) => {
-	console.log('Firebase onMessage', message);
-});
 
-messaging.onNotificationTap((message) => {
-	console.log('Firebase onNotificationTap', message);
-});
+Application.on('launch', (args) => {
+	messaging.onMessage((message) => {
+		console.log('Firebase onMessage', message);
+	});
 
-messaging.onToken((token) => {
-	console.log('Firebase onToken', token);
+	messaging.onNotificationTap((message) => {
+		console.log('Firebase onNotificationTap', message);
+	});
+
+	messaging.onToken((token) => {
+		console.log('Firebase onToken', token);
+	});
 });
 
 messaging

apps/demo/src/main-view-model.ts

@@ -26,6 +26,9 @@ export class MainViewModel extends Observable {
 		{
 			name: 'firebase-app-check',
 		},
+		{
+			name: 'firebase-app-check-debug',
+		},
 		{
 			name: 'firebase-in-app-messaging',
 		},
@@ -38,9 +41,9 @@ export class MainViewModel extends Observable {
 		{
 			name: 'firebase-messaging',
 		},
-    {
-      name: 'firebase-firestore',
-    },
+		{
+			name: 'firebase-firestore',
+		},
 	];
 
 	viewDemo(args) {

apps/demo/src/plugin-demos/firebase-admob.xml

@@ -6,14 +6,14 @@ xmlns:ui="@nativescript/firebase-admob"
         </ActionBar>
     </Page.actionBar>
     <StackLayout class="p-20">
-       <!-- <ui:BannerAd height="100" width="100" unitId="{{bannerAdUnit}}" layoutChanged="{{bannerLoaded}}"/> -->
-       <ui:NativeAdView height="400" loaded="{{nativeAdLoaded}}" layoutChanged="{{nativeAdLayoutChanged}}">
+       <ui:BannerAd height="100" width="100" unitId="{{bannerAdUnit}}" layoutChanged="{{bannerLoaded}}"/>
+       <!-- <ui:NativeAdView height="400" loaded="{{nativeAdLoaded}}" layoutChanged="{{nativeAdLayoutChanged}}">
         <GridLayout rows="auto,auto,auto,auto" height="300" width="300">
        <Label id="headLineView" text="First"/>
        <ui:MediaView row="1" id="mediaView" height="100%"/>
        <Label row="2" id="bodyView"/>
        <Image id="iconView" row="3"/>
       </GridLayout>
-       </ui:NativeAdView>
+       </ui:NativeAdView> -->
     </StackLayout>
 </Page>

apps/demo/src/plugin-demos/firebase-app-check-debug.ts

@@ -1,12 +1,27 @@
 import { Observable, EventData, Page } from '@nativescript/core';
 import { DemoSharedFirebaseAppCheckDebug } from '@demo/shared';
-import { } from '@nativescript/firebase-app-check-debug';
+import { firebase } from '@nativescript/firebase-core';
+import '@nativescript/firebase-app-check-debug';
 
 export function navigatingTo(args: EventData) {
 	const page = <Page>args.object;
 	page.bindingContext = new DemoModel();
 }
 
 export class DemoModel extends DemoSharedFirebaseAppCheckDebug {
-
+	constructor() {
+		super();
+	}
+
+	testIt(): void {
+		firebase()
+			.appCheck()
+			.getToken(true)
+			.then((token) => {
+				console.log(token.token);
+			})
+			.catch((error) => {
+				console.log(error);
+			});
+	}
 }

apps/demo/src/plugin-demos/firebase-database.ts

@@ -15,21 +15,25 @@ export class DemoModel extends DemoSharedFirebaseDatabase {
 		super();
 		this.auth = firebase().auth();
 		this.database = firebase().database();
+	}
+
+	testIt(): void {
 		this.transaction();
 		this.randomData();
 		this.children();
 		this.setData();
 	}
 
-	setData(){
+	setData() {
 		this.database
-		.ref('/person/me')
-		.set({ name: 'set', boolean: true , updated: new Date() })
-		.then((value) => {
-			console.log('set some data', value);
-		}).catch(e =>{
-			console.log('failed to set data', e);
-		});
+			.ref('/person/me')
+			.set({ name: 'set', boolean: true, updated: new Date() })
+			.then((value) => {
+				console.log('set some data', value);
+			})
+			.catch((e) => {
+				console.log('failed to set data', e);
+			});
 	}
 
 	randomData() {

apps/demo/src/plugin-demos/firebase-firestore.ts

@@ -11,7 +11,10 @@ export function navigatingTo(args: EventData) {
 export class DemoModel extends DemoSharedFirebaseFirestore {
 	constructor() {
 		super();
-		Promise.all([this.init(),this.invalid_field_path()]);
+	}
+
+	testIt(): void {
+		Promise.all([this.init(), this.invalid_field_path()]);
 	}
 
 	async init() {
@@ -57,21 +60,20 @@ export class DemoModel extends DemoSharedFirebaseFirestore {
 		const exampleDoc2 = firebase().firestore().collection('things').doc('exampleDoc2');
 
 		firebase()
-				.firestore()
-				.batch()
-				.set(exampleDoc, {
-					message: 'Hello doc',
-				})
-				.set(exampleDoc2, {
-					date: new Date(),
-				})
-				.commit()
-				.then(() => {})
-				.catch((error) => {
-					console.error(error);
-				});
+			.firestore()
+			.batch()
+			.set(exampleDoc, {
+				message: 'Hello doc',
+			})
+			.set(exampleDoc2, {
+				date: new Date(),
+			})
+			.commit()
+			.then(() => {})
+			.catch((error) => {
+				console.error(error);
+			});
 	}
-
 
 	async invalid_field_path() {
 		try {

package.json

@@ -1,6 +1,6 @@
 {
 	"name": "plugins",
-	"version": "1.2.2",
+	"version": "2.0.0",
 	"license": "MIT",
 	"scripts": {
 		"postinstall": "husky install && npx ts-patch install",

packages/firebase-admob/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@nativescript/firebase-admob",
-	"version": "1.2.2",
+	"version": "2.0.0",
 	"description": "NativeScript Firebase - Admob",
 	"main": "index",
 	"typings": "index.d.ts",

packages/firebase-admob/platforms/android/include.gradle

@@ -1,4 +1,4 @@
 dependencies {
-    implementation 'com.google.android.gms:play-services-ads:20.4.0'
+    implementation 'com.google.android.gms:play-services-ads:20.6.0'
     implementation 'com.google.android.ump:user-messaging-platform:2.0.0'
 }

packages/firebase-admob/platforms/ios/Podfile

@@ -1,2 +1,2 @@
 use_frameworks!
-pod 'Google-Mobile-Ads-SDK', '~> 8.10'
+pod 'Google-Mobile-Ads-SDK', '~> 9.5.0'

packages/firebase-analytics/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@nativescript/firebase-analytics",
-	"version": "1.2.2",
+	"version": "2.0.0",
 	"description": "NativeScript Firebase - Analytics",
 	"main": "index",
 	"typings": "index.d.ts",

packages/firebase-analytics/platforms/ios/Podfile

@@ -1,10 +1,11 @@
+platform :ios, '10.0'
   # Firebase dependencies
   if defined?($NSFirebaseAnalyticsWithoutAdIdSupport)
     Pod::UI.puts "Using Firebase/AnalyticsWithoutAdIdSupport pod in place of default Firebase/Analytics"
 
-    pod 'Firebase/AnalyticsWithoutAdIdSupport','~>8.6'
+    pod 'Firebase/AnalyticsWithoutAdIdSupport','~>9.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','~>8.6'
+    pod 'Firebase/Analytics','~>9.0'
   end

packages/firebase-app-check-debug/index.android.ts

@@ -17,7 +17,7 @@ Object.defineProperty(fb, 'appCheck', {
 	writable: false,
 });
 
-const NSAppCheck = lazy(() => org.nativescript.firebase.app_check_debug.FirebaseAppCheck);
+const NSAppCheck = lazy(() => org.nativescript.firebase.app_check_debug.FirebaseAppCheckDebug);
 
 export class AppCheckToken implements IAppCheckToken {
 	#native: com.google.firebase.appcheck.AppCheckToken;
@@ -66,16 +66,15 @@ export class AppCheck implements IAppCheck {
 	static setProviderFactory() {}
 
 	activate(isTokenAutoRefreshEnabled: boolean) {
-		this.native.setTokenAutoRefreshEnabled(isTokenAutoRefreshEnabled);
-		this.native.installAppCheckProviderFactory(com.google.firebase.appcheck.debug.DebugAppCheckProviderFactory.getInstance());
+		this.native.installAppCheckProviderFactory(com.google.firebase.appcheck.debug.DebugAppCheckProviderFactory.getInstance(), isTokenAutoRefreshEnabled);
 	}
 
 	getToken(forceRefresh: boolean): Promise<AppCheckToken> {
 		return new Promise((resolve, reject) => {
 			NSAppCheck().getToken(
 				this.native,
 				forceRefresh,
-				new org.nativescript.firebase.app_check_debug.FirebaseAppCheck.Callback({
+				new org.nativescript.firebase.app_check_debug.FirebaseAppCheckDebug.Callback({
 					onSuccess(param0) {
 						resolve(AppCheckToken.fromNative(param0));
 					},

packages/firebase-app-check-debug/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@nativescript/firebase-app-check-debug",
-	"version": "1.2.2",
+	"version": "2.0.0",
 	"description": "NativeScript Firebase - App Check",
 	"main": "index",
 	"typings": "index.d.ts",

packages/firebase-app-check-debug/platforms/android/include.gradle

@@ -1,3 +1,3 @@
 dependencies {
-    implementation 'com.google.firebase:firebase-appcheck-debug:16.0.0-beta04'
+    implementation 'com.google.firebase:firebase-appcheck-debug'
 }

packages/firebase-app-check-debug/platforms/ios/Podfile

@@ -1,2 +1,2 @@
 platform :ios, '11.0'
-pod 'Firebase/AppCheck', '~>8.6'
+pod 'Firebase/AppCheck', '~>9.0'

packages/firebase-app-check-debug/src-native/android/app_check_debug/build.gradle

@@ -33,7 +33,10 @@ dependencies {
 
     implementation 'androidx.core:core-ktx:1.7.0'
     implementation 'androidx.appcompat:appcompat:1.3.0'
-    implementation 'com.google.firebase:firebase-appcheck-debug:16.0.0-beta04'
+    def computeFirebaseBomVersion = { ->
+    project.hasProperty("firebaseBomVersion") ? firebaseBomVersion : "30.0.1" }
+    implementation platform("com.google.firebase:firebase-bom:${computeFirebaseBomVersion}")
+    implementation 'com.google.firebase:firebase-appcheck-debug'
     testImplementation 'junit:junit:4.13.2'
     androidTestImplementation 'androidx.test.ext:junit:1.1.3'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'

packages/firebase-app-check-debug/typings/org.nativescript.firebase.app_check.d.ts

@@ -18,32 +18,29 @@ declare module org {
 	export module nativescript {
 		export module firebase {
 			export module app_check_debug {
-				export class FirebaseAppCheck {
-					public static class: java.lang.Class<org.nativescript.firebase.app_check_debug.FirebaseAppCheck>;
-					public static Companion: org.nativescript.firebase.app_check_debug.FirebaseAppCheck.Companion;
+				export class FirebaseAppCheckDebug {
+					public static class: java.lang.Class<org.nativescript.firebase.app_check_debug.FirebaseAppCheckDebug>;
+					public static Companion: org.nativescript.firebase.app_check_debug.FirebaseAppCheckDebug.Companion;
 					public constructor();
 					public static getExecutorsCount(): number;
-					public static getToken(param0: com.google.firebase.appcheck.FirebaseAppCheck, param1: boolean, param2: org.nativescript.firebase.app_check_debug.FirebaseAppCheck.Callback<com.google.firebase.appcheck.AppCheckToken>): void;
+					public static getToken(param0: com.google.firebase.appcheck.FirebaseAppCheckDebug, param1: boolean, param2: org.nativescript.firebase.app_check_debug.FirebaseAppCheckDebug.Callback<com.google.firebase.appcheck.AppCheckToken>): void;
 					public static setExecutorsCount(param0: number): void;
 				}
-				export module FirebaseAppCheck {
-					export class Callback<T>  extends java.lang.Object {
-						public static class: java.lang.Class<org.nativescript.firebase.app_check_debug.FirebaseAppCheck.Callback<any>>;
+				export module FirebaseAppCheckDebug {
+					export class Callback<T> extends java.lang.Object {
+						public static class: java.lang.Class<org.nativescript.firebase.app_check_debug.FirebaseAppCheckDebug.Callback<any>>;
 						/**
-						 * Constructs a new instance of the org.nativescript.firebase.app_check_debug.FirebaseAppCheck$Callback interface with the provided implementation. An empty constructor exists calling super() when extending the interface class.
+						 * Constructs a new instance of the org.nativescript.firebase.app_check_debug.FirebaseAppCheckDebug$Callback interface with the provided implementation. An empty constructor exists calling super() when extending the interface class.
 						 */
-						public constructor(implementation: {
-							onSuccess(param0: T): void;
-							onError(param0: any): void;
-						});
+						public constructor(implementation: { onSuccess(param0: T): void; onError(param0: any): void });
 						public constructor();
 						public onError(param0: any): void;
 						public onSuccess(param0: T): void;
 					}
 					export class Companion {
-						public static class: java.lang.Class<org.nativescript.firebase.app_check_debug.FirebaseAppCheck.Companion>;
+						public static class: java.lang.Class<org.nativescript.firebase.app_check_debug.FirebaseAppCheckDebug.Companion>;
 						public setExecutorsCount(param0: number): void;
-						public getToken(param0: com.google.firebase.appcheck.FirebaseAppCheck, param1: boolean, param2: org.nativescript.firebase.app_check_debug.FirebaseAppCheck.Callback<com.google.firebase.appcheck.AppCheckToken>): void;
+						public getToken(param0: com.google.firebase.appcheck.FirebaseAppCheckDebug, param1: boolean, param2: org.nativescript.firebase.app_check_debug.FirebaseAppCheckDebug.Callback<com.google.firebase.appcheck.AppCheckToken>): void;
 						public getExecutorsCount(): number;
 					}
 				}
@@ -53,5 +50,4 @@ declare module org {
 }
 
 //Generics information:
-//org.nativescript.firebase.app_check_debug.FirebaseAppCheck.Callback:1
-
+//org.nativescript.firebase.app_check_debug.FirebaseAppCheckDebug.Callback:1

packages/firebase-app-check/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@nativescript/firebase-app-check",
-	"version": "1.2.2",
+	"version": "2.0.0",
 	"description": "NativeScript Firebase - App Check",
 	"main": "index",
 	"typings": "index.d.ts",

packages/firebase-app-check/platforms/android/include.gradle

@@ -1,3 +1,3 @@
 dependencies {
-    implementation 'com.google.firebase:firebase-appcheck-safetynet:16.0.0-beta02'
+    implementation 'com.google.firebase:firebase-appcheck-safetynet'
 }

packages/firebase-app-check/platforms/ios/Podfile

@@ -1,2 +1,2 @@
 platform :ios, '11.0'
-pod 'Firebase/AppCheck', '~>8.6'
+pod 'Firebase/AppCheck', '~>9.0'

packages/firebase-app-check/src-native/android/app_check/build.gradle

@@ -39,5 +39,8 @@ dependencies {
     testImplementation 'junit:junit:4.+'
     androidTestImplementation 'androidx.test.ext:junit:1.1.3'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
-    implementation 'com.google.firebase:firebase-appcheck-safetynet:16.0.0-beta02'
+    def computeFirebaseBomVersion = { ->
+    project.hasProperty("firebaseBomVersion") ? firebaseBomVersion : "30.0.1" }
+    implementation platform("com.google.firebase:firebase-bom:${computeFirebaseBomVersion}")
+    implementation 'com.google.firebase:firebase-appcheck-safetynet'
 }

packages/firebase-auth/index.ios.ts

@@ -697,8 +697,6 @@ export class PhoneAuthProvider {
 				reject();
 			} else {
 				this.native.verifyPhoneNumberUIDelegateCompletion(phoneNumber, null, (verificationId, error) => {
-					console.log('verifyPhoneNumberUIDelegateCompletion', verificationId, error);
-					console.log(UIApplication.sharedApplication.delegate.respondsToSelector('application:didReceiveRemoteNotification:fetchCompletionHandler'));
 					if (error) {
 						reject(FirebaseError.fromNative(error));
 					} else {