diff --git a/android/java/app/build.gradle b/android/java/app/build.gradle index e579f37e7..17084ad15 100644 --- a/android/java/app/build.gradle +++ b/android/java/app/build.gradle @@ -26,7 +26,7 @@ android { buildTypes { release { - runProguard false + minifyEnabled false proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt' } } diff --git a/android/java/build.gradle b/android/java/build.gradle index e1e165302..d72847912 100644 --- a/android/java/build.gradle +++ b/android/java/build.gradle @@ -4,7 +4,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:0.13.2' + classpath 'com.android.tools.build:gradle:1.0.0-rc4' } } diff --git a/android/java/gradle/wrapper/gradle-wrapper.properties b/android/java/gradle/wrapper/gradle-wrapper.properties index ffaa281a4..5adf98860 100644 --- a/android/java/gradle/wrapper/gradle-wrapper.properties +++ b/android/java/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Wed Apr 10 15:27:10 PDT 2013 +#Sat Dec 06 12:43:10 EST 2014 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-2.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-2.2.1-all.zip diff --git a/android/java/lib/build.gradle b/android/java/lib/build.gradle index 0b86b715e..14749095b 100644 --- a/android/java/lib/build.gradle +++ b/android/java/lib/build.gradle @@ -5,7 +5,6 @@ android { buildToolsVersion "21.1.1" defaultConfig { - applicationId "com.mapbox.mapboxgl.lib" minSdkVersion 14 targetSdkVersion 21 versionCode 2 @@ -19,11 +18,11 @@ android { buildTypes { debug { - jniDebugBuild true + jniDebuggable true } release { - runProguard false + minifyEnabled false proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt' } }