diff options
author | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-03-06 19:32:12 +0100 |
---|---|---|
committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-03-06 19:32:12 +0100 |
commit | 0ed097a020ee433cd9cbeb4f95ea06a505f1c242 (patch) | |
tree | 789f03600f3839973bc4df86c49a9c51ac26e8b7 | |
parent | ea2f3e1444ba0597425c8fb7f820f981b3da8cea (diff) | |
parent | 9d542ebf5bb39c230d6bb4773eda573c63999adb (diff) | |
download | open-keychain-0ed097a020ee433cd9cbeb4f95ea06a505f1c242.tar.gz open-keychain-0ed097a020ee433cd9cbeb4f95ea06a505f1c242.tar.bz2 open-keychain-0ed097a020ee433cd9cbeb4f95ea06a505f1c242.zip |
Merge pull request #353 from Emantor/new_gradle
New gradle and gradle plugin Version
-rw-r--r-- | OpenPGP-Keychain-API/build.gradle | 4 | ||||
-rw-r--r-- | OpenPGP-Keychain-API/example-app/build.gradle | 2 | ||||
-rw-r--r-- | OpenPGP-Keychain-API/gradle/wrapper/gradle-wrapper.jar | bin | 50557 -> 51106 bytes | |||
-rw-r--r-- | OpenPGP-Keychain-API/gradle/wrapper/gradle-wrapper.properties | 4 | ||||
-rw-r--r-- | OpenPGP-Keychain-API/libraries/keychain-api-library/build.gradle | 2 | ||||
-rw-r--r-- | README.md | 9 | ||||
-rw-r--r-- | build.gradle | 6 | ||||
-rw-r--r-- | gradle/wrapper/gradle-wrapper.jar | bin | 50557 -> 51106 bytes | |||
-rw-r--r-- | gradle/wrapper/gradle-wrapper.properties | 4 |
9 files changed, 20 insertions, 11 deletions
diff --git a/OpenPGP-Keychain-API/build.gradle b/OpenPGP-Keychain-API/build.gradle index 2e41492a3..47a0f376a 100644 --- a/OpenPGP-Keychain-API/build.gradle +++ b/OpenPGP-Keychain-API/build.gradle @@ -1,3 +1,3 @@ task wrapper(type: Wrapper) { - gradleVersion = '1.10' -}
\ No newline at end of file + gradleVersion = '1.11' +} diff --git a/OpenPGP-Keychain-API/example-app/build.gradle b/OpenPGP-Keychain-API/example-app/build.gradle index 975666b19..5147dc7bc 100644 --- a/OpenPGP-Keychain-API/example-app/build.gradle +++ b/OpenPGP-Keychain-API/example-app/build.gradle @@ -5,7 +5,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:0.8.3' + classpath 'com.android.tools.build:gradle:0.9.0' } } diff --git a/OpenPGP-Keychain-API/gradle/wrapper/gradle-wrapper.jar b/OpenPGP-Keychain-API/gradle/wrapper/gradle-wrapper.jar Binary files differindex 583859812..3c7abdf12 100644 --- a/OpenPGP-Keychain-API/gradle/wrapper/gradle-wrapper.jar +++ b/OpenPGP-Keychain-API/gradle/wrapper/gradle-wrapper.jar diff --git a/OpenPGP-Keychain-API/gradle/wrapper/gradle-wrapper.properties b/OpenPGP-Keychain-API/gradle/wrapper/gradle-wrapper.properties index 932184188..8c3a98441 100644 --- a/OpenPGP-Keychain-API/gradle/wrapper/gradle-wrapper.properties +++ b/OpenPGP-Keychain-API/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Fri Feb 14 01:26:40 CET 2014 +#Thu Mar 06 18:21:41 CET 2014 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=http\://services.gradle.org/distributions/gradle-1.10-all.zip +distributionUrl=http\://services.gradle.org/distributions/gradle-1.11-bin.zip diff --git a/OpenPGP-Keychain-API/libraries/keychain-api-library/build.gradle b/OpenPGP-Keychain-API/libraries/keychain-api-library/build.gradle index 7c923e7f6..98c9a3bd6 100644 --- a/OpenPGP-Keychain-API/libraries/keychain-api-library/build.gradle +++ b/OpenPGP-Keychain-API/libraries/keychain-api-library/build.gradle @@ -5,7 +5,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:0.8.3' + classpath 'com.android.tools.build:gradle:0.9.0' } } @@ -116,6 +116,15 @@ When changing build files or dependencies, respect the following requirements: * No dependencies from Maven (also a soft requirement for inclusion in [F-Droid](https://f-droid.org)) * Always use a fixed Android Gradle plugin version not a dynamic one, e.g. ``0.7.3`` instead of ``0.7.+`` (allows offline builds without lookups for new versions, also some minor Android plugin versions had serious issues, i.e. [0.7.2 and 0.8.1](http://tools.android.com/tech-docs/new-build-system)) * Commit the corresponding [Gradle wrapper](http://www.gradle.org/docs/current/userguide/gradle_wrapper.html) to the repository (allows easy building for new contributors without the need to install the required Gradle version using a package manager) +* In order to update the build system to a newer gradle Version you need to: + * Update every build.gradle file with the new gradle version and/or gradle plugin version + * build.gradle + * OpenPGP-Keychain/build.gradle + * OpenPGP-Keychain-API/build.gradle + * OpenPGP-Keychain-Api/libraries/build.gradle + * OpenPGP-Keychain/example-app/build.gradle + * run ./gradlew wrapper twice to update gradle and download the new jar file + * commit the new jar and property files ### Translations diff --git a/build.gradle b/build.gradle index 86c40fa3a..305e8d1b9 100644 --- a/build.gradle +++ b/build.gradle @@ -4,7 +4,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:0.8.3' + classpath 'com.android.tools.build:gradle:0.9.0' } } @@ -15,5 +15,5 @@ allprojects { } task wrapper(type: Wrapper) { - gradleVersion = '1.10' -}
\ No newline at end of file + gradleVersion = '1.11' +} diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar Binary files differindex 583859812..3c7abdf12 100644 --- a/gradle/wrapper/gradle-wrapper.jar +++ b/gradle/wrapper/gradle-wrapper.jar diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 9559bfd8b..9c0d6700a 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Sun Feb 09 18:34:27 CET 2014 +#Thu Mar 06 18:21:40 CET 2014 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=http\://services.gradle.org/distributions/gradle-1.10-all.zip +distributionUrl=http\://services.gradle.org/distributions/gradle-1.11-bin.zip |