Update gradle build files to use android plugin 0.8.0, build tools 19.0.1

This commit is contained in:
Dominik Schürmann 2014-01-29 01:49:59 +01:00
parent 312b7fde53
commit ca9696ff34
12 changed files with 20 additions and 31 deletions

View file

@ -4,7 +4,7 @@ buildscript {
} }
dependencies { dependencies {
classpath 'com.android.tools.build:gradle:0.7.3' classpath 'com.android.tools.build:gradle:0.8.0'
} }
} }
@ -15,12 +15,12 @@ repositories {
} }
dependencies { dependencies {
compile 'com.android.support:support-v4:19.0.+' compile 'com.android.support:support-v4:19.0.1'
} }
android { android {
compileSdkVersion 19 compileSdkVersion 19
buildToolsVersion "19" buildToolsVersion "19.0.1"
defaultConfig { defaultConfig {
minSdkVersion 8 minSdkVersion 8

View file

@ -1,21 +1,7 @@
buildscript {
repositories {
mavenCentral()
}
dependencies {
classpath 'com.android.tools.build:gradle:0.7.3'
}
}
apply plugin: 'android' apply plugin: 'android'
repositories {
mavenCentral()
}
dependencies { dependencies {
compile 'com.android.support:support-v4:19.0.+' // already in actionbarsherlock compile 'com.android.support:support-v4:19.0.1'
compile project(':libraries:ActionBarSherlock') compile project(':libraries:ActionBarSherlock')
compile project(':libraries:HtmlTextView') compile project(':libraries:HtmlTextView')
compile project(':libraries:StickyListHeaders:library') compile project(':libraries:StickyListHeaders:library')
@ -30,7 +16,7 @@ dependencies {
android { android {
compileSdkVersion 19 compileSdkVersion 19
buildToolsVersion "19" buildToolsVersion "19.0.1"
defaultConfig { defaultConfig {
minSdkVersion 8 minSdkVersion 8

View file

@ -29,7 +29,10 @@ Development mailinglist at http://groups.google.com/d/forum/openpgp-keychain-dev
### Build with Gradle ### Build with Gradle
1. Have Android SDK "tools", "platform-tools", and "build-tools" directories in your PATH (http://developer.android.com/sdk/index.html) 1. Have Android SDK "tools", "platform-tools", and "build-tools" directories in your PATH (http://developer.android.com/sdk/index.html)
2. Open the Android SDK Manager (shell command: ``android``). Expand the Extras directory and install "Android Support Repository" 2. Open the Android SDK Manager (shell command: ``android``).
Expand the Tools directory and select "Android SDK Build-tools" newest version.
Expand the Extras directory and install "Android Support Repository"
Select everything for the newest SDK
3. Export ANDROID_HOME pointing to your Android SDK 3. Export ANDROID_HOME pointing to your Android SDK
4. Execute ``./gradlew build`` 4. Execute ``./gradlew build``
5. You can install the app with ``adb install -r OpenPGP-Keychain/build/apk/OpenPGP-Keychain-debug-unaligned.apk`` 5. You can install the app with ``adb install -r OpenPGP-Keychain/build/apk/OpenPGP-Keychain-debug-unaligned.apk``

View file

@ -4,7 +4,7 @@ buildscript {
} }
dependencies { dependencies {
classpath 'com.android.tools.build:gradle:0.7.3' classpath 'com.android.tools.build:gradle:0.8.0'
} }
} }
@ -15,7 +15,7 @@ allprojects {
} }
task wrapper(type: Wrapper) { task wrapper(type: Wrapper) {
gradleVersion = '1.9' gradleVersion = '1.10'
} }
apply from: 'spongycastle.gradle' apply from: 'spongycastle.gradle'

Binary file not shown.

View file

@ -1,6 +1,6 @@
#Thu Jan 16 22:16:02 CET 2014 #Wed Jan 29 01:43:20 CET 2014
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists zipStorePath=wrapper/dists
distributionUrl=http\://services.gradle.org/distributions/gradle-1.9-bin.zip distributionUrl=http\://services.gradle.org/distributions/gradle-1.10-bin.zip

View file

@ -1,12 +1,12 @@
apply plugin: 'android-library' apply plugin: 'android-library'
dependencies { dependencies {
compile 'com.android.support:support-v4:19.0.+' compile 'com.android.support:support-v4:19.0.1'
} }
android { android {
compileSdkVersion 14 compileSdkVersion 14
buildToolsVersion '17.0.0' buildToolsVersion '19.0.1'
sourceSets { sourceSets {
main { main {

View file

@ -2,7 +2,7 @@ apply plugin: 'android-library'
android { android {
compileSdkVersion 19 compileSdkVersion 19
buildToolsVersion "19.0.0" buildToolsVersion "19.0.1"
defaultConfig { defaultConfig {
minSdkVersion 7 minSdkVersion 7
targetSdkVersion 17 targetSdkVersion 17

View file

@ -3,7 +3,7 @@ apply plugin: 'android-library'
android { android {
compileSdkVersion 17 compileSdkVersion 17
buildToolsVersion '17' buildToolsVersion '19.0.1'
sourceSets { sourceSets {
main { main {

View file

@ -2,7 +2,7 @@ apply plugin: 'android-library'
android { android {
compileSdkVersion 19 compileSdkVersion 19
buildToolsVersion '19.0.0' buildToolsVersion '19.0.1'
sourceSets { sourceSets {
main { main {

View file

@ -2,7 +2,7 @@ apply plugin: 'android-library'
android { android {
compileSdkVersion 19 compileSdkVersion 19
buildToolsVersion '19.0.0' buildToolsVersion '19.0.1'
sourceSets { sourceSets {
main { main {

View file

@ -2,7 +2,7 @@ apply plugin: 'android-library'
android { android {
compileSdkVersion 19 compileSdkVersion 19
buildToolsVersion '19.0.0' buildToolsVersion '19.0.1'
sourceSets { sourceSets {
main { main {