diff --git a/.travis.yml b/.travis.yml
index 81a41e13..7c64ebf2 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -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:
diff --git a/build.gradle b/build.gradle
index 33dc88e2..58dc03ba 100644
--- a/build.gradle
+++ b/build.gradle
@@ -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 }
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index f766b3e6..f5c485b8 100755
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/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
diff --git a/microg-ui-tools/build.gradle b/microg-ui-tools/build.gradle
index b032f56e..362e733b 100644
--- a/microg-ui-tools/build.gradle
+++ b/microg-ui-tools/build.gradle
@@ -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'
}
diff --git a/microg-ui-tools/src/main/res/drawable/ic_expand_less.xml b/microg-ui-tools/src/main/res/drawable/ic_expand_less.xml
index 172dca9b..62ff063e 100644
--- a/microg-ui-tools/src/main/res/drawable/ic_expand_less.xml
+++ b/microg-ui-tools/src/main/res/drawable/ic_expand_less.xml
@@ -24,7 +24,7 @@
android:viewportWidth="24">
diff --git a/microg-ui-tools/src/main/res/drawable/ic_expand_more.xml b/microg-ui-tools/src/main/res/drawable/ic_expand_more.xml
index 4401a272..871f6575 100644
--- a/microg-ui-tools/src/main/res/drawable/ic_expand_more.xml
+++ b/microg-ui-tools/src/main/res/drawable/ic_expand_more.xml
@@ -24,7 +24,7 @@
android:viewportWidth="24">
diff --git a/microg-ui-tools/src/main/res/drawable/self_check.xml b/microg-ui-tools/src/main/res/drawable/self_check.xml
index 1d840b95..92b47890 100644
--- a/microg-ui-tools/src/main/res/drawable/self_check.xml
+++ b/microg-ui-tools/src/main/res/drawable/self_check.xml
@@ -22,6 +22,6 @@
android:viewportHeight="24">
\ No newline at end of file
diff --git a/microg-ui-tools/src/main/res/layout-v21/preference_material.xml b/microg-ui-tools/src/main/res/layout-v21/preference_material.xml
index 48401045..78261f37 100644
--- a/microg-ui-tools/src/main/res/layout-v21/preference_material.xml
+++ b/microg-ui-tools/src/main/res/layout-v21/preference_material.xml
@@ -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"/>