diff options
| author | tobrun <tobrun.van.nuland@gmail.com> | 2017-11-07 12:29:47 +0100 |
|---|---|---|
| committer | tobrun <tobrun.van.nuland@gmail.com> | 2017-11-07 12:29:47 +0100 |
| commit | 4b11ad2bf00ed6045899af39f9acc72511efe515 (patch) | |
| tree | 64905365e70d688e8a07f278e94d0d382b71e4c8 | |
| parent | 9aac976104f4c6453cf9e79e03a002565720f213 (diff) | |
| download | qtlocation-mapboxgl-4b11ad2bf00ed6045899af39f9acc72511efe515.tar.gz | |
[android] - bump project to gradle 4.1, enable java 8 language features
| -rw-r--r-- | platform/android/MapboxGLAndroidSDK/build.gradle | 4 | ||||
| -rw-r--r-- | platform/android/MapboxGLAndroidSDKTestApp/build.gradle | 5 | ||||
| -rw-r--r-- | platform/android/build.gradle | 2 | ||||
| -rw-r--r-- | platform/android/dependencies.gradle | 2 | ||||
| -rw-r--r-- | platform/android/gradle/wrapper/gradle-wrapper.properties | 2 |
5 files changed, 8 insertions, 7 deletions
diff --git a/platform/android/MapboxGLAndroidSDK/build.gradle b/platform/android/MapboxGLAndroidSDK/build.gradle index a114e71792..8f54e106fc 100644 --- a/platform/android/MapboxGLAndroidSDK/build.gradle +++ b/platform/android/MapboxGLAndroidSDK/build.gradle @@ -114,8 +114,8 @@ android { } compileOptions { - sourceCompatibility JavaVersion.VERSION_1_7 - targetCompatibility JavaVersion.VERSION_1_7 + sourceCompatibility JavaVersion.VERSION_1_8 + targetCompatibility JavaVersion.VERSION_1_8 } lintOptions { diff --git a/platform/android/MapboxGLAndroidSDKTestApp/build.gradle b/platform/android/MapboxGLAndroidSDKTestApp/build.gradle index 81ee635cf1..214b5842c6 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/build.gradle +++ b/platform/android/MapboxGLAndroidSDKTestApp/build.gradle @@ -14,8 +14,8 @@ android { } compileOptions { - sourceCompatibility JavaVersion.VERSION_1_7 - targetCompatibility JavaVersion.VERSION_1_7 + sourceCompatibility JavaVersion.VERSION_1_8 + targetCompatibility JavaVersion.VERSION_1_8 } packagingOptions { @@ -49,6 +49,7 @@ android { javaMaxHeapSize "2g" preDexLibraries true } + buildToolsVersion '26.0.2' } dependencies { diff --git a/platform/android/build.gradle b/platform/android/build.gradle index e298b84da8..3b22eae3ab 100644 --- a/platform/android/build.gradle +++ b/platform/android/build.gradle @@ -3,7 +3,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:2.3.1' + classpath 'com.android.tools.build:gradle:3.0.0' classpath 'com.amazonaws:aws-devicefarm-gradle-plugin:1.2' classpath 'com.stanfy.spoon:spoon-gradle-plugin:1.2.1' } diff --git a/platform/android/dependencies.gradle b/platform/android/dependencies.gradle index e1eb1150ed..87fdf30b6a 100644 --- a/platform/android/dependencies.gradle +++ b/platform/android/dependencies.gradle @@ -2,7 +2,7 @@ ext { minSdkVersion = 15 targetSdkVersion = 25 compileSdkVersion = 25 - buildToolsVersion = "25.0.2" + buildToolsVersion = "26.0.2" versionCode = 11 versionName = "5.0.0" diff --git a/platform/android/gradle/wrapper/gradle-wrapper.properties b/platform/android/gradle/wrapper/gradle-wrapper.properties index 1d35abd7b2..237ce8bbdb 100644 --- a/platform/android/gradle/wrapper/gradle-wrapper.properties +++ b/platform/android/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
\ No newline at end of file +distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip
\ No newline at end of file |