You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@groovy.apache.org by su...@apache.org on 2017/08/30 01:05:39 UTC
groovy git commit: Downgrade gradle version to 3.5.1
Repository: groovy
Updated Branches:
refs/heads/master d721a39ae -> 548ac7e56
Downgrade gradle version to 3.5.1
Project: http://git-wip-us.apache.org/repos/asf/groovy/repo
Commit: http://git-wip-us.apache.org/repos/asf/groovy/commit/548ac7e5
Tree: http://git-wip-us.apache.org/repos/asf/groovy/tree/548ac7e5
Diff: http://git-wip-us.apache.org/repos/asf/groovy/diff/548ac7e5
Branch: refs/heads/master
Commit: 548ac7e56e1320602db212e41188b7170fbb6b41
Parents: d721a39
Author: sunlan <su...@apache.org>
Authored: Wed Aug 30 09:05:30 2017 +0800
Committer: sunlan <su...@apache.org>
Committed: Wed Aug 30 09:05:30 2017 +0800
----------------------------------------------------------------------
build.gradle | 18 ++++++++----------
.../gradle/WriteExtensionDescriptorTask.groovy | 2 +-
gradle/assemble.gradle | 2 +-
gradle/docs.gradle | 5 ++---
gradle/wrapper/gradle-wrapper.jar | Bin 54712 -> 54708 bytes
gradle/wrapper/gradle-wrapper.properties | 3 +--
.../org/codehaus/groovy/ant/GroovycTest.xml | 2 +-
.../org/codehaus/groovy/ant/GroovycTest1.groovy | 2 +-
.../org/codehaus/groovy/ant/GroovycTest.java | 2 +-
subprojects/groovy-groovydoc/build.gradle | 2 +-
.../test/resources/groovydoc/groovyDocTests.xml | 5 ++---
subprojects/performance/build.gradle | 2 +-
12 files changed, 20 insertions(+), 25 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/groovy/blob/548ac7e5/build.gradle
----------------------------------------------------------------------
diff --git a/build.gradle b/build.gradle
index 941aebc..bc9f157 100644
--- a/build.gradle
+++ b/build.gradle
@@ -50,17 +50,15 @@ buildscript {
}
plugins {
- id 'com.gradle.build-scan' version '1.8'
- id 'me.champeau.buildscan-recipes' version '0.2.0'
+ id 'com.gradle.build-scan' version '1.6'
+ id 'me.champeau.buildscan-recipes' version '0.1.7'
}
buildScan {
licenseAgreementUrl = 'https://gradle.com/terms-of-service'
licenseAgree = 'yes'
publishAlways()
-}
-buildScanRecipes {
recipe 'git-commit', baseUrl: 'https://github.com/apache/groovy/tree'
recipe 'teamcity', baseUrl: 'https://ci.groovy-lang.org', guest: 'true'
recipes 'git-status', 'gc-stats', 'teamcity', 'travis-ci'
@@ -169,7 +167,7 @@ ext {
commonsHttpClientVersion = '3.1'
eclipseOsgiVersion = '3.9.1-v20140110-1610'
gparsVersion = '1.2.1'
- gradleVersion = '4.1'
+ gradleVersion = '3.5.1'
ivyVersion = '2.4.0'
jansiVersion = '1.13'
jarjarVersion = '1.4.1'
@@ -346,14 +344,14 @@ processResources.doLast {
include 'groovy/inspect/swingui/AstBrowserProperties.groovy',
'org/codehaus/groovy/tools/groovydoc/gstringTemplates/GroovyDocTemplateInfo.java'
}
- into sourceSets.main.java.outputDir
+ into sourceSets.main.output.classesDir
}
}
tasks.withType(Jar) {
doFirst {
ant.java(classname:'org.jboss.bridger.Bridger', classpath: rootProject.configurations.tools.asPath, outputproperty: 'stdout') {
- arg(value: "${sourceSets.main.java.outputDir.canonicalPath}/org/codehaus/groovy/runtime/DefaultGroovyMethods.class")
+ arg(value: "${sourceSets.main.output.classesDir.canonicalPath}/org/codehaus/groovy/runtime/DefaultGroovyMethods.class")
}
ant.echo('Bridger: ' + ant.properties.stdout)
}
@@ -394,8 +392,8 @@ apply from: 'gradle/wrapper.gradle'
task dgmConverter(dependsOn:compileJava) {
description = 'Generates DGM info file required for faster startup.'
- def classesDir = sourceSets.main.java.outputDir
- def classpath = files(sourceSets.main.output.classesDirs, configurations.compile)
+ def classesDir = sourceSets.main.output.classesDir
+ def classpath = files(classesDir, configurations.compile)
//main = 'org.codehaus.groovy.tools.DgmConverter'
//args = ['--info', classesDir.absolutePath]
@@ -435,7 +433,7 @@ task bootstrapJar {
destinationDir.mkdirs()
ant.jar(
destfile: archivePath,
- basedir: file(sourceSets.main.java.outputDir)
+ basedir: file(sourceSets.main.output.classesDir)
)
}
inputs.property('indy', useIndy())
http://git-wip-us.apache.org/repos/asf/groovy/blob/548ac7e5/buildSrc/src/main/groovy/org/codehaus/groovy/gradle/WriteExtensionDescriptorTask.groovy
----------------------------------------------------------------------
diff --git a/buildSrc/src/main/groovy/org/codehaus/groovy/gradle/WriteExtensionDescriptorTask.groovy b/buildSrc/src/main/groovy/org/codehaus/groovy/gradle/WriteExtensionDescriptorTask.groovy
index 679b083..a5e716f 100644
--- a/buildSrc/src/main/groovy/org/codehaus/groovy/gradle/WriteExtensionDescriptorTask.groovy
+++ b/buildSrc/src/main/groovy/org/codehaus/groovy/gradle/WriteExtensionDescriptorTask.groovy
@@ -36,7 +36,7 @@ class WriteExtensionDescriptorTask extends DefaultTask {
private File computeDescriptorFile() {
- def metaInfDir = new File("${project.buildDir}/resources/main/META-INF/services")
+ def metaInfDir = new File("${project.buildDir}/classes/main/META-INF/services")
return new File(metaInfDir, "org.codehaus.groovy.runtime.ExtensionModule")
}
http://git-wip-us.apache.org/repos/asf/groovy/blob/548ac7e5/gradle/assemble.gradle
----------------------------------------------------------------------
diff --git a/gradle/assemble.gradle b/gradle/assemble.gradle
index 4b5a8ba..04095e0 100644
--- a/gradle/assemble.gradle
+++ b/gradle/assemble.gradle
@@ -296,7 +296,7 @@ def mergeModuleDescriptors() {
def staticExtensionClasses = []
modules().collect {
- new File("${it.buildDir}/resources/main/META-INF/services/org.codehaus.groovy.runtime.ExtensionModule")
+ new File("${it.buildDir}/classes/main/META-INF/services/org.codehaus.groovy.runtime.ExtensionModule")
}.findAll { it.exists() }.each {
def props = new Properties()
props.load(it.newInputStream())
http://git-wip-us.apache.org/repos/asf/groovy/blob/548ac7e5/gradle/docs.gradle
----------------------------------------------------------------------
diff --git a/gradle/docs.gradle b/gradle/docs.gradle
index 46fd3a5..905d06a 100644
--- a/gradle/docs.gradle
+++ b/gradle/docs.gradle
@@ -112,7 +112,7 @@ groovydocAll groovydocSpec
// but the file is only generated by the 'jar' task, so as a workaround, we copy
// it into the docgenerator classes
task docProjectVersionInfo(type: Copy) {
- destinationDir = file("${project(':groovy-docgenerator').sourceSets.main.java.outputDir}")
+ destinationDir = file("${project(':groovy-docgenerator').buildDir}/classes/main")
into('META-INF') {
from('src/main/META-INF/groovy-release-info.properties') {
filter(rootProject.propertiesFilter, org.apache.tools.ant.filters.ReplaceTokens)
@@ -130,14 +130,13 @@ task docGDK {
ext.destinationDir = "$buildDir/html/groovy-jdk"
inputs.files sourceSets.main.runtimeClasspath + configurations.tools
outputs.dir destinationDir
- def docGeneratorPath = files(project(':groovy-docgenerator').sourceSets.main.output.classesDirs)
doLast { task ->
try {
ant {
java(classname: 'org.codehaus.groovy.tools.DocGenerator',
fork: 'true',
failonerror: 'true',
- classpath: (sourceSets.main.runtimeClasspath + configurations.tools + groovydocAll.groovyClasspath + docGeneratorPath).asPath,
+ classpath: (sourceSets.main.runtimeClasspath + configurations.tools + groovydocAll.groovyClasspath).asPath,
errorproperty: 'edr',
outputproperty: 'odr') {
arg(value: '-title')
http://git-wip-us.apache.org/repos/asf/groovy/blob/548ac7e5/gradle/wrapper/gradle-wrapper.jar
----------------------------------------------------------------------
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index 6d3706e..7a3265e 100644
Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ
http://git-wip-us.apache.org/repos/asf/groovy/blob/548ac7e5/gradle/wrapper/gradle-wrapper.properties
----------------------------------------------------------------------
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 8be2c6e..90a06ce 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,5 @@
-#Thu Aug 10 01:25:50 CST 2017
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-3.5.1-bin.zip
http://git-wip-us.apache.org/repos/asf/groovy/blob/548ac7e5/subprojects/groovy-ant/src/test-resources/org/codehaus/groovy/ant/GroovycTest.xml
----------------------------------------------------------------------
diff --git a/subprojects/groovy-ant/src/test-resources/org/codehaus/groovy/ant/GroovycTest.xml b/subprojects/groovy-ant/src/test-resources/org/codehaus/groovy/ant/GroovycTest.xml
index 05e33f4..5e2afba 100644
--- a/subprojects/groovy-ant/src/test-resources/org/codehaus/groovy/ant/GroovycTest.xml
+++ b/subprojects/groovy-ant/src/test-resources/org/codehaus/groovy/ant/GroovycTest.xml
@@ -23,7 +23,7 @@
<project name="Test Groovyc Task" default="test1">
<property name="srcPath" value="."/>
- <property name="destPath" value="${user.dir}/target/classes/groovy/test"/>
+ <property name="destPath" value="${user.dir}/target/classes/test"/>
<property name="javaVersion" value="6"/>
http://git-wip-us.apache.org/repos/asf/groovy/blob/548ac7e5/subprojects/groovy-ant/src/test-resources/org/codehaus/groovy/ant/GroovycTest1.groovy
----------------------------------------------------------------------
diff --git a/subprojects/groovy-ant/src/test-resources/org/codehaus/groovy/ant/GroovycTest1.groovy b/subprojects/groovy-ant/src/test-resources/org/codehaus/groovy/ant/GroovycTest1.groovy
index 32e73ac..a0694ab 100644
--- a/subprojects/groovy-ant/src/test-resources/org/codehaus/groovy/ant/GroovycTest1.groovy
+++ b/subprojects/groovy-ant/src/test-resources/org/codehaus/groovy/ant/GroovycTest1.groovy
@@ -20,6 +20,6 @@ package org.codehaus.groovy.ant
class GroovycTest1 {
static void main ( String[] args ) {
- ( new File ( 'target/classes/groovy/test/org/codehaus/groovy/ant/GroovycTest1_Result.txt' ) ).write ( 'OK.' )
+ ( new File ( 'target/classes/test/org/codehaus/groovy/ant/GroovycTest1_Result.txt' ) ).write ( 'OK.' )
}
}
http://git-wip-us.apache.org/repos/asf/groovy/blob/548ac7e5/subprojects/groovy-ant/src/test/groovy/org/codehaus/groovy/ant/GroovycTest.java
----------------------------------------------------------------------
diff --git a/subprojects/groovy-ant/src/test/groovy/org/codehaus/groovy/ant/GroovycTest.java b/subprojects/groovy-ant/src/test/groovy/org/codehaus/groovy/ant/GroovycTest.java
index 81e0253..8dae0aa 100644
--- a/subprojects/groovy-ant/src/test/groovy/org/codehaus/groovy/ant/GroovycTest.java
+++ b/subprojects/groovy-ant/src/test/groovy/org/codehaus/groovy/ant/GroovycTest.java
@@ -37,7 +37,7 @@ import java.util.regex.Pattern;
* @author Russel Winder
*/
public class GroovycTest extends GroovyTestCase {
- private final String classDirectory = "target/classes/groovy/test/org/codehaus/groovy/ant/";
+ private final String classDirectory = "target/classes/test/org/codehaus/groovy/ant/";
private final File antFile = new File("src/test-resources/org/codehaus/groovy/ant/GroovycTest.xml");
private Project project;
private static boolean warned = false;
http://git-wip-us.apache.org/repos/asf/groovy/blob/548ac7e5/subprojects/groovy-groovydoc/build.gradle
----------------------------------------------------------------------
diff --git a/subprojects/groovy-groovydoc/build.gradle b/subprojects/groovy-groovydoc/build.gradle
index 6dda7b6..421bfb7 100644
--- a/subprojects/groovy-groovydoc/build.gradle
+++ b/subprojects/groovy-groovydoc/build.gradle
@@ -27,6 +27,6 @@ dependencies {
compileJava {
doLast {
- mkdir "$sourceSets.main.java.outputDir/META-INF"
+ mkdir "$sourceSets.main.output.classesDir/META-INF"
}
}
http://git-wip-us.apache.org/repos/asf/groovy/blob/548ac7e5/subprojects/groovy-groovydoc/src/test/resources/groovydoc/groovyDocTests.xml
----------------------------------------------------------------------
diff --git a/subprojects/groovy-groovydoc/src/test/resources/groovydoc/groovyDocTests.xml b/subprojects/groovy-groovydoc/src/test/resources/groovydoc/groovyDocTests.xml
index 7c76e1b..d1aa402 100644
--- a/subprojects/groovy-groovydoc/src/test/resources/groovydoc/groovyDocTests.xml
+++ b/subprojects/groovy-groovydoc/src/test/resources/groovydoc/groovyDocTests.xml
@@ -24,9 +24,8 @@
<property name="tmpdir" value="${java.io.tmpdir}/${user.name}/${ant.project.name}"/>
<path id="classpath">
- <fileset dir="target/classes/java/main" includes="**/*.*"/>
- <fileset dir="target/classes/groovy/main" includes="**/*.*"/>
- <fileset dir="target/classes/groovy/test" includes="**/*.*"/>
+ <fileset dir="target/classes/main" includes="**/*.*"/>
+ <fileset dir="target/classes/test" includes="**/*.*"/>
</path>
<taskdef name="groovydoc" classpathref="classpath"
http://git-wip-us.apache.org/repos/asf/groovy/blob/548ac7e5/subprojects/performance/build.gradle
----------------------------------------------------------------------
diff --git a/subprojects/performance/build.gradle b/subprojects/performance/build.gradle
index f8ba8d8..09aa429 100644
--- a/subprojects/performance/build.gradle
+++ b/subprojects/performance/build.gradle
@@ -20,7 +20,7 @@
import java.text.DecimalFormat
plugins {
- id "me.champeau.gradle.jmh" version "0.4.2"
+ id "me.champeau.gradle.jmh" version "0.3.1"
}
configurations {