Skip to content

Commit

Permalink
Merge pull request #168 from Esri/develop
Browse files Browse the repository at this point in the history
Release 100.8.0
  • Loading branch information
puneet-pdx authored May 27, 2020
2 parents bebb5f8 + f50bb38 commit ca1975d
Show file tree
Hide file tree
Showing 7 changed files with 10 additions and 11 deletions.
2 changes: 1 addition & 1 deletion Documentation/setup.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ To use the ArcGIS Runtime Toolkit for Android, first you need an app that uses t

You can add toolkit components which complement the functionality of the ArcGIS Runtime SDK for Android into your own applications. For example the toolkit allows you to add components such as scale bars, north arrows, or augmented reality controls.

The toolkit components are available as a library (.aar) in Bintray, or you can use the the source code for the toolkit directly from this repository. Read the [read me](https://github.com/Esri/arcgis-runtime-toolkit-android/tree/100.6.0) instructions for using the compiled library.
The toolkit components are available as a library (.aar) in Bintray, or you can use the the source code for the toolkit directly from this repository. Read the [read me](https://github.com/Esri/arcgis-runtime-toolkit-android/blob/master/README.md) instructions for using the compiled library.

## Use the toolkit from source code

Expand Down
3 changes: 2 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ You can use the Toolkit in your projects by:
```
dependencies {
implementation 'com.esri.arcgisruntime:arcgis-android-toolkit:100.7.0'
implementation 'com.esri.arcgisruntime:arcgis-android-toolkit:100.8.0'
}
```
Expand Down Expand Up @@ -55,6 +55,7 @@ The following table shows which versions of the SDK are compatible with the tool
| 100.6.0 | 100.6.0 |
| 100.6.0 | 100.6.1 |
| 100.7.0 | 100.7.0 |
| 100.8.0 | 100.8.0 |
## Resources
Expand Down
1 change: 0 additions & 1 deletion arcgis-android-toolkit/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@ apply from: "$rootProject.projectDir/gradle/script/aar-publishing.gradle"

android {
compileSdkVersion droid.targetSdk
buildToolsVersion droid.buildTools

defaultConfig {
minSdkVersion droid.minSdk
Expand Down
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
# Specifies the JVM arguments used for the daemon process.
# The setting is particularly useful for tweaking memory settings.
# Default value: -Xmx10248m -XX:MaxPermSize=256m
# org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8

# When configured, Gradle will run in incubating parallel mode.
# This option should only be used with decoupled projects. More details, visit
Expand Down
4 changes: 2 additions & 2 deletions gradle/script/artifact.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@
*/

ext {
_versionCode = 109
_versionName = "100.7.0"
_versionCode = 110
_versionName = "100.8.0"
_groupId = "com.esri.arcgisruntime"
_artifactId = 'arcgis-android-toolkit'
}
5 changes: 2 additions & 3 deletions gradle/script/versions.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,8 @@

ext {
droid = ext {
minSdk = 19
minSdk = 21
targetSdk = 29
buildTools = "29.0.2"
androidGradlePlugin = "3.5.1"
androidMavenGradlePlugin = "2.1"
dokka = "0.9.18"
Expand All @@ -40,5 +39,5 @@ ext {
}
kotlin_version = "1.3.41"
kotlin_coroutines = "1.3.0-RC"
arcgis = "100.7.0"
arcgis = "100.8.0"
}
4 changes: 2 additions & 2 deletions toolkit-test-app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -16,16 +16,16 @@

plugins {
id 'com.android.application'
id 'kotlin-android-extensions'
id 'kotlin-android'
id 'kotlin-android-extensions'
id 'kotlin-kapt'
id 'org.jetbrains.dokka-android'
}

apply from: "$rootProject.projectDir/gradle/script/artifact.gradle"

android {
compileSdkVersion droid.targetSdk
buildToolsVersion droid.buildTools

defaultConfig {
applicationId "com.esri.arcgisruntime.toolkit"
Expand Down

0 comments on commit ca1975d

Please sign in to comment.