You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@groovy.apache.org by cc...@apache.org on 2017/12/12 22:07:56 UTC
[13/20] groovy git commit: Fix backport of build from `master`
Fix backport of build from `master`
Project: http://git-wip-us.apache.org/repos/asf/groovy/repo
Commit: http://git-wip-us.apache.org/repos/asf/groovy/commit/c71e0e74
Tree: http://git-wip-us.apache.org/repos/asf/groovy/tree/c71e0e74
Diff: http://git-wip-us.apache.org/repos/asf/groovy/diff/c71e0e74
Branch: refs/heads/GROOVY_2_5_X
Commit: c71e0e747bf4fd458d01856f4c070011e482e5f2
Parents: 65f1b9e
Author: Cedric Champeau <cc...@apache.org>
Authored: Tue Dec 12 08:13:52 2017 +0100
Committer: Cedric Champeau <cc...@apache.org>
Committed: Tue Dec 12 22:13:40 2017 +0100
----------------------------------------------------------------------
build.gradle | 19 +++++++++++--------
gradle/test.gradle | 2 +-
2 files changed, 12 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/groovy/blob/c71e0e74/build.gradle
----------------------------------------------------------------------
diff --git a/build.gradle b/build.gradle
index 9b9378a..4674e55 100644
--- a/build.gradle
+++ b/build.gradle
@@ -56,6 +56,7 @@ buildScan {
licenseAgree = 'yes'
publishAlways()
}
+
buildScanRecipes {
recipe 'git-commit', baseUrl: 'https://github.com/apache/groovy/tree'
recipe 'teamcity', baseUrl: 'https://ci.groovy-lang.org', guest: 'true'
@@ -85,7 +86,7 @@ allprojects {
group = 'org.codehaus.groovy'
version = groovyVersion
repositories {
- if (isBuildInChina()) {
+ if (rootProject.hasProperty('buildInChina')) {
// Try to use Aliyun maven repository when building in China
maven { url 'http://maven.aliyun.com/nexus/content/groups/public' }
}
@@ -184,6 +185,7 @@ ext {
xmlunitVersion = '1.6'
xstreamVersion = '1.4.10'
spockVersion = '1.2-groovy-2.4-SNAPSHOT'
+ antlr4Version = '4.7'
jsr305Version = '3.0.2'
isReleaseVersion = !groovyVersion.toLowerCase().endsWith("snapshot")
}
@@ -341,14 +343,14 @@ processResources.doLast {
include 'groovy/inspect/swingui/AstBrowserProperties.groovy',
'org/codehaus/groovy/tools/groovydoc/gstringTemplates/GroovyDocTemplateInfo.java'
}
- into sourceSets.main.output.classesDir
+ into sourceSets.main.java.outputDir
}
}
compileJava {
doLast {
ant.java(classname:'org.jboss.bridger.Bridger', classpath: rootProject.configurations.tools.asPath, outputproperty: 'stdout') {
- arg(value: "${sourceSets.main.output.classesDir.canonicalPath}/org/codehaus/groovy/runtime/DefaultGroovyMethods.class")
+ arg(value: "${sourceSets.main.java.outputDir.canonicalPath}/org/codehaus/groovy/runtime/DefaultGroovyMethods.class")
}
ant.echo('Bridger: ' + ant.properties.stdout)
}
@@ -440,8 +442,8 @@ allprojects {
task compileGroovyWithIndy(type: GroovyCompile) {
source = sourceSets.main.groovy
classpath = compileGroovy.classpath
- sourceCompatibility = 1.8
- targetCompatibility = 1.8
+ sourceCompatibility = 1.7
+ targetCompatibility = 1.7
groovyOptions.optimizationOptions['indy'] = true
destinationDir = file("$buildDir/classes/indy")
}
@@ -455,7 +457,8 @@ allprojects {
rootProject.bootstrapJar.archivePath
)
- classpath = classpath + groovyClasspath
+ // TODO: this null check was required after adding JMH plugin to performance project
+ classpath = (classpath != null) ? classpath + groovyClasspath : groovyClasspath
}
}
@@ -465,11 +468,11 @@ compileTestGroovy {
task checkCompatibility {
doLast {
- assert JavaVersion.current().isJava8Compatible()
+ assert JavaVersion.current().java8Compatible
}
}
-if (!JavaVersion.current().isJava8Compatible()) {
+if (!JavaVersion.current().java8Compatible) {
logger.lifecycle '''
**************************************** WARNING ********************************************
****** You are running the build with an older JDK. NEVER try to release with 1.7. ******
http://git-wip-us.apache.org/repos/asf/groovy/blob/c71e0e74/gradle/test.gradle
----------------------------------------------------------------------
diff --git a/gradle/test.gradle b/gradle/test.gradle
index 9bb27c7..df0ff06 100644
--- a/gradle/test.gradle
+++ b/gradle/test.gradle
@@ -134,7 +134,7 @@ ext.extModuleOutputDir = file("$buildDir/testFixtures/extmodule")
ext.extModuleRepoDir = file("$extModuleOutputDir/repo")
task compileTestExtensionModule(type: JavaCompile) {
- classpath = files(jar.archivePath)
+ classpath = files(jar)
source fileTree("$extModuleFixtureDir/src/main/java")
destinationDir = file("$extModuleOutputDir/classes")
sourceCompatibility = 1.6