Update deps and build tools

This commit is contained in:
Marvin W 2017-02-07 19:44:26 +01:00
parent fe56b4b61e
commit b267f2cb9c
No known key found for this signature in database
GPG Key ID: 072E9235DB996F2A
4 changed files with 9 additions and 10 deletions

View File

@ -11,8 +11,8 @@ android:
components: components:
- tools - tools
- platform-tools - platform-tools
- build-tools-24.0.2 - build-tools-25.0.2
- android-24 - android-25
- extra-android-m2repository - extra-android-m2repository
before_cache: before_cache:
- rm -f $HOME/.gradle/caches/modules-2/modules-2.lock - rm -f $HOME/.gradle/caches/modules-2/modules-2.lock

View File

@ -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"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -19,19 +19,19 @@ buildscript {
jcenter() jcenter()
} }
dependencies { 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' classpath 'com.github.dcendents:android-maven-gradle-plugin:1.4.1'
} }
} }
allprojects { allprojects {
apply plugin: 'idea' 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 } def androidMinSdk() { return 7 }

View File

@ -45,8 +45,8 @@ android {
} }
dependencies { dependencies {
compile 'com.android.support:support-v4:25.0.0' compile 'com.android.support:support-v4:25.1.0'
compile 'com.android.support:appcompat-v7:25.0.0' compile 'com.android.support:appcompat-v7:25.1.0'
compile 'com.takisoft.fix:preference-v7:25.0.0.1' compile 'com.takisoft.fix:preference-v7:25.0.0.1'
} }

View File

@ -29,7 +29,6 @@
android:ellipsize="end" android:ellipsize="end"
android:maxLines="2" android:maxLines="2"
android:text="@string/v7_preference_on" android:text="@string/v7_preference_on"
android:textColor="?android:attr/textColorPrimaryInverse"
android:theme="@style/TextAppearance.AppCompat.Title.Inverse"/> android:theme="@style/TextAppearance.AppCompat.Title.Inverse"/>
<org.microg.tools.ui.ToggleSwitch <org.microg.tools.ui.ToggleSwitch