Removed requirement of Android hooks (which was failing at the time o…

…f plugin uninstallation) fixes #63
dpa99c · Jul 26, 2019 · 531bfe5 · 531bfe5
1 parent a7ae1dd
commit 531bfe5
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 139 deletions.
diff --git a/plugin.xml b/plugin.xml
@@ -16,9 +16,6 @@
 	</engines>
 
 	<platform name="android">
-		<hook type="after_plugin_install" src="scripts/android/after_plugin_install.js" />
-		<hook type="before_plugin_uninstall" src="scripts/android/before_plugin_uninstall.js" />
-
 		<js-module name="FirebasePlugin" src="www/firebase.js">
 			<clobbers target="FirebasePlugin" />
 		</js-module>

diff --git a/scripts/android/after_plugin_install.js b/scripts/android/after_plugin_install.js
diff --git a/scripts/android/before_plugin_uninstall.js b/scripts/android/before_plugin_uninstall.js
diff --git a/scripts/android/helper.js b/scripts/android/helper.js
diff --git a/src/android/build.gradle b/src/android/build.gradle
@@ -1,10 +1,14 @@
 buildscript {
     repositories {
         google()
+        maven {
+            url "https://maven.fabric.io/public"
+        }
         mavenCentral()
         jcenter()
     }
     dependencies {
+        classpath "io.fabric.tools:gradle:1.30.0"
         classpath 'com.android.tools.build:gradle:3.4.1'
         classpath 'com.google.gms:google-services:4.2.0'
     }
@@ -17,8 +21,9 @@ repositories {
 }
 
 cdvPluginPostBuildExtras.add({
-    apply plugin: 'com.google.gms.google-services'
-    apply plugin: 'io.fabric'
+    // Use class instead of id (string) to be able to apply plugin from non-root gradle file
+    apply plugin: com.google.gms.googleservices.GoogleServicesPlugin
+    apply plugin: com.crashlytics.tools.gradle.CrashlyticsPlugin
 
     // Enable Crashlytics NDK reporting
     crashlytics {