Didn't find class org.nativescript.plugins.MyFirebaseMessagingService #983

EddyVerbruggen · EddyVerbruggen · commit 59857e62cc7b · 2018-10-22T14:17:30.000+02:00
diff --git a/demo-push/package.json b/demo-push/package.json
@@ -9,7 +9,7 @@
     }
   },
   "dependencies": {
-    "nativescript-plugin-firebase": "file:../publish/package/nativescript-plugin-firebase-7.1.6.tgz",
+    "nativescript-plugin-firebase": "file:../publish/package/nativescript-plugin-firebase-7.3.0.tgz",
     "nativescript-theme-core": "^1.0.4",
     "nativescript-unit-test-runner": "^0.3.4",
     "tns-core-modules": "~4.2.0"
diff --git a/publish/scripts/installer.js b/publish/scripts/installer.js
@@ -263,6 +263,7 @@ function promptQuestionsResult(result) {
     writeGoogleServiceCopyHook();
     writeGoogleServiceGradleHook(result);
     echoAndroidManifestChanges(result);
+    activateAndroidPushNotificationsLib(isSelected(result.messaging || externalPushClientOnly));
   }
 
   console.log('Firebase post install completed. To re-run this script, navigate to the root directory of `nativescript-plugin-firebase` in your `node_modules` folder and run: `npm run config`.');
@@ -294,6 +295,7 @@ function echoAndroidManifestChanges(result) {
   }
 }
 
+// I don't think we still need this, but it doesn't hurt either
 function exposeAdMobSymbols(enable) {
   if (enable && fs.existsSync(directories.ios + '/build.xcconfig.admob')) {
     fs.renameSync(directories.ios + '/build.xcconfig.admob', directories.ios + '/build.xcconfig');
@@ -302,6 +304,14 @@ function exposeAdMobSymbols(enable) {
   }
 }
 
+function activateAndroidPushNotificationsLib(enable) {
+  if (enable && fs.existsSync(path.join(directories.android, 'firebase-release.aar-disabled'))) {
+    fs.renameSync(path.join(directories.android, 'firebase-release.aar-disabled'), path.join(directories.android, 'firebase-release.aar'));
+  } else if (!enable && fs.existsSync(path.join(directories.android, 'firebase-release.aar'))) {
+    fs.renameSync(path.join(directories.android, 'firebase-release.aar'), path.join(directories.android, 'firebase-release.aar-disabled'));
+  }
+}
+
 function askSaveConfigPrompt() {
   prompt.get({
     name: 'save_config',
diff --git a/src/platforms/android/firebase-release.aar-disabled b/src/platforms/android/firebase-release.aar-disabled
diff --git a/src/scripts/postinstall.js b/src/scripts/postinstall.js
@@ -3061,6 +3061,7 @@ function promptQuestionsResult(result) {
     writeGoogleServiceCopyHook();
     writeGoogleServiceGradleHook(result);
     echoAndroidManifestChanges(result);
+    activateAndroidPushNotificationsLib(isSelected(result.messaging || externalPushClientOnly));
   }
 
   console.log('Firebase post install completed. To re-run this script, navigate to the root directory of `nativescript-plugin-firebase` in your `node_modules` folder and run: `npm run config`.');
@@ -3092,6 +3093,7 @@ function echoAndroidManifestChanges(result) {
   }
 }
 
+// I don't think we still need this, but it doesn't hurt either
 function exposeAdMobSymbols(enable) {
   if (enable && fs.existsSync(directories.ios + '/build.xcconfig.admob')) {
     fs.renameSync(directories.ios + '/build.xcconfig.admob', directories.ios + '/build.xcconfig');
@@ -3100,6 +3102,14 @@ function exposeAdMobSymbols(enable) {
   }
 }
 
+function activateAndroidPushNotificationsLib(enable) {
+  if (enable && fs.existsSync(path.join(directories.android, 'firebase-release.aar-disabled'))) {
+    fs.renameSync(path.join(directories.android, 'firebase-release.aar-disabled'), path.join(directories.android, 'firebase-release.aar'));
+  } else if (!enable && fs.existsSync(path.join(directories.android, 'firebase-release.aar'))) {
+    fs.renameSync(path.join(directories.android, 'firebase-release.aar'), path.join(directories.android, 'firebase-release.aar-disabled'));
+  }
+}
+
 function askSaveConfigPrompt() {
   prompt.get({
     name: 'save_config',

Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@`
`9`	`9`	`}`
`10`	`10`	`},`
`11`	`11`	`"dependencies": {`
`12`		`- "nativescript-plugin-firebase": "file:../publish/package/nativescript-plugin-firebase-7.1.6.tgz",`
	`12`	`+ "nativescript-plugin-firebase": "file:../publish/package/nativescript-plugin-firebase-7.3.0.tgz",`
`13`	`13`	`"nativescript-theme-core": "^1.0.4",`
`14`	`14`	`"nativescript-unit-test-runner": "^0.3.4",`
`15`	`15`	`"tns-core-modules": "~4.2.0"`
Original file line number	Diff line number	Diff line change
`@@ -263,6 +263,7 @@ function promptQuestionsResult(result) {`
`263`	`263`	`writeGoogleServiceCopyHook();`
`264`	`264`	`writeGoogleServiceGradleHook(result);`
`265`	`265`	`echoAndroidManifestChanges(result);`
	`266`	`+ activateAndroidPushNotificationsLib(isSelected(result.messaging \|\| externalPushClientOnly));`
`266`	`267`	`}`
`267`	`268`
`268`	`269`	console.log('Firebase post install completed. To re-run this script, navigate to the root directory of `nativescript-plugin-firebase` in your `node_modules` folder and run: `npm run config`.');
`@@ -294,6 +295,7 @@ function echoAndroidManifestChanges(result) {`
`294`	`295`	`}`
`295`	`296`	`}`
`296`	`297`
	`298`	`+// I don't think we still need this, but it doesn't hurt either`
`297`	`299`	`function exposeAdMobSymbols(enable) {`
`298`	`300`	`if (enable && fs.existsSync(directories.ios + '/build.xcconfig.admob')) {`
`299`	`301`	`fs.renameSync(directories.ios + '/build.xcconfig.admob', directories.ios + '/build.xcconfig');`
`@@ -302,6 +304,14 @@ function exposeAdMobSymbols(enable) {`
`302`	`304`	`}`
`303`	`305`	`}`
`304`	`306`
	`307`	`+function activateAndroidPushNotificationsLib(enable) {`
	`308`	`+ if (enable && fs.existsSync(path.join(directories.android, 'firebase-release.aar-disabled'))) {`
	`309`	`+ fs.renameSync(path.join(directories.android, 'firebase-release.aar-disabled'), path.join(directories.android, 'firebase-release.aar'));`
	`310`	`+ } else if (!enable && fs.existsSync(path.join(directories.android, 'firebase-release.aar'))) {`
	`311`	`+ fs.renameSync(path.join(directories.android, 'firebase-release.aar'), path.join(directories.android, 'firebase-release.aar-disabled'));`
	`312`	`+ }`
	`313`	`+}`
	`314`	`+`
`305`	`315`	`function askSaveConfigPrompt() {`
`306`	`316`	`prompt.get({`
`307`	`317`	`name: 'save_config',`
Original file line number	Diff line number	Diff line change
`@@ -3061,6 +3061,7 @@ function promptQuestionsResult(result) {`
`3061`	`3061`	`writeGoogleServiceCopyHook();`
`3062`	`3062`	`writeGoogleServiceGradleHook(result);`
`3063`	`3063`	`echoAndroidManifestChanges(result);`
	`3064`	`+ activateAndroidPushNotificationsLib(isSelected(result.messaging \|\| externalPushClientOnly));`
`3064`	`3065`	`}`
`3065`	`3066`
`3066`	`3067`	console.log('Firebase post install completed. To re-run this script, navigate to the root directory of `nativescript-plugin-firebase` in your `node_modules` folder and run: `npm run config`.');
`@@ -3092,6 +3093,7 @@ function echoAndroidManifestChanges(result) {`
`3092`	`3093`	`}`
`3093`	`3094`	`}`
`3094`	`3095`
	`3096`	`+// I don't think we still need this, but it doesn't hurt either`
`3095`	`3097`	`function exposeAdMobSymbols(enable) {`
`3096`	`3098`	`if (enable && fs.existsSync(directories.ios + '/build.xcconfig.admob')) {`
`3097`	`3099`	`fs.renameSync(directories.ios + '/build.xcconfig.admob', directories.ios + '/build.xcconfig');`
`@@ -3100,6 +3102,14 @@ function exposeAdMobSymbols(enable) {`
`3100`	`3102`	`}`
`3101`	`3103`	`}`
`3102`	`3104`
	`3105`	`+function activateAndroidPushNotificationsLib(enable) {`
	`3106`	`+ if (enable && fs.existsSync(path.join(directories.android, 'firebase-release.aar-disabled'))) {`
	`3107`	`+ fs.renameSync(path.join(directories.android, 'firebase-release.aar-disabled'), path.join(directories.android, 'firebase-release.aar'));`
	`3108`	`+ } else if (!enable && fs.existsSync(path.join(directories.android, 'firebase-release.aar'))) {`
	`3109`	`+ fs.renameSync(path.join(directories.android, 'firebase-release.aar'), path.join(directories.android, 'firebase-release.aar-disabled'));`
	`3110`	`+ }`
	`3111`	`+}`
	`3112`	`+`
`3103`	`3113`	`function askSaveConfigPrompt() {`
`3104`	`3114`	`prompt.get({`
`3105`	`3115`	`name: 'save_config',`