Skip to content
This repository has been archived by the owner on Oct 7, 2024. It is now read-only.

Commit

Permalink
apply automatic gradle update wrapper
Browse files Browse the repository at this point in the history
update support lib

update sdk dependency to 4.2.0-beta.1 and updated changelog

remove signing configuration from project

upgrade version code
  • Loading branch information
tobrun committed Aug 6, 2016
1 parent 806c973 commit d256bb8
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 20 deletions.
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,9 @@

Mapbox welcomes participation and contributions from everyone.

## 4.2.0-beta.1 - August 6, 2016
* Mapbox Android SDK v4.2.0-beta.1

## 4.1.1
* Mapbox Android SDK v4.1.1
* Mapbox Android Service v1.2.1
Expand Down
22 changes: 5 additions & 17 deletions MapboxAndroidDemo/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ repositories {
}

ext {
supportLibVersion = '24.0.0'
supportLibVersion = '24.1.1'
}

android {
Expand All @@ -27,28 +27,16 @@ android {
defaultConfig {
minSdkVersion 15
targetSdkVersion 24
versionCode 28
versionName "4.1.1"
versionCode 29
versionName "4.2.0-beta.1"
}

/*
signingConfigs {
release {
storeFile file(RELEASE_STORE_FILE)
storePassword RELEASE_STORE_PASSWORD
keyAlias RELEASE_KEY_ALIAS
keyPassword RELEASE_KEY_PASSWORD
}
}
*/
buildTypes {
release {
minifyEnabled false
// proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt'
// signingConfig signingConfigs.release
}
}

}


Expand All @@ -59,8 +47,8 @@ dependencies {
compile "com.android.support:recyclerview-v7:${supportLibVersion}"
compile 'com.github.javiersantos:MaterialStyledDialogs:1.5.1'
compile 'com.squareup.picasso:picasso:2.5.2'
compile ('com.mapbox.mapboxsdk:mapbox-android-sdk:4.1.1@aar'){
transitive=true
compile('com.mapbox.mapboxsdk:mapbox-android-sdk:4.2.0-beta.1@aar') {
transitive = true
}
compile('com.mapbox.mapboxsdk:mapbox-android-services:1.2.1@aar') {
transitive = true
Expand Down
5 changes: 2 additions & 3 deletions gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
#Fri Apr 29 10:31:24 CDT 2016
#Sat Aug 06 14:18:22 EDT 2016
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-2.12-bin.zip
distributionSha256Sum=e77064981906cd0476ff1e0de3e6fef747bd18e140960f1915cca8ff6c33ab5c
distributionUrl=https\://services.gradle.org/distributions/gradle-2.12-all.zip
Binary file removed mapbox_demo.keystore
Binary file not shown.

0 comments on commit d256bb8

Please sign in to comment.