diff --git a/build.gradle b/build.gradle
index 75560a46..eb2ee5dc 100644
--- a/build.gradle
+++ b/build.gradle
@@ -20,15 +20,15 @@ buildscript {
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.0.1'
-        classpath 'com.github.dcendents:android-maven-gradle-plugin:1.4.1'
+        classpath 'com.android.tools.build:gradle:3.1.0'
+        classpath 'com.github.dcendents:android-maven-gradle-plugin:2.0'
     }
 }
 
 allprojects {
     apply plugin: 'idea'
     ext.androidBuildVersionTools = "27.0.3"
-    ext.supportLibraryVersion = "27.0.2"
+    ext.supportLibraryVersion = "27.1.0"
     ext.isReleaseVersion = false
     ext.slf4jVersion = "1.7.25"
 }
@@ -58,7 +58,7 @@ subprojects {
     group = 'org.microg'
     repositories {
         jcenter()
-        maven { url "https://maven.google.com" }
+        google()
     }
 }
 
diff --git a/extern/GmsApi b/extern/GmsApi
index 0e994f38..db0be6ba 160000
--- a/extern/GmsApi
+++ b/extern/GmsApi
@@ -1 +1 @@
-Subproject commit 0e994f38058df014ea709de7826890ccc334b647
+Subproject commit db0be6ba010f52b4d12e69aed2482c38a3c2406c
diff --git a/extern/GmsLib b/extern/GmsLib
index 0c8fd3f7..90e9b7b7 160000
--- a/extern/GmsLib
+++ b/extern/GmsLib
@@ -1 +1 @@
-Subproject commit 0c8fd3f78ea47b59ec9e2716d83c46ffc8fa770b
+Subproject commit 90e9b7b79dcaddfce887f87b94f80adeed8791e6
diff --git a/play-services-core/build.gradle b/play-services-core/build.gradle
index 7d561ef7..b43dfe90 100644
--- a/play-services-core/build.gradle
+++ b/play-services-core/build.gradle
@@ -63,9 +63,9 @@ android {
 
     defaultConfig {
         versionName getMyVersionName()
-        def x = getMyVersionCode() - 350
+        def x = getMyVersionCode() - 367
         // We are not allowed to freely choose the hundreds column as it defines the device type
-        versionCode(11951400 + x % 100 + ((int) (x / 100)) * 1000)
+        versionCode(12221400 + x % 100 + ((int) (x / 100)) * 1000)
 
         minSdkVersion androidMinSdk()
         targetSdkVersion androidTargetSdk()
diff --git a/play-services-core/src/main/AndroidManifest.xml b/play-services-core/src/main/AndroidManifest.xml
index a09782e6..2a8b7dd6 100644
--- a/play-services-core/src/main/AndroidManifest.xml
+++ b/play-services-core/src/main/AndroidManifest.xml
@@ -91,7 +91,7 @@
     <uses-permission android:name="android.permission.REQUEST_IGNORE_BATTERY_OPTIMIZATIONS"/>
     <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>
 
-    <uses-sdk tools:overrideLibrary="com.takisoft.fix.support.v7.preference,android.support.graphics.drawable.animated,android.arch.lifecycle"/>
+    <uses-sdk tools:overrideLibrary="com.takisoft.fix.support.v7.preference,android.support.graphics.drawable.animated,android.arch.lifecycle,android.arch.lifecycle.livedata.core,android.arch.lifecycle.viewmodel,android.arch.core"/>
 
     <application
         android:allowBackup="false"