Skip to content

Commit

Permalink
Upgrade to gradle 2.0
Browse files Browse the repository at this point in the history
  • Loading branch information
Jesse Eichar committed Aug 14, 2014
1 parent 55742ac commit 58d5f06
Show file tree
Hide file tree
Showing 7 changed files with 9 additions and 9 deletions.
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -12,3 +12,5 @@ core/build/

core/gradle/
core/gradlew
generated-gradlew
generated-gradlew.bat
3 changes: 2 additions & 1 deletion build.gradle
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
defaultTasks 'build'

task wrapper(type: Wrapper) {
gradleVersion = '1.11'
gradleVersion = '2.0'
scriptFile = "generated-gradlew"
}

allprojects {
Expand Down
5 changes: 1 addition & 4 deletions core/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,8 @@ apply plugin: 'application'
apply plugin: 'jetty'

defaultTasks 'build'
task wrapper(type: Wrapper) {
gradleVersion = '1.10'
}

tasks.withType(Compile) {
tasks.withType(JavaCompile) {
options.encoding = "utf-8"
}
tasks.withType(Javadoc) {
Expand Down
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
4 changes: 2 additions & 2 deletions gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#Fri Jun 13 09:54:57 CEST 2014
#Thu Aug 14 12:49:40 CEST 2014
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=http\://services.gradle.org/distributions/gradle-1.11-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-2.0-bin.zip
2 changes: 1 addition & 1 deletion gradlew
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
##############################################################################

# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
DEFAULT_JVM_OPTS=""
DEFAULT_JVM_OPTS="-Xmx512M"

APP_NAME="Gradle"
APP_BASE_NAME=`basename "$0"`
Expand Down
2 changes: 1 addition & 1 deletion gradlew.bat
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
if "%OS%"=="Windows_NT" setlocal

@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
set DEFAULT_JVM_OPTS=
set DEFAULT_JVM_OPTS=-Xmx512M

set DIRNAME=%~dp0
if "%DIRNAME%" == "" set DIRNAME=.
Expand Down

0 comments on commit 58d5f06

Please sign in to comment.