diff --git a/.travis.yml b/.travis.yml index 549db8b..cb9df09 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,6 +5,7 @@ git: before_script: - echo sdk.dir $ANDROID_HOME > local.properties script: + - jdk_switcher use oraclejdk8 - export TERM=dumb - export JAVA_OPTS="-XX:MaxPermSize=1024m -XX:+CMSClassUnloadingEnabled -XX:+HeapDumpOnOutOfMemoryError -Xmx2048m" - ./gradlew build @@ -12,8 +13,8 @@ android: components: - platform-tools - tools - - build-tools-23.0.2 - - android-23 + - 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 9f57399..7349383 100644 --- a/build.gradle +++ b/build.gradle @@ -16,10 +16,10 @@ buildscript { repositories { - mavenCentral() + jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:1.5.0' + classpath 'com.android.tools.build:gradle:2.3.1' } } @@ -42,10 +42,7 @@ String getMyVersionName() { int getMyVersionCode() { def stdout = new ByteArrayOutputStream() - exec { - commandLine 'git', 'rev-list', '--count', "HEAD" - standardOutput = stdout - } + exec { commandLine 'git', 'rev-list', '--count', "HEAD"; standardOutput = stdout } return Integer.parseInt(stdout.toString().trim()) } @@ -54,14 +51,14 @@ repositories { } dependencies { - compile 'org.microg:unifiednlp-api:1.5.3' + compile 'org.microg:unifiednlp-api:1.5.6' compile 'com.squareup.wire:wire-runtime:1.5.0' compile 'org.osmdroid:osmdroid-android:5.1' } android { - compileSdkVersion 23 - buildToolsVersion "23.0.2" + compileSdkVersion 25 + buildToolsVersion "25.0.2" defaultConfig { versionName getMyVersionName() diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index c48106c..0c44112 100755 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -14,9 +14,9 @@ # limitations under the License. # -#Wed Jan 14 11:55:04 CET 2015 +#Sat Apr 22 15:09:21 CEST 2017 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-2.2.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip diff --git a/src/main/AndroidManifest.xml b/src/main/AndroidManifest.xml index e6905b6..ba30f12 100644 --- a/src/main/AndroidManifest.xml +++ b/src/main/AndroidManifest.xml @@ -1,6 +1,6 @@