diff --git a/android/build.gradle b/android/build.gradle
index 188602979..2c6a368cc 100644
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -1,15 +1,7 @@
-buildscript {
-    repositories {
-        mavenCentral()
-        mavenLocal()
-        google()
-    }
-    dependencies {
-        classpath 'com.android.tools.build:gradle:4.2.2'
-    }
+plugins {
+    id 'com.android.library'
 }
 
-apply plugin: 'com.android.library'
 apply from: '../common.gradle'
 
 ext {
@@ -84,9 +76,21 @@ tasks.withType(com.android.build.gradle.internal.tasks.AndroidTestTask) { task -
     }
 }
 
-apply from: '../dependencies.gradle'
 dependencies {
+    implementation 'org.msgpack:msgpack-core:0.8.11'
+    implementation 'com.google.code.gson:gson:2.9.0'
+    implementation 'com.davidehrmann.vcdiff:vcdiff-core:0.1.1'
     implementation 'com.google.firebase:firebase-messaging:22.0.0'
+    implementation project(':network-client-core')
+    implementation project(':network-client-default')
+    testImplementation 'org.hamcrest:hamcrest-all:1.3'
+    testImplementation 'junit:junit:4.12'
+    testImplementation 'org.nanohttpd:nanohttpd:2.3.0'
+    testImplementation 'org.nanohttpd:nanohttpd-nanolets:2.3.0'
+    testImplementation 'org.nanohttpd:nanohttpd-websocket:2.3.0'
+    testImplementation 'org.mockito:mockito-core:1.10.19'
+    testImplementation 'net.jodah:concurrentunit:0.4.2'
+    testImplementation 'org.slf4j:slf4j-simple:1.7.30'
     androidTestImplementation 'com.android.support.test:runner:0.5'
     androidTestImplementation 'com.android.support.test:rules:0.5'
     androidTestImplementation 'com.crittercism.dexmaker:dexmaker:1.4'
diff --git a/build.gradle b/build.gradle
index 0eeb9d023..f7d5b7087 100644
--- a/build.gradle
+++ b/build.gradle
@@ -3,6 +3,7 @@
 plugins {
     id 'io.codearte.nexus-staging' version '0.21.1'
     id 'io.freefair.lombok' version '5.0.1' apply false
+    id 'com.android.library' version '4.2.2' apply false
 }
 
 repositories {
diff --git a/network-client-core/build.gradle.kts b/network-client-core/build.gradle.kts
index 162f399b5..e3a23b7e2 100644
--- a/network-client-core/build.gradle.kts
+++ b/network-client-core/build.gradle.kts
@@ -3,6 +3,11 @@ plugins {
     id("io.freefair.lombok")
 }
 
+java {
+  sourceCompatibility = JavaVersion.VERSION_1_8
+  targetCompatibility = JavaVersion.VERSION_1_8
+}
+
 tasks.compileJava {
     sourceCompatibility = "1.8"
     targetCompatibility = "1.8"
@@ -11,3 +16,4 @@ tasks.compileJava {
 repositories {
     mavenCentral()
 }
+
diff --git a/settings.gradle b/settings.gradle
index 491c02b9a..2c4adc0a2 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1,3 +1,11 @@
+pluginManagement {
+    repositories {
+        google()
+        gradlePluginPortal()
+        mavenCentral()
+    }
+}
+
 rootProject.name = 'ably-java'
 include 'java',
     'android',