From ca9696ff341ccedd9dfa459e9298d3bc710df84a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= Date: Wed, 29 Jan 2014 01:49:59 +0100 Subject: [PATCH] Update gradle build files to use android plugin 0.8.0, build tools 19.0.1 --- OpenPGP-Keychain-API-Demo/build.gradle | 6 +++--- OpenPGP-Keychain/build.gradle | 18 ++---------------- README.md | 5 ++++- build.gradle | 4 ++-- gradle/wrapper/gradle-wrapper.jar | Bin 50508 -> 50557 bytes gradle/wrapper/gradle-wrapper.properties | 4 ++-- libraries/ActionBarSherlock/build.gradle | 4 ++-- libraries/AndroidBootstrap/build.gradle | 2 +- libraries/HtmlTextView/build.gradle | 2 +- .../StickyListHeaders/library/build.gradle | 2 +- .../zxing-android-integration/build.gradle | 2 +- libraries/zxing/build.gradle | 2 +- 12 files changed, 20 insertions(+), 31 deletions(-) diff --git a/OpenPGP-Keychain-API-Demo/build.gradle b/OpenPGP-Keychain-API-Demo/build.gradle index 164c3e83c..025ff417b 100644 --- a/OpenPGP-Keychain-API-Demo/build.gradle +++ b/OpenPGP-Keychain-API-Demo/build.gradle @@ -4,7 +4,7 @@ buildscript { } 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 { - compile 'com.android.support:support-v4:19.0.+' + compile 'com.android.support:support-v4:19.0.1' } android { compileSdkVersion 19 - buildToolsVersion "19" + buildToolsVersion "19.0.1" defaultConfig { minSdkVersion 8 diff --git a/OpenPGP-Keychain/build.gradle b/OpenPGP-Keychain/build.gradle index cf58740e8..dba420f04 100644 --- a/OpenPGP-Keychain/build.gradle +++ b/OpenPGP-Keychain/build.gradle @@ -1,21 +1,7 @@ -buildscript { - repositories { - mavenCentral() - } - - dependencies { - classpath 'com.android.tools.build:gradle:0.7.3' - } -} - apply plugin: 'android' -repositories { - mavenCentral() -} - 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:HtmlTextView') compile project(':libraries:StickyListHeaders:library') @@ -30,7 +16,7 @@ dependencies { android { compileSdkVersion 19 - buildToolsVersion "19" + buildToolsVersion "19.0.1" defaultConfig { minSdkVersion 8 diff --git a/README.md b/README.md index e413af32c..6f42a639f 100644 --- a/README.md +++ b/README.md @@ -29,7 +29,10 @@ Development mailinglist at http://groups.google.com/d/forum/openpgp-keychain-dev ### Build with Gradle 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 4. Execute ``./gradlew build`` 5. You can install the app with ``adb install -r OpenPGP-Keychain/build/apk/OpenPGP-Keychain-debug-unaligned.apk`` diff --git a/build.gradle b/build.gradle index bab628a2d..06ffe7af0 100644 --- a/build.gradle +++ b/build.gradle @@ -4,7 +4,7 @@ buildscript { } 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) { - gradleVersion = '1.9' + gradleVersion = '1.10' } apply from: 'spongycastle.gradle' diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index d5c591c9c532da774b062aa6d7ab16405ff8700a..5838598129719e795cc5633f411468bdec311016 100644 GIT binary patch delta 3330 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 IghD^SKZDj&^Z)<= diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index c9e50d492..ddc691c4f 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Thu Jan 16 22:16:02 CET 2014 +#Wed Jan 29 01:43:20 CET 2014 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME 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 diff --git a/libraries/ActionBarSherlock/build.gradle b/libraries/ActionBarSherlock/build.gradle index 1fed282d9..aa8b0764b 100644 --- a/libraries/ActionBarSherlock/build.gradle +++ b/libraries/ActionBarSherlock/build.gradle @@ -1,12 +1,12 @@ apply plugin: 'android-library' dependencies { - compile 'com.android.support:support-v4:19.0.+' + compile 'com.android.support:support-v4:19.0.1' } android { compileSdkVersion 14 - buildToolsVersion '17.0.0' + buildToolsVersion '19.0.1' sourceSets { main { diff --git a/libraries/AndroidBootstrap/build.gradle b/libraries/AndroidBootstrap/build.gradle index a63f9e02c..7724c6d9c 100644 --- a/libraries/AndroidBootstrap/build.gradle +++ b/libraries/AndroidBootstrap/build.gradle @@ -2,7 +2,7 @@ apply plugin: 'android-library' android { compileSdkVersion 19 - buildToolsVersion "19.0.0" + buildToolsVersion "19.0.1" defaultConfig { minSdkVersion 7 targetSdkVersion 17 diff --git a/libraries/HtmlTextView/build.gradle b/libraries/HtmlTextView/build.gradle index 8c59e4b55..a0b9b1bc6 100644 --- a/libraries/HtmlTextView/build.gradle +++ b/libraries/HtmlTextView/build.gradle @@ -3,7 +3,7 @@ apply plugin: 'android-library' android { compileSdkVersion 17 - buildToolsVersion '17' + buildToolsVersion '19.0.1' sourceSets { main { diff --git a/libraries/StickyListHeaders/library/build.gradle b/libraries/StickyListHeaders/library/build.gradle index 21050fc98..a92c4d80e 100644 --- a/libraries/StickyListHeaders/library/build.gradle +++ b/libraries/StickyListHeaders/library/build.gradle @@ -2,7 +2,7 @@ apply plugin: 'android-library' android { compileSdkVersion 19 - buildToolsVersion '19.0.0' + buildToolsVersion '19.0.1' sourceSets { main { diff --git a/libraries/zxing-android-integration/build.gradle b/libraries/zxing-android-integration/build.gradle index 21050fc98..a92c4d80e 100644 --- a/libraries/zxing-android-integration/build.gradle +++ b/libraries/zxing-android-integration/build.gradle @@ -2,7 +2,7 @@ apply plugin: 'android-library' android { compileSdkVersion 19 - buildToolsVersion '19.0.0' + buildToolsVersion '19.0.1' sourceSets { main { diff --git a/libraries/zxing/build.gradle b/libraries/zxing/build.gradle index 21050fc98..a92c4d80e 100644 --- a/libraries/zxing/build.gradle +++ b/libraries/zxing/build.gradle @@ -2,7 +2,7 @@ apply plugin: 'android-library' android { compileSdkVersion 19 - buildToolsVersion '19.0.0' + buildToolsVersion '19.0.1' sourceSets { main {