Update gradle, build tools, dependencies

.travis.yml

@@ -1,9 +1,5 @@
 language: android
 sudo: false
-git:
-  submodules: false
-before_install:
-  - git submodule update --init --recursive
 script:
   - jdk_switcher use oraclejdk8
   - echo sdk.dir $ANDROID_HOME > local.properties
@@ -14,12 +10,8 @@ android:
   components:
   - tools
   - platform-tools
-  - build-tools-25.0.2
+  - build-tools-27.0.3
-  - android-25
+  - android-27
   - extra-android-m2repository
-before_cache:
+before_install:
-  - rm -f $HOME/.gradle/caches/modules-2/modules-2.lock
+ - yes | sdkmanager "platforms;android-27"
-cache:
-  directories:
-    - $HOME/.gradle/caches/
-    - $HOME/.gradle/wrapper/

build.gradle

@@ -17,22 +17,25 @@
 buildscript {
     repositories {
         jcenter()
+        google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.3.1'
+        classpath 'com.android.tools.build:gradle:3.0.1'
         classpath 'com.github.dcendents:android-maven-gradle-plugin:1.4.1'
     }
 }
 
 allprojects {
     apply plugin: 'idea'
-    ext.androidBuildVersionTools = "25.0.2"
+    ext.androidBuildVersionTools = "27.0.3"
+    ext.supportLibraryVersion = "27.0.2"
     ext.isReleaseVersion = false
+    ext.slf4jVersion = "1.7.25"
 }
 
-def androidCompileSdk() { return 25 }
+def androidCompileSdk() { return 27 }
 
-def androidTargetSdk() { return 23 }
+def androidTargetSdk() { return 27 }
 
 def androidMinSdk() { return 9 }
 
@@ -55,11 +58,7 @@ subprojects {
     group = 'org.microg'
     repositories {
         jcenter()
-    }
+        maven { url "https://maven.google.com" }
-
-    tasks.withType(JavaCompile) {
-        sourceCompatibility = JavaVersion.VERSION_1_7
-        targetCompatibility = JavaVersion.VERSION_1_7
     }
 }
 

extern/GmsApi

@@ -1 +1 @@
-Subproject commit c90a6851b2384a78b5a7a6bcd1b5e21c3d11c4ca
+Subproject commit 0e994f38058df014ea709de7826890ccc334b647

extern/GmsLib

@@ -1 +1 @@
-Subproject commit b5342173d388ebde73180e94014a62480a7cd9dd
+Subproject commit 0c8fd3f78ea47b59ec9e2716d83c46ffc8fa770b

extern/RemoteDroidGuard

@@ -1 +1 @@
-Subproject commit 8eabc788fda79ac986f09721afbeea53612096b7
+Subproject commit 47073dd7a2a039593fe556af8f9f33e325febfa7

extern/UnifiedNlp

@@ -1 +1 @@
-Subproject commit e6c6e19c9013b14f224cf503381096825bd7e6af
+Subproject commit b331309c66d399918f7b293ceb6c3533ad24af88

extern/Wearable

@@ -1 +1 @@
-Subproject commit f3cdd2dd2afc6171aba0dd69ea5b470b4daac8d4
+Subproject commit 617a43e139c6470361e44015bf1964026f3107e7

extern/vtm

@@ -1 +1 @@
-Subproject commit b651e095f019649de2adc578264c8d582551f657
+Subproject commit a47215d9848d5f0ebd1be7e281b48e531026a47f

gradle/wrapper/gradle-wrapper.properties

@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.4.1-all.zip

play-services-core/build.gradle

@@ -17,21 +17,24 @@
 apply plugin: 'com.android.application'
 
 dependencies {
-    compile 'de.hdodenhof:circleimageview:1.2.1'
+    implementation "com.android.support:support-v4:$supportLibraryVersion"
-    compile 'com.squareup.wire:wire-runtime:1.6.1'
+    implementation "com.android.support:appcompat-v7:$supportLibraryVersion"
+    implementation "com.takisoft.fix:preference-v7:$supportLibraryVersion.0"
+    implementation "de.hdodenhof:circleimageview:1.3.0"
+    implementation "com.squareup.wire:wire-runtime:1.6.1"
 
-    compile project(':microg-ui-tools')
+    implementation project(':microg-ui-tools')
-    compile project(':play-services-api')
+    implementation project(':play-services-api')
-    compile project(':play-services-wearable')
+    implementation project(':play-services-wearable')
-    compile project(':unifiednlp-base')
+    implementation project(':unifiednlp-base')
-    compile project(':wearable-lib')
+    implementation project(':wearable-lib')
 
-    compile project(':remote-droid-guard-lib')
+    implementation project(':remote-droid-guard-lib')
 
-    compile project(':vtm-android')
+    implementation project(':vtm-android')
-    compile project(':vtm-extras')
+    implementation project(':vtm-extras')
-    compile project(':vtm-jts')
+    implementation project(':vtm-jts')
-    compile project(':vtm-microg-theme')
+    implementation project(':vtm-microg-theme')
 }
 
 String getMyVersionName() {
@@ -91,6 +94,11 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
+
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
 }
 
 if (file('user.gradle').exists()) {

play-services-core/src/main/AndroidManifest.xml

@@ -15,7 +15,8 @@
   ~ limitations under the License.
   -->
 <manifest package="com.google.android.gms"
-          xmlns:android="http://schemas.android.com/apk/res/android">
+          xmlns:android="http://schemas.android.com/apk/res/android"
+          xmlns:tools="http://schemas.android.com/tools">
 
     <permission
         android:name="com.google.android.c2dm.permission.RECEIVE"
@@ -90,6 +91,8 @@
     <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"/>
+
     <application
         android:allowBackup="false"
         android:extractNativeLibs="false"

play-services-core/src/main/java/org/microg/gms/auth/AuthManagerServiceImpl.java

@@ -24,7 +24,7 @@ import android.content.Intent;
 import android.content.pm.PackageManager;
 import android.os.Bundle;
 import android.os.RemoteException;
-import android.support.v7.app.NotificationCompat;
+import android.support.v4.app.NotificationCompat;
 import android.util.Base64;
 import android.util.Log;
 

play-services-core/src/main/java/org/microg/gms/auth/login/AssistantActivity.java

@@ -16,6 +16,7 @@
 
 package org.microg.gms.auth.login;
 
+import android.annotation.SuppressLint;
 import android.app.Activity;
 import android.content.res.Configuration;
 import android.os.Bundle;
@@ -23,6 +24,7 @@ import android.support.annotation.StringRes;
 import android.util.DisplayMetrics;
 import android.view.View;
 import android.widget.Button;
+import android.widget.RelativeLayout;
 import android.widget.TextView;
 
 import com.google.android.gms.R;
@@ -50,6 +52,7 @@ public abstract class AssistantActivity extends Activity {
         });
     }
 
+    @SuppressLint("WrongViewCast")
     private void formatTitle() {
         if (getResources().getConfiguration().orientation == Configuration.ORIENTATION_PORTRAIT) {
             double widthPixels = (double) (getResources().getDisplayMetrics().widthPixels);

proguard.flags

@@ -3,7 +3,7 @@
 -optimizations !code/allocation/variable
 
 # We're referencing stuff that is unknown to the system
--libraryjar ../unifiednlp-compat/build/classes/main
+-libraryjar ../unifiednlp-compat/build/classes/java/main
 -dontwarn java.awt.**
 -dontwarn javax.annotation.**
 

vtm-microg-theme/src/org/oscim/theme/MicrogThemes.java

@@ -29,4 +29,13 @@ public enum MicrogThemes implements ThemeFile {
     public InputStream getRenderThemeAsStream() {
         return AssetAdapter.readFileAsStream(mPath);
     }
+
+    @Override
+    public void setMenuCallback(XmlRenderThemeMenuCallback menuCallback) {
+    }
+
+    @Override
+    public boolean isMapsforgeTheme() {
+        return false;
+    }
 }