Merge pull request #198 from Esri/develop

Release 100.12.0

Author: puneet-pdx

README.md

@@ -23,7 +23,7 @@ You can use the Toolkit in your projects by:
 
     ```
     dependencies {
-    	implementation 'com.esri.arcgisruntime:arcgis-android-toolkit:100.11.0'
+    	implementation 'com.esri.arcgisruntime:arcgis-android-toolkit:100.12.0'
     }
     ```
 
@@ -60,6 +60,7 @@ The following table shows which versions of the SDK are compatible with the tool
 | 100.9.0 | 100.9.0 |
 | 100.10.0 | 100.10.0 |
 | 100.11.0 | 100.11.0 |
+| 100.12.0 | 100.12.0 |
 
 ## Resources
 

gradle/script/artifact.gradle

@@ -15,8 +15,8 @@
  */
 
 ext {
-    _versionCode = 113
-    _versionName = "100.11.0"
+    _versionCode = 114
+    _versionName = "100.12.0"
     _fullVersion = getFullVersion() // e.g. 100.9.0-1234
     _groupId = "com.esri.arcgisruntime"
     _artifactId = 'arcgis-android-toolkit'

gradle/script/versions.gradle

@@ -25,20 +25,20 @@ ext {
         multiDex = "2.0.1"
         testRunner = "1.3.0"
         arCore = "1.17.1"
-        lifecycle = "2.2.0"
-        appcompat = "1.2.0"
-        material = "1.2.1"
+        lifecycle = "2.3.1"
+        appcompat = "1.3.0"
+        material = "1.3.0"
         vectordrawable = "1.1.0"
-        annotation = "1.1.0"
-        recyclerview = "1.1.0"
+        annotation = "1.2.0"
+        recyclerview = "1.2.0"
         nav_version = "2.3.5"
     }
     test = ext {
         espresso = "3.1.0"
         jUnit = "1.1.2"
         rules = "1.3.0"
     }
-    kotlin_version = "1.4.21"
-    kotlin_coroutines = "1.3.7"
-    arcgis = "100.11.0"
+    kotlin_version = "1.4.31"
+    kotlin_coroutines = "1.4.1"
+    arcgis = "100.12.0"
 }

toolkit-test-app/build.gradle

@@ -72,7 +72,6 @@ dependencies {
     implementation "androidx.vectordrawable:vectordrawable:$droid.vectordrawable"
     implementation "androidx.constraintlayout:constraintlayout:$droid.constraintLayout"
     implementation "androidx.multidex:multidex:$droid.multiDex"
-    implementation "androidx.lifecycle:lifecycle-extensions:$droid.lifecycle"
     implementation "androidx.navigation:navigation-fragment-ktx:$droid.nav_version"
     implementation "androidx.navigation:navigation-ui-ktx:$droid.nav_version"
     androidTestImplementation "androidx.annotation:annotation:$droid.annotation"

toolkit-test-app/src/main/java/com/esri/arcgisruntime/toolkit/test/bookmark/BookmarkActivity.kt

@@ -17,9 +17,9 @@
 package com.esri.arcgisruntime.toolkit.test.bookmark
 
 import android.os.Bundle
+import androidx.activity.viewModels
 import androidx.appcompat.app.AppCompatActivity
 import androidx.databinding.DataBindingUtil
-import androidx.lifecycle.ViewModelProviders
 import com.esri.arcgisruntime.mapping.Bookmark
 import com.esri.arcgisruntime.toolkit.bookmark.BookmarkView
 import com.esri.arcgisruntime.toolkit.test.R
@@ -34,7 +34,7 @@ class BookmarkActivity : AppCompatActivity(), BookmarkView.OnItemClickListener<B
 
         val binding: ActivityBookmarkBinding =
             DataBindingUtil.setContentView(this, R.layout.activity_bookmark)
-        val mapViewModel = ViewModelProviders.of(this)[MapViewModel::class.java]
+        val mapViewModel: MapViewModel by viewModels()
 
         binding.mapViewModel = mapViewModel
         binding.lifecycleOwner = this