4.2.0 release (mapbox#186)

* using 4.2.0 final release * reverted to original support lib version
jaym05700 · Dec 14, 2016 · 85ddafb · 85ddafb
1 parent 298ad89
commit 85ddafb
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 9 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,12 @@
 
 Mapbox welcomes participation and contributions from everyone.
 
+## 4.2.0
+* Indoor map example
+* Los Angeles tourism example
+* Symbol layer example
+* Location memory leaks resolved
+
 ## 4.2.0-beta.3 - September 21, 2016
 * Mapbox Android SDK v4.2.0-beta.3
 * Landuse Styling - lab example

diff --git a/MapboxAndroidDemo/build.gradle b/MapboxAndroidDemo/build.gradle
@@ -11,8 +11,8 @@ android {
   defaultConfig {
     minSdkVersion 15
     targetSdkVersion 25
-    versionCode 33
-    versionName "4.2.0-beta.5"
+    versionCode 34
+    versionName "4.2.0"
   }
 
   buildTypes {
@@ -45,13 +45,13 @@ dependencies {
   compile 'com.squareup.picasso:picasso:2.5.2'
 
   // Mapbox dependencies
-  //  compile('com.mapbox.mapboxsdk:mapbox-android-sdk:4.2.0-beta.5@aar') {
-  compile('com.mapbox.mapboxsdk:mapbox-android-sdk:4.2.0-SNAPSHOT@aar') {
+  compile('com.mapbox.mapboxsdk:mapbox-android-sdk:4.2.0@aar') {
+//  compile('com.mapbox.mapboxsdk:mapbox-android-sdk:4.2.0-SNAPSHOT@aar') {
     transitive = true
     exclude group: 'com.mapbox.mapboxsdk', module: 'mapbox-java-services'
   }
   //compile('com.mapbox.mapboxsdk:mapbox-android-services:1.3.1@aar') {
-  compile ('com.mapbox.mapboxsdk:mapbox-android-services:2.0.0-SNAPSHOT@aar') {
+  compile('com.mapbox.mapboxsdk:mapbox-android-services:2.0.0-SNAPSHOT@aar') {
     transitive = true
   }
 

diff --git a/MapboxAndroidWearDemo/build.gradle b/MapboxAndroidWearDemo/build.gradle
@@ -2,13 +2,13 @@ apply plugin: 'com.android.application'
 
 
 android {
-  compileSdkVersion 24
+  compileSdkVersion 25
   buildToolsVersion "24.0.2"
 
   defaultConfig {
     applicationId "com.mapbox.mapboxandroidweardemo"
     minSdkVersion 21
-    targetSdkVersion 24
+    targetSdkVersion 25
     versionCode 1
     versionName "1.0"
   }
@@ -23,10 +23,10 @@ android {
 dependencies {
   compile fileTree(dir: 'libs', include: ['*.jar'])
   compile 'com.google.android.support:wearable:2.0.0-alpha3'
-  compile 'com.google.android.gms:play-services-wearable:9.6.1'
+  compile 'com.google.android.gms:play-services-wearable:10.0.1'
 
   // Mapbox dependencies
-  compile('com.mapbox.mapboxsdk:mapbox-android-sdk:4.2.0-beta.3@aar') {
+  compile('com.mapbox.mapboxsdk:mapbox-android-sdk:4.2.0@aar') {
     transitive = true
   }
 }