Update gradle, build tools

This commit is contained in:
Marvin W 2018-01-01 01:56:36 +01:00
parent 2ae6aa2b49
commit 1c1782ff6b
No known key found for this signature in database
GPG Key ID: 072E9235DB996F2A
8 changed files with 22 additions and 15 deletions

View File

@ -5,15 +5,19 @@ before_script:
script:
- jdk_switcher use oraclejdk8
- export TERM=dumb
- export JAVA_OPTS="-XX:MaxPermSize=1024m -XX:+CMSClassUnloadingEnabled -XX:+HeapDumpOnOutOfMemoryError -Xmx2048m"
- export JAVA_OPTS="-XX:+CMSClassUnloadingEnabled -XX:+HeapDumpOnOutOfMemoryError -Xmx2048m"
- ./gradlew build
android:
components:
- tools
- platform-tools
- build-tools-25.0.2
- android-25
- build-tools-27.0.3
- android-27
- extra-android-m2repository
licenses:
- '.+'
before_install:
- yes | sdkmanager "platforms;android-27"
before_cache:
- rm -f $HOME/.gradle/caches/modules-2/modules-2.lock
cache:

View File

@ -17,19 +17,20 @@
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"
}
def androidCompileSdk() { return 25 }
def androidCompileSdk() { return 27 }
def androidTargetSdk() { return 23 }

View File

@ -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

View File

@ -36,8 +36,10 @@ android {
}
compileOptions {
sourceCompatibility JavaVersion.VERSION_1_6
sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8
}
lintOptions {
// TODO: Remove MissingTranslation once we have stable strings and proper translations.
disable 'MissingTranslation'
@ -45,8 +47,8 @@ android {
}
dependencies {
compile 'com.android.support:support-v4:25.3.1'
compile 'com.android.support:appcompat-v7:25.3.1'
compile 'com.takisoft.fix:preference-v7:25.3.1.0'
api 'com.android.support:support-v4:25.3.1'
api 'com.android.support:appcompat-v7:25.3.1'
api 'com.takisoft.fix:preference-v7:25.3.1.0'
}

View File

@ -24,7 +24,7 @@
android:viewportWidth="24">
<path
android:fillColor="@android:color/white"
android:fillColor="#ffffff"
android:pathData="M12.0,8.0l-6.0,6.0 1.41,1.41L12.0,10.83l4.59,4.58L18.0,14.0z"/>
</vector>

View File

@ -24,7 +24,7 @@
android:viewportWidth="24">
<path
android:fillColor="@android:color/white"
android:fillColor="#ffffff"
android:pathData="M16.59,8.59L12.0,13.17 7.41,8.59 6.0,10.0l6.0,6.0 6.0,-6.0z"/>
</vector>

View File

@ -22,6 +22,6 @@
android:viewportHeight="24">
<path
android:fillColor="#000000"
android:fillColor="#ffffff"
android:pathData="M14,10H2V12H14V10M14,6H2V8H14V6M2,16H10V14H2V16M21.5,11.5L23,13L16,20L11.5,15.5L13,14L16,17L21.5,11.5Z" />
</vector>

View File

@ -60,7 +60,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:ellipsize="marquee"
android:maxLines="1"
android:singleLine="true"
android:textAppearance="?android:attr/textAppearanceListItem"/>
<TextView