Skip to content
This repository
Browse code

Upgrade to Gradle 1.1.

  • Loading branch information...
commit c2af08e723518a2191e51bf9eae694fda12d1bbc 1 parent 0f0c611
Justin Ryan quidryan authored
2  gradle/convention.gradle
@@ -40,5 +40,5 @@ task aggregateJavadoc(type: Javadoc) {
40 40
41 41 // Generate wrapper, which is distributed as part of source to alleviate the need of installing gradle
42 42 task createWrapper(type: Wrapper) {
43   - gradleVersion = '1.0-milestone-9'
  43 + gradleVersion = '1.1'
44 44 }
BIN  gradle/wrapper/gradle-wrapper.jar
Binary file not shown
4 gradle/wrapper/gradle-wrapper.properties
... ... @@ -1,6 +1,6 @@
1   -#Wed Mar 14 13:19:56 PDT 2012
  1 +#Tue Aug 14 16:28:54 PDT 2012
2 2 distributionBase=GRADLE_USER_HOME
3 3 distributionPath=wrapper/dists
4 4 zipStoreBase=GRADLE_USER_HOME
5 5 zipStorePath=wrapper/dists
6   -distributionUrl=http\://services.gradle.org/distributions/gradle-1.0-milestone-9-bin.zip
  6 +distributionUrl=http\://services.gradle.org/distributions/gradle-1.1-bin.zip
4 gradlew
@@ -101,13 +101,13 @@ if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then
101 101 warn "Could not set maximum file descriptor limit: $MAX_FD"
102 102 fi
103 103 else
104   - warn "Could not query businessSystem maximum file descriptor limit: $MAX_FD_LIMIT"
  104 + warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
105 105 fi
106 106 fi
107 107
108 108 # For Darwin, add options to specify how the application appears in the dock
109 109 if $darwin; then
110   - JAVA_OPTS="$JAVA_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
  110 + GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
111 111 fi
112 112
113 113 # For Cygwin, switch paths to Windows format before running java
180 gradlew.bat
... ... @@ -1,90 +1,90 @@
1   -@if "%DEBUG%" == "" @echo off
2   -@rem ##########################################################################
3   -@rem
4   -@rem Gradle startup script for Windows
5   -@rem
6   -@rem ##########################################################################
7   -
8   -@rem Set local scope for the variables with windows NT shell
9   -if "%OS%"=="Windows_NT" setlocal
10   -
11   -@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
12   -set DEFAULT_JVM_OPTS=
13   -
14   -set DIRNAME=%~dp0
15   -if "%DIRNAME%" == "" set DIRNAME=.
16   -set APP_BASE_NAME=%~n0
17   -set APP_HOME=%DIRNAME%
18   -
19   -@rem Find java.exe
20   -if defined JAVA_HOME goto findJavaFromJavaHome
21   -
22   -set JAVA_EXE=java.exe
23   -%JAVA_EXE% -version >NUL 2>&1
24   -if "%ERRORLEVEL%" == "0" goto init
25   -
26   -echo.
27   -echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
28   -echo.
29   -echo Please set the JAVA_HOME variable in your environment to match the
30   -echo location of your Java installation.
31   -
32   -goto fail
33   -
34   -:findJavaFromJavaHome
35   -set JAVA_HOME=%JAVA_HOME:"=%
36   -set JAVA_EXE=%JAVA_HOME%/bin/java.exe
37   -
38   -if exist "%JAVA_EXE%" goto init
39   -
40   -echo.
41   -echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
42   -echo.
43   -echo Please set the JAVA_HOME variable in your environment to match the
44   -echo location of your Java installation.
45   -
46   -goto fail
47   -
48   -:init
49   -@rem Get command-line arguments, handling Windowz variants
50   -
51   -if not "%OS%" == "Windows_NT" goto win9xME_args
52   -if "%@eval[2+2]" == "4" goto 4NT_args
53   -
54   -:win9xME_args
55   -@rem Slurp the command line arguments.
56   -set CMD_LINE_ARGS=
57   -set _SKIP=2
58   -
59   -:win9xME_args_slurp
60   -if "x%~1" == "x" goto execute
61   -
62   -set CMD_LINE_ARGS=%*
63   -goto execute
64   -
65   -:4NT_args
66   -@rem Get arguments from the 4NT Shell from JP Software
67   -set CMD_LINE_ARGS=%$
68   -
69   -:execute
70   -@rem Setup the command line
71   -
72   -set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
73   -
74   -@rem Execute Gradle
75   -"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
76   -
77   -:end
78   -@rem End local scope for the variables with windows NT shell
79   -if "%ERRORLEVEL%"=="0" goto mainEnd
80   -
81   -:fail
82   -rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
83   -rem the _cmd.exe /c_ return code!
84   -if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
85   -exit /b 1
86   -
87   -:mainEnd
88   -if "%OS%"=="Windows_NT" endlocal
89   -
90   -:omega
  1 +@if "%DEBUG%" == "" @echo off
  2 +@rem ##########################################################################
  3 +@rem
  4 +@rem Gradle startup script for Windows
  5 +@rem
  6 +@rem ##########################################################################
  7 +
  8 +@rem Set local scope for the variables with windows NT shell
  9 +if "%OS%"=="Windows_NT" setlocal
  10 +
  11 +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
  12 +set DEFAULT_JVM_OPTS=
  13 +
  14 +set DIRNAME=%~dp0
  15 +if "%DIRNAME%" == "" set DIRNAME=.
  16 +set APP_BASE_NAME=%~n0
  17 +set APP_HOME=%DIRNAME%
  18 +
  19 +@rem Find java.exe
  20 +if defined JAVA_HOME goto findJavaFromJavaHome
  21 +
  22 +set JAVA_EXE=java.exe
  23 +%JAVA_EXE% -version >NUL 2>&1
  24 +if "%ERRORLEVEL%" == "0" goto init
  25 +
  26 +echo.
  27 +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
  28 +echo.
  29 +echo Please set the JAVA_HOME variable in your environment to match the
  30 +echo location of your Java installation.
  31 +
  32 +goto fail
  33 +
  34 +:findJavaFromJavaHome
  35 +set JAVA_HOME=%JAVA_HOME:"=%
  36 +set JAVA_EXE=%JAVA_HOME%/bin/java.exe
  37 +
  38 +if exist "%JAVA_EXE%" goto init
  39 +
  40 +echo.
  41 +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
  42 +echo.
  43 +echo Please set the JAVA_HOME variable in your environment to match the
  44 +echo location of your Java installation.
  45 +
  46 +goto fail
  47 +
  48 +:init
  49 +@rem Get command-line arguments, handling Windowz variants
  50 +
  51 +if not "%OS%" == "Windows_NT" goto win9xME_args
  52 +if "%@eval[2+2]" == "4" goto 4NT_args
  53 +
  54 +:win9xME_args
  55 +@rem Slurp the command line arguments.
  56 +set CMD_LINE_ARGS=
  57 +set _SKIP=2
  58 +
  59 +:win9xME_args_slurp
  60 +if "x%~1" == "x" goto execute
  61 +
  62 +set CMD_LINE_ARGS=%*
  63 +goto execute
  64 +
  65 +:4NT_args
  66 +@rem Get arguments from the 4NT Shell from JP Software
  67 +set CMD_LINE_ARGS=%$
  68 +
  69 +:execute
  70 +@rem Setup the command line
  71 +
  72 +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
  73 +
  74 +@rem Execute Gradle
  75 +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
  76 +
  77 +:end
  78 +@rem End local scope for the variables with windows NT shell
  79 +if "%ERRORLEVEL%"=="0" goto mainEnd
  80 +
  81 +:fail
  82 +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
  83 +rem the _cmd.exe /c_ return code!
  84 +if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
  85 +exit /b 1
  86 +
  87 +:mainEnd
  88 +if "%OS%"=="Windows_NT" endlocal
  89 +
  90 +:omega

0 comments on commit c2af08e

Please sign in to comment.
Something went wrong with that request. Please try again.