diff --git a/.travis.yml b/.travis.yml index ec24a2370..a666ed148 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,7 +5,7 @@ jdk: env: global: - ANDROID=28 - - ANDROID_BUILD_TOOLS=28.0.2 + - ANDROID_BUILD_TOOLS=28.0.3 - GRADLE_OPTS="-Xmx2048m" - secure: UtoDY9kpdxNA7hwISdkz5lZTOGRuIxt+OF3K68jRLqG4MnGEO17jJ+cFMEDQ8iuPogNnlGNgsGrrqwTncCh9xftlDDcu29tzGCmoW74EwWni99ppgXbH3CQSFdZ7ubQ47ELbJPjnP6ITwmDURQ9C1beIJrRbHSe0H9Pg3kuIC5Me/aWEVTAoNuVjQD9cXI5GFcj1lO3QRRTMbS0Sy2zuoOwV4frWT3+NKzKZ69Y7B+w9QWnhAmYogeVk80UQZcHRgJD8jxz5B96uToZHun4uN4xIDLu011IffohuaZR2QHA9c1WmZNyN//gaflCYNphGYslupcft0AxhOYQvv9iQSgRgdPuocIPlHztbklEt1XgVxyU1XT9jw3zYIM4NsTSjBEs7txghZEQttxoroCXx/B8oqo6mof9Xjg1Tq/KShE8BWAAImxJNpGDEBKhcXwgGqls1YMD5+VW6ncGTuGWJVpFZVQ4sjD3+mWhCjgwBF5UP3U29e3WBROEdk80tqeTTt5yr28MbKDrG7SswnU0zFjvwrYNCunp7HZuFo7RzoYGyDujas6c+HE6uDMSYTFYRVRisX2U2fgYNGjShRiltTW7cj99BGm0+9edEj8+6snWqtxknEGk9sCSufv0OSdpddl7ZihaWyQ02VVDFXi1bKo9fNGwjx2wASZQr42NeZyE= - secure: U/PKpCUtnofYNfKJ4uS/OAir0Rq80QYirshnMg270XCHQDtZ82RAlLLPop2/9BtXhTH3tYvmBDjMhy4Z9o4dbGaUgVuVZ56u4E6O8KZUpVVCe8o2+ra0pTKoFWc62aQYAZjJtqZjrXQTeFFQULoHc4Ep5O95JWFLKK/74OqAQiAOr/3Y7hMWlA0l8ifM5U/3xsLqAYUBAw5d/GBg0gYtqZvt88cHrBwBk9caDPcjqTLdAX/CuH9Mkz5MK1obXPL6o2YDFNTVlVMXKlPJv/PCBGlAM8fRdTwFKJjQy2DZ9gio3xUGvaLo9PNQMLoLXIAPqUfd46VvuWXZXMW6Hv4bs6mc5yw6yYFLZdJGcE4tLe3SCFkt8yXyhvvRFVhG68aqzVY+JtKZ/UXhX9qhFaH5RsnjRA2Hw9R3Q1Azk81ZRRBtraDpzMsLV3MaFjoCdEEm/l3pcBYmXXlI/Mh02ZLgX+9a6nygAZvpCclrvLCPJyXQFqwP/d/jdZBwXWjj2TNGliXNkQBNr0XYY/wfHkjp8/cM7Y4NVAgX0Emrp7alnqZkcYvsGLkpjUV8NUwZQ63+cH5TSxtRefm6bwTF9BgxLfLekgH+XWA6Pp14KJsgX4OGAvExL6uryTaW9W0/yAa+f8hhPXnHN9YS8IyhPDIrJLwOcipqY8jOCvmYkU2QDCY= diff --git a/build.gradle b/build.gradle index add99d060..131935d2b 100644 --- a/build.gradle +++ b/build.gradle @@ -4,8 +4,8 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:3.1.4' - classpath 'com.github.dcendents:android-maven-gradle-plugin:2.0' + classpath 'com.android.tools.build:gradle:3.2.0' + classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1' } } @@ -17,7 +17,7 @@ allprojects { group = 'org.mapsforge' version = 'master-SNAPSHOT' ext.isReleaseVersion = !version.endsWith("SNAPSHOT") - ext.androidBuildVersionTools = "28.0.2" + ext.androidBuildVersionTools = "28.0.3" ext.jUnitVersion = "4.12" if (JavaVersion.current().isJava8Compatible()) { diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 7a3265ee9..f6b961fd5 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 3c6a4f743..9a4163a4f 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,5 @@ -#Wed Mar 28 09:56:50 EEST 2018 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip