aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDominik Schürmann <dominik@dominikschuermann.de>2014-01-29 01:49:59 +0100
committerDominik Schürmann <dominik@dominikschuermann.de>2014-01-29 01:49:59 +0100
commitca9696ff341ccedd9dfa459e9298d3bc710df84a (patch)
treee4d43f19a4d6880f63493c71144c64167bc9300f
parent312b7fde53c99c573b295a0ea4b66ca74fed2b9e (diff)
downloadopen-keychain-ca9696ff341ccedd9dfa459e9298d3bc710df84a.tar.gz
open-keychain-ca9696ff341ccedd9dfa459e9298d3bc710df84a.tar.bz2
open-keychain-ca9696ff341ccedd9dfa459e9298d3bc710df84a.zip
Update gradle build files to use android plugin 0.8.0, build tools 19.0.1
-rw-r--r--OpenPGP-Keychain-API-Demo/build.gradle6
-rw-r--r--OpenPGP-Keychain/build.gradle18
-rw-r--r--README.md5
-rw-r--r--build.gradle4
-rw-r--r--gradle/wrapper/gradle-wrapper.jarbin50508 -> 50557 bytes
-rw-r--r--gradle/wrapper/gradle-wrapper.properties4
-rw-r--r--libraries/ActionBarSherlock/build.gradle4
-rw-r--r--libraries/AndroidBootstrap/build.gradle2
-rw-r--r--libraries/HtmlTextView/build.gradle2
-rw-r--r--libraries/StickyListHeaders/library/build.gradle2
-rw-r--r--libraries/zxing-android-integration/build.gradle2
-rw-r--r--libraries/zxing/build.gradle2
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 d5c591c9c..583859812 100644
--- a/gradle/wrapper/gradle-wrapper.jar
+++ b/gradle/wrapper/gradle-wrapper.jar
Binary files differ
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 {