diff --git a/.gitignore b/.gitignore
index 8256eac..2d285bf 100644
--- a/.gitignore
+++ b/.gitignore
@@ -32,3 +32,4 @@ nbproject
 /metadata.json
 ios/firebase.analytics-iphone-*.zip
 /ios/dist
+android/.gradle
diff --git a/android/.gradle/4.6/fileChanges/last-build.bin b/android/.gradle/4.6/fileChanges/last-build.bin
deleted file mode 100644
index f76dd23..0000000
Binary files a/android/.gradle/4.6/fileChanges/last-build.bin and /dev/null differ
diff --git a/android/.gradle/4.6/fileContent/fileContent.lock b/android/.gradle/4.6/fileContent/fileContent.lock
deleted file mode 100644
index f3e8286..0000000
Binary files a/android/.gradle/4.6/fileContent/fileContent.lock and /dev/null differ
diff --git a/android/.gradle/4.6/fileHashes/fileHashes.bin b/android/.gradle/4.6/fileHashes/fileHashes.bin
deleted file mode 100644
index e548ba2..0000000
Binary files a/android/.gradle/4.6/fileHashes/fileHashes.bin and /dev/null differ
diff --git a/android/.gradle/4.6/fileHashes/fileHashes.lock b/android/.gradle/4.6/fileHashes/fileHashes.lock
deleted file mode 100644
index 8995bc2..0000000
Binary files a/android/.gradle/4.6/fileHashes/fileHashes.lock and /dev/null differ
diff --git a/android/.gradle/4.6/taskHistory/taskHistory.bin b/android/.gradle/4.6/taskHistory/taskHistory.bin
deleted file mode 100644
index a843c33..0000000
Binary files a/android/.gradle/4.6/taskHistory/taskHistory.bin and /dev/null differ
diff --git a/android/.gradle/4.6/taskHistory/taskHistory.lock b/android/.gradle/4.6/taskHistory/taskHistory.lock
deleted file mode 100644
index ca9e5c4..0000000
Binary files a/android/.gradle/4.6/taskHistory/taskHistory.lock and /dev/null differ
diff --git a/android/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/android/.gradle/buildOutputCleanup/buildOutputCleanup.lock
deleted file mode 100644
index af27af7..0000000
Binary files a/android/.gradle/buildOutputCleanup/buildOutputCleanup.lock and /dev/null differ
diff --git a/android/.gradle/buildOutputCleanup/cache.properties b/android/.gradle/buildOutputCleanup/cache.properties
deleted file mode 100644
index 692353f..0000000
--- a/android/.gradle/buildOutputCleanup/cache.properties
+++ /dev/null
@@ -1,2 +0,0 @@
-#Sat Apr 21 11:00:17 CEST 2018
-gradle.version=4.6
diff --git a/android/.gradle/buildOutputCleanup/outputFiles.bin b/android/.gradle/buildOutputCleanup/outputFiles.bin
deleted file mode 100644
index 161e973..0000000
Binary files a/android/.gradle/buildOutputCleanup/outputFiles.bin and /dev/null differ
diff --git a/android/.project b/android/.project
index b0c0c84..308d758 100644
--- a/android/.project
+++ b/android/.project
@@ -6,17 +6,22 @@
 	</projects>
 	<buildSpec>
 		<buildCommand>
-			<name>com.appcelerator.titanium.core.builder</name>
+			<name>org.eclipse.jdt.core.javabuilder</name>
 			<arguments>
 			</arguments>
 		</buildCommand>
 		<buildCommand>
-			<name>com.aptana.ide.core.unifiedBuilder</name>
+			<name>org.eclipse.buildship.core.gradleprojectbuilder</name>
 			<arguments>
 			</arguments>
 		</buildCommand>
 		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
+			<name>com.appcelerator.titanium.core.builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>com.aptana.ide.core.unifiedBuilder</name>
 			<arguments>
 			</arguments>
 		</buildCommand>
@@ -25,5 +30,6 @@
 		<nature>org.eclipse.jdt.core.javanature</nature>
 		<nature>com.appcelerator.titanium.mobile.module.nature</nature>
 		<nature>com.aptana.projects.webnature</nature>
+		<nature>org.eclipse.buildship.core.gradleprojectnature</nature>
 	</natures>
 </projectDescription>
diff --git a/android/Resources/README.md b/android/Resources/README.md
deleted file mode 100644
index 8a22549..0000000
--- a/android/Resources/README.md
+++ /dev/null
@@ -1,8 +0,0 @@
-Files in this folder are copied directory into the compiled product directory
-when the Android app is compiled:
-
-    <project-dir>/build/android/bin/assets/Resources/
-
-Files in this directory are copied directly on top of whatever files are already
-in the build directory, so please be careful that your files don't clobber
-essential project files or files from other modules.
diff --git a/android/java-sources.txt b/android/java-sources.txt
index 044a9b5..cef88f0 100644
--- a/android/java-sources.txt
+++ b/android/java-sources.txt
@@ -13,5 +13,6 @@
 "/Users/hans/Documents/dev/titanium/titanium-firebase-analytics/android/build/generated/r/android/support/v7/appcompat/R.java"
 "/Users/hans/Documents/dev/titanium/titanium-firebase-analytics/android/build/generated/r/android/support/v7/cardview/R.java"
 "/Users/hans/Documents/dev/titanium/titanium-firebase-analytics/android/build/generated/r/android/support/v7/recyclerview/R.java"
+"/Users/hans/Documents/dev/titanium/titanium-firebase-analytics/android/build/generated/r/com/google/firebase/measurement/R.java"
 "/Users/hans/Documents/dev/titanium/titanium-firebase-analytics/android/build/generated/r/firebase/analytics/R.java"
 "/Users/hans/Documents/dev/titanium/titanium-firebase-analytics/android/build/generated/r/ti/modules/titanium/ui/R.java"
\ No newline at end of file
diff --git a/android/platform/README.md b/android/platform/README.md
deleted file mode 100644
index ced6ac3..0000000
--- a/android/platform/README.md
+++ /dev/null
@@ -1,10 +0,0 @@
-Files in this folder are copied directory into the Android build directory
-when the Android app is compiled:
-
-    <project-dir>/build/android
-
-You can place files such as res strings or drawable files.
-
-Files in this directory are copied directly on top of whatever files are already
-in the build directory, so please be careful that your files don't clobber
-essential project files or files from other modules.