Skip to content

Commit

Permalink
Issue #143: Moved Gradle Wrapper to root level of project. Added a ta…
Browse files Browse the repository at this point in the history
…sk to create template project distribution.
  • Loading branch information
bmuschko committed Jul 3, 2012
1 parent e97e87e commit fbf88d5
Show file tree
Hide file tree
Showing 12 changed files with 130 additions and 365 deletions.
37 changes: 37 additions & 0 deletions build.gradle
@@ -0,0 +1,37 @@
defaultTasks 'clean', 'build', 'templateProjectZip'

allprojects {
apply plugin: 'idea'
version = '1.3-SNAPSHOT'
group = 'org.gaelyk'
}

ext.templateProjectDir = 'template-project'
ext.gradleWrapperDir = 'gradle'

task templateProjectZip(type: Zip) {
description = 'Creates template project distribution.'

from("$templateProjectDir/src") {
into 'src'
}

from(gradleWrapperDir) {
into 'gradle'
}

from(templateProjectDir) {
include 'build.gradle'
}

from('.') {
include 'gradlew', 'gradlew.bat'
fileMode = 0755
}

baseName 'gaelyk-template-project'
}

task wrapper(type: Wrapper) {
gradleVersion '1.0'
}
8 changes: 0 additions & 8 deletions core/build.gradle
@@ -1,7 +1,6 @@
apply plugin: 'groovy'
apply plugin: 'maven'
apply plugin: 'eclipse'
apply plugin: 'idea'

/**
* http://evgeny-goldin.com/wiki/Gradle-CodeNarc-plugin
Expand All @@ -18,9 +17,6 @@ sourceCompatibility = 1.5
targetCompatibility = 1.5
defaultTasks 'clean', 'codenarc', 'build'

// current Gaelyk version
version = '1.3-SNAPSHOT'
group = 'org.gaelyk'
final appEngineVersion = '1.7.0'
final groovyVersion = '1.8.6'

Expand Down Expand Up @@ -132,10 +128,6 @@ tasks.withType(Upload) { // map the groovy configuration to compile in the pom
}
}

task wrapper(type: Wrapper) {
gradleVersion '1.0'
}

if(hasProperty('sonatypeUsername') && hasProperty('sonatypePassword')){
apply plugin: 'signing'
signing {
Expand Down
90 changes: 0 additions & 90 deletions core/gradlew.bat

This file was deleted.

File renamed without changes.
@@ -1,4 +1,4 @@
#Fri Jun 29 12:35:31 COT 2012
#Mon Jul 02 20:59:10 EDT 2012
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
Expand Down
File renamed without changes.
180 changes: 90 additions & 90 deletions template-project/gradlew.bat → gradlew.bat
@@ -1,90 +1,90 @@
@if "%DEBUG%" == "" @echo off
@rem ##########################################################################
@rem
@rem Gradle startup script for Windows
@rem
@rem ##########################################################################

@rem Set local scope for the variables with windows NT shell
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 DIRNAME=%~dp0
if "%DIRNAME%" == "" set DIRNAME=.
set APP_BASE_NAME=%~n0
set APP_HOME=%DIRNAME%

@rem Find java.exe
if defined JAVA_HOME goto findJavaFromJavaHome

set JAVA_EXE=java.exe
%JAVA_EXE% -version >NUL 2>&1
if "%ERRORLEVEL%" == "0" goto init

echo.
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
echo.
echo Please set the JAVA_HOME variable in your environment to match the
echo location of your Java installation.

goto fail

:findJavaFromJavaHome
set JAVA_HOME=%JAVA_HOME:"=%
set JAVA_EXE=%JAVA_HOME%/bin/java.exe

if exist "%JAVA_EXE%" goto init

echo.
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
echo.
echo Please set the JAVA_HOME variable in your environment to match the
echo location of your Java installation.

goto fail

:init
@rem Get command-line arguments, handling Windowz variants

if not "%OS%" == "Windows_NT" goto win9xME_args
if "%@eval[2+2]" == "4" goto 4NT_args

:win9xME_args
@rem Slurp the command line arguments.
set CMD_LINE_ARGS=
set _SKIP=2

:win9xME_args_slurp
if "x%~1" == "x" goto execute

set CMD_LINE_ARGS=%*
goto execute

:4NT_args
@rem Get arguments from the 4NT Shell from JP Software
set CMD_LINE_ARGS=%$

:execute
@rem Setup the command line

set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar

@rem Execute Gradle
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%

:end
@rem End local scope for the variables with windows NT shell
if "%ERRORLEVEL%"=="0" goto mainEnd

:fail
rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
rem the _cmd.exe /c_ return code!
if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
exit /b 1

:mainEnd
if "%OS%"=="Windows_NT" endlocal

:omega
@if "%DEBUG%" == "" @echo off
@rem ##########################################################################
@rem
@rem Gradle startup script for Windows
@rem
@rem ##########################################################################

@rem Set local scope for the variables with windows NT shell
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 DIRNAME=%~dp0
if "%DIRNAME%" == "" set DIRNAME=.
set APP_BASE_NAME=%~n0
set APP_HOME=%DIRNAME%

@rem Find java.exe
if defined JAVA_HOME goto findJavaFromJavaHome

set JAVA_EXE=java.exe
%JAVA_EXE% -version >NUL 2>&1
if "%ERRORLEVEL%" == "0" goto init

echo.
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
echo.
echo Please set the JAVA_HOME variable in your environment to match the
echo location of your Java installation.

goto fail

:findJavaFromJavaHome
set JAVA_HOME=%JAVA_HOME:"=%
set JAVA_EXE=%JAVA_HOME%/bin/java.exe

if exist "%JAVA_EXE%" goto init

echo.
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
echo.
echo Please set the JAVA_HOME variable in your environment to match the
echo location of your Java installation.

goto fail

:init
@rem Get command-line arguments, handling Windowz variants

if not "%OS%" == "Windows_NT" goto win9xME_args
if "%@eval[2+2]" == "4" goto 4NT_args

:win9xME_args
@rem Slurp the command line arguments.
set CMD_LINE_ARGS=
set _SKIP=2

:win9xME_args_slurp
if "x%~1" == "x" goto execute

set CMD_LINE_ARGS=%*
goto execute

:4NT_args
@rem Get arguments from the 4NT Shell from JP Software
set CMD_LINE_ARGS=%$

:execute
@rem Setup the command line

set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar

@rem Execute Gradle
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%

:end
@rem End local scope for the variables with windows NT shell
if "%ERRORLEVEL%"=="0" goto mainEnd

:fail
rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
rem the _cmd.exe /c_ return code!
if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
exit /b 1

:mainEnd
if "%OS%"=="Windows_NT" endlocal

:omega
1 change: 1 addition & 0 deletions settings.gradle
@@ -0,0 +1 @@
include 'core'
7 changes: 1 addition & 6 deletions template-project/build.gradle
Expand Up @@ -118,9 +118,4 @@ eclipse {
}
}
}
}

task wrapper(type: Wrapper) {
gradleVersion '1.0'
}

}
Binary file removed template-project/gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
6 changes: 0 additions & 6 deletions template-project/gradle/wrapper/gradle-wrapper.properties

This file was deleted.

0 comments on commit fbf88d5

Please sign in to comment.