moparisthebest/open-keychain
1
0
Fork 0
mirror of https://github.com/moparisthebest/open-keychain synced 2024-11-30 12:32:17 -05:00
Code Issues Releases Wiki Activity

Merge pull request #353 from Emantor/new_gradle

Browse Source 
New gradle and gradle plugin Version
This commit is contained in:
Dominik Schürmann 2014-03-06 19:32:12 +01:00
commit 0ed097a020
9 changed files with 20 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
OpenPGP-Keychain-API/build.gradle
View File

@ -1,3 +1,3 @@
task wrapper(type: Wrapper) { task wrapper(type: Wrapper) {
gradleVersion = '1.10' gradleVersion = '1.11'
} }

2
OpenPGP-Keychain-API/example-app/build.gradle
View File

@ -5,7 +5,7 @@ buildscript {
} }
dependencies { dependencies {
classpath 'com.android.tools.build:gradle:0.8.3' classpath 'com.android.tools.build:gradle:0.9.0'
} }
} }

BIN
OpenPGP-Keychain-API/gradle/wrapper/gradle-wrapper.jar vendored
View File

Binary file not shown.

4
OpenPGP-Keychain-API/gradle/wrapper/gradle-wrapper.properties vendored
View File

@ -1,6 +1,6 @@
#Fri Feb 14 01:26:40 CET 2014 #Thu Mar 06 18:21:41 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.10-all.zip distributionUrl=http\://services.gradle.org/distributions/gradle-1.11-bin.zip

2
OpenPGP-Keychain-API/libraries/keychain-api-library/build.gradle
View File

@ -5,7 +5,7 @@ buildscript {
} }
dependencies { dependencies {
classpath 'com.android.tools.build:gradle:0.8.3' classpath 'com.android.tools.build:gradle:0.9.0'
} }
} }

9
README.md
View File

@ -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)) * 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)) * 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) * 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 ### Translations

4
build.gradle
View File

@ -4,7 +4,7 @@ buildscript {
} }
dependencies { 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) { task wrapper(type: Wrapper) {
gradleVersion = '1.10' gradleVersion = '1.11'
} }

BIN
gradle/wrapper/gradle-wrapper.jar vendored
View File

Binary file not shown.

4
gradle/wrapper/gradle-wrapper.properties vendored
View File

@ -1,6 +1,6 @@
#Sun Feb 09 18:34:27 CET 2014 #Thu Mar 06 18:21:40 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.10-all.zip distributionUrl=http\://services.gradle.org/distributions/gradle-1.11-bin.zip