Skip to content

Update dependencies and javadoc source reference #827

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
LukasPaczos merged 3 commits into from
Jan 30, 2019
Merged

Update dependencies and javadoc source reference #827

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
48ab95a
update dependencies and docker images
LukasPaczos Jan 24, 2019
9ee877d
update deprecated javadoc sources
LukasPaczos Jan 24, 2019
0a7ac56
remove obsolete build tools declaration
LukasPaczos Jan 30, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ apply plugin: 'kotlin-kapt'

android {
compileSdkVersion androidVersions.compileSdkVersion
buildToolsVersion androidVersions.buildToolsVersion

defaultConfig {
minSdkVersion androidVersions.minSdkVersion
Expand Down
6 changes: 3 additions & 3 deletions ...java/com/mapbox/mapboxsdk/plugins/testapp/activity/offline/OfflineUiComponentsActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,22 +39,22 @@ 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)
.contentTitle("Downloading: ")
.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()
}
Expand Down
4 changes: 2 additions & 2 deletions circle.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
23 changes: 11 additions & 12 deletions gradle/dependencies.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,23 +2,22 @@ ext {

androidVersions = [
minSdkVersion : 14,
targetSdkVersion : 27,
compileSdkVersion: 27,
buildToolsVersion: '28.0.3'
targetSdkVersion : 28,
compileSdkVersion: 28,
]

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',
Expand All @@ -31,8 +30,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'
]

Expand Down
2 changes: 1 addition & 1 deletion gradle/javadoc.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
4 changes: 2 additions & 2 deletions gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
1 change: 0 additions & 1 deletion ktx-mapbox-maps/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ apply plugin: 'kotlin-android'

android {
compileSdkVersion androidVersions.compileSdkVersion
buildToolsVersion androidVersions.buildToolsVersion

defaultConfig {
minSdkVersion androidVersions.minSdkVersion
Expand Down
1 change: 0 additions & 1 deletion plugin-annotation/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ apply plugin: 'com.android.library'

android {
compileSdkVersion androidVersions.compileSdkVersion
buildToolsVersion androidVersions.buildToolsVersion

defaultConfig {
minSdkVersion androidVersions.minSdkVersion
Expand Down
1 change: 0 additions & 1 deletion plugin-building/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ apply plugin: 'com.android.library'

android {
compileSdkVersion androidVersions.compileSdkVersion
buildToolsVersion androidVersions.buildToolsVersion

defaultConfig {
minSdkVersion androidVersions.minSdkVersion
Expand Down
1 change: 0 additions & 1 deletion plugin-localization/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ apply plugin: 'com.android.library'

android {
compileSdkVersion androidVersions.compileSdkVersion
buildToolsVersion androidVersions.buildToolsVersion

defaultConfig {
minSdkVersion androidVersions.minSdkVersion
Expand Down
1 change: 0 additions & 1 deletion plugin-markerview/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ apply plugin: 'com.android.library'

android {
compileSdkVersion androidVersions.compileSdkVersion
buildToolsVersion androidVersions.buildToolsVersion

defaultConfig {
minSdkVersion androidVersions.minSdkVersion
Expand Down
1 change: 0 additions & 1 deletion plugin-offline/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ apply plugin: 'com.android.library'

android {
compileSdkVersion androidVersions.compileSdkVersion
buildToolsVersion androidVersions.buildToolsVersion

defaultConfig {
minSdkVersion androidVersions.minSdkVersion
Expand Down
1 change: 0 additions & 1 deletion plugin-places/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ apply plugin: 'com.android.library'

android {
compileSdkVersion androidVersions.compileSdkVersion
buildToolsVersion androidVersions.buildToolsVersion

defaultConfig {
minSdkVersion androidVersions.minSdkVersion
Expand Down
1 change: 0 additions & 1 deletion plugin-traffic/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ apply plugin: 'com.android.library'

android {
compileSdkVersion androidVersions.compileSdkVersion
buildToolsVersion androidVersions.buildToolsVersion

defaultConfig {
minSdkVersion androidVersions.minSdkVersion
Expand Down