From b267f2cb9c4184124892fb1de5a8cdbdfb01865a Mon Sep 17 00:00:00 2001
From: Marvin W <git@larma.de>
Date: Tue, 7 Feb 2017 19:44:26 +0100
Subject: [PATCH] Update deps and build tools

---
 .travis.yml                                        |  4 ++--
 build.gradle                                       | 10 +++++-----
 microg-ui-tools/build.gradle                       |  4 ++--
 microg-ui-tools/src/main/res/layout/switch_bar.xml |  1 -
 4 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 633ac97c..81a41e13 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -11,8 +11,8 @@ android:
   components:
     - tools
     - platform-tools
-    - build-tools-24.0.2
-    - android-24
+    - build-tools-25.0.2
+    - android-25
     - extra-android-m2repository
 before_cache:
   - rm -f $HOME/.gradle/caches/modules-2/modules-2.lock
diff --git a/build.gradle b/build.gradle
index 16cfc33c..5023cad9 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2016 microG Project Team
+ * Copyright 2013-2017 microG Project Team
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,19 +19,19 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.2.2'
+        classpath 'com.android.tools.build:gradle:2.2.3'
         classpath 'com.github.dcendents:android-maven-gradle-plugin:1.4.1'
     }
 }
 
 allprojects {
     apply plugin: 'idea'
-    ext.androidBuildVersionTools = "24.0.2"
+    ext.androidBuildVersionTools = "25.0.2"
 }
 
-def androidCompileSdk() { return 24 }
+def androidCompileSdk() { return 25 }
 
-def androidTargetSdk() { return 24 }
+def androidTargetSdk() { return 23 }
 
 def androidMinSdk() { return 7 }
 
diff --git a/microg-ui-tools/build.gradle b/microg-ui-tools/build.gradle
index e7eea6ef..73d07c37 100644
--- a/microg-ui-tools/build.gradle
+++ b/microg-ui-tools/build.gradle
@@ -45,8 +45,8 @@ android {
 }
 
 dependencies {
-    compile 'com.android.support:support-v4:25.0.0'
-    compile 'com.android.support:appcompat-v7:25.0.0'
+    compile 'com.android.support:support-v4:25.1.0'
+    compile 'com.android.support:appcompat-v7:25.1.0'
     compile 'com.takisoft.fix:preference-v7:25.0.0.1'
 }
 
diff --git a/microg-ui-tools/src/main/res/layout/switch_bar.xml b/microg-ui-tools/src/main/res/layout/switch_bar.xml
index ed980d96..1e33d87e 100644
--- a/microg-ui-tools/src/main/res/layout/switch_bar.xml
+++ b/microg-ui-tools/src/main/res/layout/switch_bar.xml
@@ -29,7 +29,6 @@
         android:ellipsize="end"
         android:maxLines="2"
         android:text="@string/v7_preference_on"
-        android:textColor="?android:attr/textColorPrimaryInverse"
         android:theme="@style/TextAppearance.AppCompat.Title.Inverse"/>
 
     <org.microg.tools.ui.ToggleSwitch