aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMenny Even Danan <menny@evendanan.net>2014-12-21 02:43:04 +0000
committerMenny Even Danan <menny@evendanan.net>2014-12-21 02:43:04 +0000
commit58ba547b4013941ce1db407da02130683d273356 (patch)
tree22cf40b19de5faadda9b41398bb859f749e660da
parentc2bce77e77a4f898113c0d5245a07f3ce40bc9dc (diff)
downloadAnySoftKeyboard-58ba547b4013941ce1db407da02130683d273356.tar.gz
AnySoftKeyboard-58ba547b4013941ce1db407da02130683d273356.tar.bz2
update build system
Change-Id: I4643271f5ce588aa8a20623b679a49f88484174d
-rw-r--r--build.gradle21
-rw-r--r--gradle/wrapper/gradle-wrapper.properties4
2 files changed, 13 insertions, 12 deletions
diff --git a/build.gradle b/build.gradle
index ef214ecbc..09deebd7f 100644
--- a/build.gradle
+++ b/build.gradle
@@ -8,7 +8,7 @@ buildscript {
}
}
dependencies {
- classpath 'com.android.tools.build:gradle:0.13.3'
+ classpath 'com.android.tools.build:gradle:1.0.0'
classpath 'org.robolectric:robolectric-gradle-plugin:0.13.2'
classpath 'com.jakewharton.sdkmanager:gradle-plugin:0.12.0'
}
@@ -17,6 +17,7 @@ buildscript {
apply plugin: 'android-sdk-manager'
apply plugin: 'com.android.application'
apply plugin: 'robolectric'
+apply plugin: 'pmd'
version utils.Utils.buildVersionName(1, 3, false)
group 'net.evendanan'
@@ -33,14 +34,14 @@ android {
}
compileSdkVersion 21
- buildToolsVersion "21.0.2"
+ buildToolsVersion "21.1.1"
defaultConfig {
versionCode 128
versionName project.version
minSdkVersion 7
- targetSdkVersion 20
+ targetSdkVersion 21
//adding additional fields to the BuildConfig class.
//extra details - from local
@@ -85,15 +86,15 @@ android {
buildTypes {
release {
signingConfig signingConfigs.release
- zipAlign true
+ zipAlignEnabled true
- runProguard false
+ minifyEnabled false
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt'
}
debug {
signingConfig signingConfigs.release
- zipAlign true
+ zipAlignEnabled true
debuggable true
}
}
@@ -125,9 +126,9 @@ dependencies {
}
compile 'net.evendanan.anysoftkeyboard:api:1.2.3@aar'
compile 'net.evendanan:frankenrobot:1.1.3@aar'
- compile 'com.android.support:support-v4:20.+'
- compile 'com.android.support:appcompat-v7:20.+'
- compile 'com.android.support:support-annotations:+'
+ compile 'com.android.support:support-v4:21.0.3'
+ compile 'com.android.support:appcompat-v7:21.0.3'
+ compile 'com.android.support:support-annotations:21.0.0'
androidTestCompile 'junit:junit:4.11'
androidTestCompile('org.robolectric:robolectric:2.4') {
@@ -150,7 +151,7 @@ dependencies {
exclude module: 'wagon-provider-api'
}
androidTestCompile 'org.mockito:mockito-core:1.9.5'
- androidTestCompile 'com.squareup:fest-android:1.0.+'
+ androidTestCompile 'com.squareup:fest-android:1.0.8'
}
apply plugin: 'idea'
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index c83b54503..afe73a4fa 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Thu Oct 30 21:37:45 EDT 2014
+#Sat Dec 20 21:38:27 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