diff --git a/Android/azuremobile.android/build.gradle b/Android/azuremobile.android/build.gradle
index 4b87dcd..c70f362 100644
--- a/Android/azuremobile.android/build.gradle
+++ b/Android/azuremobile.android/build.gradle
@@ -11,7 +11,9 @@ android {
         targetCompatibility 1.8
     }
 
-
+    sourceSets {
+        main.java.srcDirs += 'src/main/kotlin'
+    }
 
     defaultConfig {
         minSdkVersion 16
@@ -47,3 +49,13 @@ dependencies {
 
     implementation 'com.azure.mobile:azuredata:0.1.0'
 }
+
+tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).all {
+    kotlinOptions {
+        jvmTarget = "1.8"
+    }
+}
+
+tasks.withType(Javadoc) {
+    enabled = false
+}
\ No newline at end of file
diff --git a/Android/build.gradle b/Android/build.gradle
index b2173df..659a0d1 100644
--- a/Android/build.gradle
+++ b/Android/build.gradle
@@ -2,10 +2,12 @@
 
 buildscript {
     ext.kotlin_version = '1.2.41'
+
     repositories {
         google()
         jcenter()
     }
+
     dependencies {
         classpath 'com.android.tools.build:gradle:3.1.2'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"