From 48ab95ac1899a18142424e927e51bd4b67f887d7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20Paczos?= Date: Thu, 24 Jan 2019 11:49:18 +0100 Subject: [PATCH 1/3] update dependencies and docker images --- .../offline/OfflineUiComponentsActivity.kt | 6 ++--- circle.yml | 4 ++-- gradle/dependencies.gradle | 22 +++++++++---------- gradle/wrapper/gradle-wrapper.properties | 4 ++-- 4 files changed, 18 insertions(+), 18 deletions(-) diff --git a/app/src/main/java/com/mapbox/mapboxsdk/plugins/testapp/activity/offline/OfflineUiComponentsActivity.kt b/app/src/main/java/com/mapbox/mapboxsdk/plugins/testapp/activity/offline/OfflineUiComponentsActivity.kt index 6e63b6eb1..5112b9e79 100644 --- a/app/src/main/java/com/mapbox/mapboxsdk/plugins/testapp/activity/offline/OfflineUiComponentsActivity.kt +++ b/app/src/main/java/com/mapbox/mapboxsdk/plugins/testapp/activity/offline/OfflineUiComponentsActivity.kt @@ -39,7 +39,7 @@ class OfflineUiComponentsActivity : AppCompatActivity() { startActivityForResult(intent, REQUEST_CODE) } - override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent) { + override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) { super.onActivityResult(requestCode, resultCode, data) if (resultCode == Activity.RESULT_OK && requestCode == REQUEST_CODE) { val builder = NotificationOptions.builder(this) @@ -47,14 +47,14 @@ class OfflineUiComponentsActivity : AppCompatActivity() { .returnActivity(OfflineUiComponentsActivity::class.java.name) .smallIconRes(android.R.drawable.stat_sys_download) - if (OfflineRegionSelector.getRegionName(data) != null) { + if (data?.let { OfflineRegionSelector.getRegionName(it) } != null) { builder.contentText(OfflineRegionSelector.getRegionName(data)) } val options = OfflineRegionSelector.getOfflineDownloadOptions(data, builder.build()) OfflinePlugin.getInstance(this).startDownload(options) - Toast.makeText(this, String.format(Locale.US, "Region name: %s", OfflineRegionSelector.getRegionName(data)), Toast.LENGTH_LONG).show() + Toast.makeText(this, String.format(Locale.US, "Region name: %s", data?.let { OfflineRegionSelector.getRegionName(it) } ?: "null"), Toast.LENGTH_LONG).show() } else if (resultCode == Activity.RESULT_CANCELED) { Toast.makeText(this, "user canceled out of region selector", Toast.LENGTH_LONG).show() } diff --git a/circle.yml b/circle.yml index fe2c517cf..4ac81bacd 100644 --- a/circle.yml +++ b/circle.yml @@ -10,7 +10,7 @@ jobs: build: working_directory: ~/code docker: - - image: mbgl/61abee1674:android-ndk-r18 + - image: mbgl/android-ndk-r19:8e91a7ebab environment: JVM_OPTS: -Xmx3200m BUILDTYPE: Debug @@ -73,7 +73,7 @@ jobs: # ------------------------------------------------------------------------------ release: docker: - - image: mbgl/61abee1674:android-ndk-r18 + - image: mbgl/android-ndk-r19:8e91a7ebab working_directory: ~/code environment: BUILDTYPE: Release diff --git a/gradle/dependencies.gradle b/gradle/dependencies.gradle index 2a4a19ea8..36bc22287 100644 --- a/gradle/dependencies.gradle +++ b/gradle/dependencies.gradle @@ -2,23 +2,23 @@ ext { androidVersions = [ minSdkVersion : 14, - targetSdkVersion : 27, - compileSdkVersion: 27, + targetSdkVersion : 28, + compileSdkVersion: 28, buildToolsVersion: '28.0.3' ] version = [ mapboxMapSdk : '7.0.1', - mapboxJava : '3.2.0', - playLocation : '15.0.1', + mapboxJava : '4.3.0', + playLocation : '16.0.0', autoValue : '1.5.4', autoValueParcel : '0.2.6', junit : '4.12', - supportLib : '27.1.1', - constraintLayout : '1.1.0', - mockito : '2.18.3', - leakCanary : '1.6.1', - timber : '4.7.0', + supportLib : '28.0.0', + constraintLayout : '1.1.2', + mockito : '2.23.4', + leakCanary : '1.6.3', + timber : '4.7.1', testRunner : '1.0.2', espresso : '3.0.2', lifecycleCompiler : '1.1.1', @@ -31,8 +31,8 @@ ext { pluginVersion = [ checkstyle: '8.10.1', - gradle : '3.2.0', - kotlin : '1.2.51', + gradle : '3.3.0', + kotlin : '1.3.20', dokka : '0.9.17' ] diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index c87558dec..c43b6085e 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Tue Sep 25 15:26:05 CEST 2018 +#Thu Jan 24 11:40:33 CET 2019 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.1-all.zip From 9ee877d51845de687b7ddaa5005ed3e2ec2f8b09 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20Paczos?= Date: Thu, 24 Jan 2019 11:50:25 +0100 Subject: [PATCH 2/3] update deprecated javadoc sources --- gradle/javadoc.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/javadoc.gradle b/gradle/javadoc.gradle index 1974eaf18..2776cf701 100644 --- a/gradle/javadoc.gradle +++ b/gradle/javadoc.gradle @@ -6,7 +6,7 @@ android.libraryVariants.all { variant -> description = "Generates javadoc for build $name" failOnError = false destinationDir = new File(destinationDir, variant.baseName) - source = variant.javaCompile.source + source = variant.sourceSets.collect { it.java.sourceFiles }.inject { m, i -> m + i } classpath = files(android.bootClasspath) options.windowTitle("$POM_NAME $VERSION_NAME Reference") options.docTitle("$POM_NAME $VERSION_NAME") From 0a7ac565cd89ee773465fa362dab88e89e0cb179 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20Paczos?= Date: Wed, 30 Jan 2019 10:50:52 +0100 Subject: [PATCH 3/3] remove obsolete build tools declaration --- app/build.gradle | 1 - gradle/dependencies.gradle | 1 - ktx-mapbox-maps/build.gradle | 1 - plugin-annotation/build.gradle | 1 - plugin-building/build.gradle | 1 - plugin-localization/build.gradle | 1 - plugin-markerview/build.gradle | 1 - plugin-offline/build.gradle | 1 - plugin-places/build.gradle | 1 - plugin-traffic/build.gradle | 1 - 10 files changed, 10 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 95dd3fac0..ec30d13d1 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -4,7 +4,6 @@ apply plugin: 'kotlin-kapt' android { compileSdkVersion androidVersions.compileSdkVersion - buildToolsVersion androidVersions.buildToolsVersion defaultConfig { minSdkVersion androidVersions.minSdkVersion diff --git a/gradle/dependencies.gradle b/gradle/dependencies.gradle index 36bc22287..8bae027b3 100644 --- a/gradle/dependencies.gradle +++ b/gradle/dependencies.gradle @@ -4,7 +4,6 @@ ext { minSdkVersion : 14, targetSdkVersion : 28, compileSdkVersion: 28, - buildToolsVersion: '28.0.3' ] version = [ diff --git a/ktx-mapbox-maps/build.gradle b/ktx-mapbox-maps/build.gradle index 5630ab12a..f61085ee7 100644 --- a/ktx-mapbox-maps/build.gradle +++ b/ktx-mapbox-maps/build.gradle @@ -3,7 +3,6 @@ apply plugin: 'kotlin-android' android { compileSdkVersion androidVersions.compileSdkVersion - buildToolsVersion androidVersions.buildToolsVersion defaultConfig { minSdkVersion androidVersions.minSdkVersion diff --git a/plugin-annotation/build.gradle b/plugin-annotation/build.gradle index a4f56923d..54ec32514 100644 --- a/plugin-annotation/build.gradle +++ b/plugin-annotation/build.gradle @@ -2,7 +2,6 @@ apply plugin: 'com.android.library' android { compileSdkVersion androidVersions.compileSdkVersion - buildToolsVersion androidVersions.buildToolsVersion defaultConfig { minSdkVersion androidVersions.minSdkVersion diff --git a/plugin-building/build.gradle b/plugin-building/build.gradle index 0af658fd0..ecda61445 100644 --- a/plugin-building/build.gradle +++ b/plugin-building/build.gradle @@ -2,7 +2,6 @@ apply plugin: 'com.android.library' android { compileSdkVersion androidVersions.compileSdkVersion - buildToolsVersion androidVersions.buildToolsVersion defaultConfig { minSdkVersion androidVersions.minSdkVersion diff --git a/plugin-localization/build.gradle b/plugin-localization/build.gradle index 8a58342cc..99c35e1fa 100644 --- a/plugin-localization/build.gradle +++ b/plugin-localization/build.gradle @@ -2,7 +2,6 @@ apply plugin: 'com.android.library' android { compileSdkVersion androidVersions.compileSdkVersion - buildToolsVersion androidVersions.buildToolsVersion defaultConfig { minSdkVersion androidVersions.minSdkVersion diff --git a/plugin-markerview/build.gradle b/plugin-markerview/build.gradle index ce5b9c91a..c58606940 100644 --- a/plugin-markerview/build.gradle +++ b/plugin-markerview/build.gradle @@ -2,7 +2,6 @@ apply plugin: 'com.android.library' android { compileSdkVersion androidVersions.compileSdkVersion - buildToolsVersion androidVersions.buildToolsVersion defaultConfig { minSdkVersion androidVersions.minSdkVersion diff --git a/plugin-offline/build.gradle b/plugin-offline/build.gradle index 61d41eacf..facc5efd0 100644 --- a/plugin-offline/build.gradle +++ b/plugin-offline/build.gradle @@ -2,7 +2,6 @@ apply plugin: 'com.android.library' android { compileSdkVersion androidVersions.compileSdkVersion - buildToolsVersion androidVersions.buildToolsVersion defaultConfig { minSdkVersion androidVersions.minSdkVersion diff --git a/plugin-places/build.gradle b/plugin-places/build.gradle index 3f354597f..5301e719d 100644 --- a/plugin-places/build.gradle +++ b/plugin-places/build.gradle @@ -2,7 +2,6 @@ apply plugin: 'com.android.library' android { compileSdkVersion androidVersions.compileSdkVersion - buildToolsVersion androidVersions.buildToolsVersion defaultConfig { minSdkVersion androidVersions.minSdkVersion diff --git a/plugin-traffic/build.gradle b/plugin-traffic/build.gradle index d5626cc09..7c8afcbfe 100644 --- a/plugin-traffic/build.gradle +++ b/plugin-traffic/build.gradle @@ -2,7 +2,6 @@ apply plugin: 'com.android.library' android { compileSdkVersion androidVersions.compileSdkVersion - buildToolsVersion androidVersions.buildToolsVersion defaultConfig { minSdkVersion androidVersions.minSdkVersion