From 8e2d254976440fe23eaa815a5102e2bb002cbbd6 Mon Sep 17 00:00:00 2001 From: Emantor Date: Thu, 6 Mar 2014 17:32:00 +0100 Subject: Update to gradle 0.9+ jar --- build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index 86c40fa3a..e9769ffc6 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+' } } @@ -16,4 +16,4 @@ allprojects { task wrapper(type: Wrapper) { gradleVersion = '1.10' -} \ No newline at end of file +} -- cgit v1.2.3 From 1ab663a49538fbcf41d44dbcad95316fa8e9c55a Mon Sep 17 00:00:00 2001 From: Emantor Date: Thu, 6 Mar 2014 17:43:33 +0100 Subject: Update gradlewrapper to gradle 1.11 --- OpenPGP-Keychain-API/build.gradle | 4 ++-- build.gradle | 2 +- 2 files changed, 3 insertions(+), 3 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/build.gradle b/build.gradle index e9769ffc6..811be9aba 100644 --- a/build.gradle +++ b/build.gradle @@ -15,5 +15,5 @@ allprojects { } task wrapper(type: Wrapper) { - gradleVersion = '1.10' + gradleVersion = '1.11' } -- cgit v1.2.3 From 53c1d95b8b1205be604c39a40ce13a8b2790cefa Mon Sep 17 00:00:00 2001 From: Emantor Date: Thu, 6 Mar 2014 18:22:19 +0100 Subject: Add new gradle-wrapper.jar --- .../gradle/wrapper/gradle-wrapper.jar | Bin 50557 -> 51106 bytes .../gradle/wrapper/gradle-wrapper.properties | 4 ++-- gradle/wrapper/gradle-wrapper.jar | Bin 50557 -> 51106 bytes gradle/wrapper/gradle-wrapper.properties | 4 ++-- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/OpenPGP-Keychain-API/gradle/wrapper/gradle-wrapper.jar b/OpenPGP-Keychain-API/gradle/wrapper/gradle-wrapper.jar index 583859812..3c7abdf12 100644 Binary files a/OpenPGP-Keychain-API/gradle/wrapper/gradle-wrapper.jar and b/OpenPGP-Keychain-API/gradle/wrapper/gradle-wrapper.jar differ 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/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 583859812..3c7abdf12 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ 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 -- cgit v1.2.3 From 674e24b5d29bbe4f816c293cb50a7a4aece1a9f1 Mon Sep 17 00:00:00 2001 From: Emantor Date: Thu, 6 Mar 2014 18:23:46 +0100 Subject: Switch from 0.9+ to 0.9.0 --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 811be9aba..305e8d1b9 100644 --- a/build.gradle +++ b/build.gradle @@ -4,7 +4,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:0.9+' + classpath 'com.android.tools.build:gradle:0.9.0' } } -- cgit v1.2.3 From 3ccb2b65cb67db4a1b232cbf9265aea441f9694c Mon Sep 17 00:00:00 2001 From: Emantor Date: Thu, 6 Mar 2014 19:02:07 +0100 Subject: Update missing build.gradle files --- OpenPGP-Keychain-API/example-app/build.gradle | 2 +- OpenPGP-Keychain-API/libraries/keychain-api-library/build.gradle | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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/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' } } -- cgit v1.2.3 From 9d542ebf5bb39c230d6bb4773eda573c63999adb Mon Sep 17 00:00:00 2001 From: Emantor Date: Thu, 6 Mar 2014 19:11:11 +0100 Subject: Update README --- README.md | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/README.md b/README.md index 038920c3d..aa8baf70e 100644 --- a/README.md +++ b/README.md @@ -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 -- cgit v1.2.3