Hibernate
/
hibernate-orm
mirror of https://github.com/hibernate/hibernate-orm
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

HHH-8232 - Upgrade to Gradle 1.6

This commit is contained in:
Steve Ebersole 2013-05-09 20:33:19 -05:00
parent 8e3770235b
commit e9a54405c2
6 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build.gradle
View File

@ -29,7 +29,7 @@ ext.hibernateTargetVersion = '4.3.0-SNAPSHOT'
ext.javaLanguageLevel = "1.6" ext.javaLanguageLevel = "1.6"
task wrapper(type: Wrapper) { task wrapper(type: Wrapper) {
gradleVersion = '1.5' gradleVersion = '1.6'
} }

1
buildSrc/build.gradle
View File

@ -39,7 +39,6 @@ dependencies {
// common // common
compile gradleApi() compile gradleApi()
compile localGroovy() compile localGroovy()
groovy localGroovy()
compile 'org.apache.ant:ant:1.8.2' compile 'org.apache.ant:ant:1.8.2'
// injection plugin // injection plugin
compile 'org.javassist:javassist:3.15.0-GA' compile 'org.javassist:javassist:3.15.0-GA'

2
buildSrc/src/main/groovy/org/hibernate/build/gradle/testing/database/AbstractDatabaseProfileImpl.java
View File

@ -119,7 +119,7 @@ public abstract class AbstractDatabaseProfileImpl implements DatabaseProfile {
protected Configuration getOrCreateConfiguration(String name) { protected Configuration getOrCreateConfiguration(String name) {
Configuration configuration = project.getConfigurations().findByName( name ); Configuration configuration = project.getConfigurations().findByName( name );
if ( configuration == null ) { if ( configuration == null ) {
configuration = project.getConfigurations().add( name ); configuration = project.getConfigurations().create( name );
} }
return configuration; return configuration;
} }

8
buildSrc/src/main/groovy/org/hibernate/build/gradle/testing/matrix/MatrixTestingPlugin.groovy
View File

@ -101,7 +101,7 @@ public class MatrixTestingPlugin implements Plugin<Project> {
* Prepare compile configuration for matrix source set. * Prepare compile configuration for matrix source set.
*/ */
private Configuration prepareCompileConfiguration() { private Configuration prepareCompileConfiguration() {
return project.configurations.add( MATRIX_COMPILE_CONFIG_NAME ) return project.configurations.create( MATRIX_COMPILE_CONFIG_NAME )
.setDescription( "Dependencies used to compile the matrix tests" ) .setDescription( "Dependencies used to compile the matrix tests" )
.extendsFrom( project.configurations.getByName( COMPILE_CONFIGURATION_NAME ) ) .extendsFrom( project.configurations.getByName( COMPILE_CONFIGURATION_NAME ) )
.extendsFrom( project.configurations.getByName( TEST_COMPILE_CONFIGURATION_NAME ) ); .extendsFrom( project.configurations.getByName( TEST_COMPILE_CONFIGURATION_NAME ) );
@ -111,7 +111,7 @@ public class MatrixTestingPlugin implements Plugin<Project> {
* Prepare runtime configuration for matrix source set. * Prepare runtime configuration for matrix source set.
*/ */
private Configuration prepareRuntimeConfiguration() { private Configuration prepareRuntimeConfiguration() {
return project.configurations.add( MATRIX_RUNTIME_CONFIG_NAME ) return project.configurations.create( MATRIX_RUNTIME_CONFIG_NAME )
.setDescription( "Dependencies (baseline) used to run the matrix tests" ) .setDescription( "Dependencies (baseline) used to run the matrix tests" )
.extendsFrom( matrixCompileConfig ) .extendsFrom( matrixCompileConfig )
.extendsFrom( project.configurations.getByName( RUNTIME_CONFIGURATION_NAME ) ) .extendsFrom( project.configurations.getByName( RUNTIME_CONFIGURATION_NAME ) )
@ -119,7 +119,7 @@ public class MatrixTestingPlugin implements Plugin<Project> {
} }
private Task prepareGroupingTask() { private Task prepareGroupingTask() {
Task matrixTask = project.tasks.add( MATRIX_TASK_NAME ); Task matrixTask = project.tasks.create( MATRIX_TASK_NAME );
matrixTask.group = "Verification" matrixTask.group = "Verification"
matrixTask.description = "Runs the unit tests on Database Matrix" matrixTask.description = "Runs the unit tests on Database Matrix"
return matrixTask; return matrixTask;
@ -140,7 +140,7 @@ public class MatrixTestingPlugin implements Plugin<Project> {
private Task prepareNodeTask(MatrixNode node) { private Task prepareNodeTask(MatrixNode node) {
String taskName = MATRIX_TASK_NAME + '_' + node.name String taskName = MATRIX_TASK_NAME + '_' + node.name
log.debug( "Adding Matrix Testing task $taskName" ); log.debug( "Adding Matrix Testing task $taskName" );
final Test nodeTask = project.tasks.add( taskName, Test ); final Test nodeTask = project.tasks.create( taskName, Test );
nodeTask.description = "Runs the matrix against ${node.name}" nodeTask.description = "Runs the matrix against ${node.name}"
nodeTask.classpath = node.databaseProfile.testingRuntimeConfiguration + testSourceSet.runtimeClasspath nodeTask.classpath = node.databaseProfile.testingRuntimeConfiguration + testSourceSet.runtimeClasspath
nodeTask.testClassesDir = testSourceSet.output.classesDir nodeTask.testClassesDir = testSourceSet.output.classesDir

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 @@
#Thu Apr 04 13:01:06 CDT 2013 #Thu May 09 20:32:29 CDT 2013
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.5-bin.zip distributionUrl=http\://services.gradle.org/distributions/gradle-1.6-bin.zip