Merge remote-tracking branch 'mapbox/master' into 2317-espresso

Conflicts:
	android/java/MapboxGLAndroidSDKTestApp/build.gradle
This commit is contained in:
Antonio Zugaldia
2015-09-14 17:24:59 -04:00
517 changed files with 16656 additions and 7038 deletions

View File

@@ -1,15 +1,23 @@
buildscript {
repositories {
mavenCentral()
maven { url 'https://maven.fabric.io/public' }
}
dependencies {
classpath 'com.android.tools.build:gradle:1.2.3'
classpath 'com.android.tools.build:gradle:1.3.0'
classpath 'com.jakewharton.sdkmanager:gradle-plugin:0.12.0'
classpath 'io.fabric.tools:gradle:1.+'
}
}
apply plugin: 'android-sdk-manager'
apply plugin: 'com.android.application'
apply plugin: 'io.fabric'
repositories {
maven { url 'https://maven.fabric.io/public' }
}
apply plugin: 'checkstyle'
task accessToken {
@@ -30,8 +38,8 @@ gradle.projectsEvaluated {
}
android {
compileSdkVersion 22
buildToolsVersion "22.0.1"
compileSdkVersion 23
buildToolsVersion "23.0.1"
repositories {
mavenCentral()
@@ -39,8 +47,8 @@ android {
defaultConfig {
applicationId "com.mapbox.mapboxgl.testapp"
minSdkVersion 8
targetSdkVersion 22
minSdkVersion 15
targetSdkVersion 23
versionCode 4
versionName "0.1.3"
@@ -69,7 +77,7 @@ android {
buildTypes {
release {
minifyEnabled false
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt'
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
}
}
}
@@ -78,10 +86,13 @@ dependencies {
compile(project(':MapboxGLAndroidSDK')) {
transitive = true
}
compile 'com.android.support:support-annotations:22.2.0'
compile 'com.android.support:support-v4:22.2.0'
compile 'com.android.support:appcompat-v7:22.2.0'
compile 'com.mapzen.android:lost:1.0.0'
compile 'com.android.support:support-annotations:23.0.1'
compile 'com.android.support:support-v4:23.0.1'
compile 'com.android.support:appcompat-v7:23.0.1'
compile 'com.android.support:design:23.0.1'
compile('com.crashlytics.sdk.android:crashlytics:2.5.1@aar') {
transitive = true;
}
// Testing dependencies
androidTestCompile 'com.android.support.test:runner:0.3'