Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

GRAILS-6596 - upgrade to gradle 0.9-rc-1

  • Loading branch information...
commit 4ec3a5a15d6d0a8a61ce40a680a5389af6a0ef64 1 parent c514fe3
@jeffbrown jeffbrown authored
View
14 build.gradle
@@ -7,7 +7,7 @@ buildscript {
}
}
-apply id: 'groovy'
+apply plugin: 'groovy'
version = '1.4.0.BUILD-SNAPSHOT'
@@ -79,16 +79,16 @@ configure([compileJava, compileTestJava]) {
}
apply {
- url 'gradle/docs.gradle'
- url 'gradle/assemble.gradle'
- url 'gradle/unit-test.gradle'
- url 'gradle/maven.gradle'
- url 'gradle/findbugs.gradle'
+ from 'gradle/docs.gradle'
+ from 'gradle/assemble.gradle'
+ from 'gradle/unit-test.gradle'
+ from 'gradle/maven.gradle'
+ from 'gradle/findbugs.gradle'
}
clean {
// add additional dirs
- from(docs.destinationDir, libs.destinationDir)
+ delete(docs.destinationDir, libs.destinationDir)
}
task wrapper(type: Wrapper) {
View
14 gradle/assemble.gradle
@@ -104,7 +104,7 @@ handlersAndSchemasMetaInf = {
task testJar(type: Jar, description: 'Package up the Grails testing jar') {
appendix = "test"
metaInf handlersAndSchemasMetaInf
- from mainClassesIncludeSpec("grails/test/**", "**/groovy/grails/test/**")
+ with mainClassesIncludeSpec("grails/test/**", "**/groovy/grails/test/**")
osgify = true
mavenArtifact = true
}
@@ -112,7 +112,7 @@ task testJar(type: Jar, description: 'Package up the Grails testing jar') {
task docsJar(type: Jar, dependsOn: docGeneratingFilesJar, description: 'Package up files used for generating documentation.') {
appendix = "docs"
metaInf handlersAndSchemasMetaInf
- from mainClassesIncludeSpec("grails/doc/**", "**/groovy/grails/documentation/**")
+ with mainClassesIncludeSpec("grails/doc/**", "**/groovy/grails/documentation/**")
from docGeneratingFilesJar.archivePath
osgify = true
mavenArtifact = true
@@ -121,7 +121,7 @@ task docsJar(type: Jar, dependsOn: docGeneratingFilesJar, description: 'Package
task springJar(type: Jar, description: 'Package up the Spring related Grails classes') {
appendix = "spring"
metaInf handlersAndSchemasMetaInf
- from mainClassesIncludeSpec("grails/spring/**", "**/groovy/grails/commons/spring/**")
+ with mainClassesIncludeSpec("grails/spring/**", "**/groovy/grails/commons/spring/**")
osgify = true
mavenArtifact = true
}
@@ -129,7 +129,7 @@ task springJar(type: Jar, description: 'Package up the Spring related Grails cla
task bootstrapJar(type: Jar, description: 'Package up the classes used to bootstrap Grails') {
appendix = "bootstrap"
metaInf handlersAndSchemasMetaInf
- from mainClassesIncludeSpec("grails/util/AbstractBuildSettings*","grails/util/BuildSettings*", "grails/util/GrailsNameUtils*", "grails/util/Environment*", "grails/util/Metadata*",
+ with mainClassesIncludeSpec("grails/util/AbstractBuildSettings*","grails/util/BuildSettings*", "grails/util/GrailsNameUtils*", "grails/util/Environment*", "grails/util/Metadata*",
"grails/util/BuildScope*", "grails/util/GrailsMain*", "grails/ant/**/*", "**/groovy/grails/cli/**/*", "**/groovy/grails/resolve/**/*",
"grails/build/**")
from "build.properties"
@@ -147,7 +147,7 @@ task scriptsJar(type: Jar, description: 'Package up files used for generating do
task gormJar(type: Jar, description: 'Package up GORM related classes.') {
appendix = "gorm"
metaInf handlersAndSchemasMetaInf
- from mainClassesIncludeSpec("grails/orm/**", "**/groovy/grails/orm/hibernate/**", "**/groovy/grails/plugins/orm/hibernate/**",
+ with mainClassesIncludeSpec("grails/orm/**", "**/groovy/grails/orm/hibernate/**", "**/groovy/grails/plugins/orm/hibernate/**",
"**/groovy/grails/validation/Hibernate**")
osgify = true
mavenArtifact = true
@@ -167,14 +167,14 @@ task webJar(type: Jar, description: 'Package up web related classes.') {
task webflowJar(type: Jar, description: 'Package up Web Flow integration classes.') {
appendix = "webflow"
- from mainClassesIncludeSpec("**/groovy/grails/webflow/**", "**/groovy/grails/plugins/webflow/**")
+ with mainClassesIncludeSpec("**/groovy/grails/webflow/**", "**/groovy/grails/plugins/webflow/**")
osgify = true
mavenArtifact = true
}
task crudJar(type: Jar, description: 'Package up scaffolding related classes.') {
appendix = "crud"
- from mainClassesIncludeSpec("**/groovy/grails/scaffolding/**", "**/groovy/grails/plugins/scaffolding/**")
+ with mainClassesIncludeSpec("**/groovy/grails/scaffolding/**", "**/groovy/grails/plugins/scaffolding/**")
osgify = true
mavenArtifact = true
}
View
19 gradle/unit-test.gradle
@@ -61,8 +61,8 @@ task coverageReport {
}
test {
- options.systemProperties = ['grails.cli.testing': "true"]
- options.forkOptions.jvmArgs = ["-server", "-Xmx1G", "-Xms256m", "-XX:MaxPermSize=256m", "-Dgroovy.grails.joint=true"] // todo, "-Dgroovy.grails.joint=${groovy.grails.joint}"
+ systemProperties = ['grails.cli.testing': "true"]
+ jvmArgs = ["-server", "-Xmx1G", "-Xms256m", "-XX:MaxPermSize=256m", "-Dgroovy.grails.joint=true"] // todo, "-Dgroovy.grails.joint=${groovy.grails.joint}"
}
createTestTask("contentFormat", ["org/codehaus/groovy/grails/web/mime/ContentFormatControllerTests.class"], [])
@@ -86,16 +86,19 @@ def createTestTask(name, includes, excludes) {
}
def createTestTaskWithoutSuffix(String name, includes, excludes) {
- task = tasks.add(name: name, type: AntTest) {
- options.systemProperties = ['grails.cli.testing': "true"]
- options.forkOptions.jvmArgs = ["-server", "-Xmx1500m", "-Xms256m", "-XX:MaxPermSize=256m", "-Dgroovy.grails.joint=true"] // todo, "-Dgroovy.grails.joint=${groovy.grails.joint}"
- options.systemProperties['net.sourceforge.cobertura.datafile'] = instrumentForCoverage.cobSerFile
+ task = tasks.add(name: name, type: Test) {
+ systemProperties = ['grails.cli.testing': "true"]
+ jvmArgs = ["-server", "-Xmx1500m", "-Xms256m", "-XX:MaxPermSize=256m", "-Dgroovy.grails.joint=true"] // todo, "-Dgroovy.grails.joint=${groovy.grails.joint}"
+ systemProperties['net.sourceforge.cobertura.datafile'] = instrumentForCoverage.cobSerFile
include includes as String[]
exclude excludes as String[]
testReport = true
ignoreFailures = false
coverageHtmlReport = false
- classpath = classpath + project.rootProject.configurations.coverage
+/* classpath = classpath + project.rootProject.configurations.coverage*/
+ classpath = sourceSets.test.runtimeClasspath + project.rootProject.configurations.coverage
+ testClassesDir = sourceSets.test.classesDir
+
}
test.dependsOn task
task.dependsOn coreJar
@@ -107,7 +110,7 @@ tasks.addRule("Pattern: <testTaskName>Coverage will execute the corresponding te
def testTaskName = taskName.substring(0, taskName.length() - coverageName.length())
def testTask = tasks.findByName(testTaskName)
if (testTask) {
- def testTasks = testTask == tasks.test ? tasks.withType(AntTest) : testTask
+ def testTasks = testTask == tasks.test ? tasks.withType(Test) : testTask
applyCoveragetToTestTasks(testTasks)
tasks.add(name: taskName).dependsOn testTask, coverageReport
}
View
4 gradle/wrapper/gradle-wrapper.properties
@@ -2,8 +2,8 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
-distributionVersion=0.9-20100118091626+0100
+distributionVersion=0.9-rc-1
zipStorePath=wrapper/dists
-urlRoot=http\://snapshots.dist.codehaus.org/gradle
+urlRoot=http\://dist.codehaus.org/gradle
distributionName=gradle
distributionClassifier=bin
Please sign in to comment.
Something went wrong with that request. Please try again.