You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@groovy.apache.org by pa...@apache.org on 2017/06/22 10:02:02 UTC
[1/4] groovy git commit: bump to gradle 4.0
Repository: groovy
Updated Branches:
refs/heads/GROOVY_2_6_X 6dc4cff10 -> e7639a3cc
bump to gradle 4.0
Project: http://git-wip-us.apache.org/repos/asf/groovy/repo
Commit: http://git-wip-us.apache.org/repos/asf/groovy/commit/eeba3826
Tree: http://git-wip-us.apache.org/repos/asf/groovy/tree/eeba3826
Diff: http://git-wip-us.apache.org/repos/asf/groovy/diff/eeba3826
Branch: refs/heads/GROOVY_2_6_X
Commit: eeba382683fb8d8b203bd49a44e4547f14437e2f
Parents: 6dc4cff
Author: paulk <pa...@asert.com.au>
Authored: Thu Jun 22 19:04:28 2017 +1000
Committer: paulk <pa...@asert.com.au>
Committed: Thu Jun 22 19:04:28 2017 +1000
----------------------------------------------------------------------
build.gradle | 8 +++++---
gradle/quality.gradle | 4 ----
gradle/wrapper/gradle-wrapper.jar | Bin 54208 -> 54783 bytes
gradle/wrapper/gradle-wrapper.properties | 4 ++--
4 files changed, 7 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/groovy/blob/eeba3826/build.gradle
----------------------------------------------------------------------
diff --git a/build.gradle b/build.gradle
index 22935fd..cf46ba5 100644
--- a/build.gradle
+++ b/build.gradle
@@ -51,14 +51,16 @@ buildscript {
}
plugins {
- id 'com.gradle.build-scan' version '1.6'
- id 'me.champeau.buildscan-recipes' version '0.1.7'
+ id 'com.gradle.build-scan' version '1.8'
+ id 'me.champeau.buildscan-recipes' version '0.2.0'
}
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'
@@ -162,7 +164,7 @@ ext {
commonsHttpClientVersion = '3.1'
eclipseOsgiVersion = '3.9.1-v20140110-1610'
gparsVersion = '1.2.1'
- gradleVersion = '3.5'
+ gradleVersion = '4.0'
ivyVersion = '2.4.0'
jansiVersion = '1.13'
jarjarVersion = '1.4.1'
http://git-wip-us.apache.org/repos/asf/groovy/blob/eeba3826/gradle/quality.gradle
----------------------------------------------------------------------
diff --git a/gradle/quality.gradle b/gradle/quality.gradle
index b0a4bcf..987348e 100644
--- a/gradle/quality.gradle
+++ b/gradle/quality.gradle
@@ -138,10 +138,6 @@ allprojects {
html.enabled = true
}
maxHeapSize = '2g'
- // hack to exclude html files since include by itself doesn't work
- def temp = classes
- temp.include '**/*.class'
- classes = temp
}
}
http://git-wip-us.apache.org/repos/asf/groovy/blob/eeba3826/gradle/wrapper/gradle-wrapper.jar
----------------------------------------------------------------------
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index e4bd177..24533e8 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/eeba3826/gradle/wrapper/gradle-wrapper.properties
----------------------------------------------------------------------
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 9eabdf5..d02713a 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Wed Apr 12 20:58:54 CST 2017
+#Thu Jun 22 18:59:10 AEST 2017
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-3.5-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.0-bin.zip
[3/4] groovy git commit: tweak javadoc since value
Posted by pa...@apache.org.
tweak javadoc since value
Project: http://git-wip-us.apache.org/repos/asf/groovy/repo
Commit: http://git-wip-us.apache.org/repos/asf/groovy/commit/ad740b1f
Tree: http://git-wip-us.apache.org/repos/asf/groovy/tree/ad740b1f
Diff: http://git-wip-us.apache.org/repos/asf/groovy/diff/ad740b1f
Branch: refs/heads/GROOVY_2_6_X
Commit: ad740b1fcfa7c77fb83fc79c3aa6fc987ddcb38d
Parents: 164330e
Author: paulk <pa...@asert.com.au>
Authored: Tue May 23 15:06:20 2017 +1000
Committer: paulk <pa...@asert.com.au>
Committed: Thu Jun 22 19:53:59 2017 +1000
----------------------------------------------------------------------
src/main/groovy/lang/IntRange.java | 2 +-
src/main/groovy/lang/NumberRange.java | 2 +-
src/main/groovy/transform/ToString.java | 2 +-
.../org/codehaus/groovy/runtime/DefaultGroovyMethods.java | 4 ++--
.../codehaus/groovy/runtime/EncodingGroovyMethods.java | 10 +++++-----
.../src/main/java/groovy/json/DefaultJsonGenerator.java | 4 ++--
.../src/main/java/groovy/json/JsonBuilder.java | 4 ++--
.../src/main/java/groovy/json/JsonGenerator.java | 6 +++---
.../src/main/java/groovy/json/StreamingJsonBuilder.java | 4 ++--
9 files changed, 19 insertions(+), 19 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/groovy/blob/ad740b1f/src/main/groovy/lang/IntRange.java
----------------------------------------------------------------------
diff --git a/src/main/groovy/lang/IntRange.java b/src/main/groovy/lang/IntRange.java
index 1ca3820..9377098 100644
--- a/src/main/groovy/lang/IntRange.java
+++ b/src/main/groovy/lang/IntRange.java
@@ -194,7 +194,7 @@ public class IntRange extends AbstractList<Integer> implements Range<Integer> {
*
* @param stepSize the desired step size
* @return a new NumberRange
- * @since 2.5
+ * @since 2.5.0
*/
public <T extends Number & Comparable> NumberRange by(T stepSize) {
return new NumberRange(NumberRange.comparableNumber((Number)from), NumberRange.comparableNumber((Number)to), stepSize, inclusive);
http://git-wip-us.apache.org/repos/asf/groovy/blob/ad740b1f/src/main/groovy/lang/NumberRange.java
----------------------------------------------------------------------
diff --git a/src/main/groovy/lang/NumberRange.java b/src/main/groovy/lang/NumberRange.java
index 92c6195..52ef856 100644
--- a/src/main/groovy/lang/NumberRange.java
+++ b/src/main/groovy/lang/NumberRange.java
@@ -47,7 +47,7 @@ import static org.codehaus.groovy.runtime.dgmimpl.NumberNumberPlus.plus;
* 0..3 is deemed to be equal to 0.0..3.0 but they have different hashCode values,
* so storing a value using one of these ranges couldn't be retrieved using the other.
*
- * @since 2.5
+ * @since 2.5.0
*/
public class NumberRange extends AbstractList<Comparable> implements Range<Comparable> {
http://git-wip-us.apache.org/repos/asf/groovy/blob/ad740b1f/src/main/groovy/transform/ToString.java
----------------------------------------------------------------------
diff --git a/src/main/groovy/transform/ToString.java b/src/main/groovy/transform/ToString.java
index 9fc4627..90d4b46 100644
--- a/src/main/groovy/transform/ToString.java
+++ b/src/main/groovy/transform/ToString.java
@@ -318,7 +318,7 @@ public @interface ToString {
* methods as property getters as per the JavaBean specification. Old versions of Groovy did not.
* So set this flag to false for the old behavior or if you want to explicitly exclude such properties.
*
- * @since 2.5
+ * @since 2.5.0
*/
boolean allProperties() default true;
http://git-wip-us.apache.org/repos/asf/groovy/blob/ad740b1f/src/main/org/codehaus/groovy/runtime/DefaultGroovyMethods.java
----------------------------------------------------------------------
diff --git a/src/main/org/codehaus/groovy/runtime/DefaultGroovyMethods.java b/src/main/org/codehaus/groovy/runtime/DefaultGroovyMethods.java
index 43dbd39..36c2453 100644
--- a/src/main/org/codehaus/groovy/runtime/DefaultGroovyMethods.java
+++ b/src/main/org/codehaus/groovy/runtime/DefaultGroovyMethods.java
@@ -4621,7 +4621,7 @@ public class DefaultGroovyMethods extends DefaultGroovyMethodsSupport {
* @param self a Map to be modified
* @param condition a 1 or 2 arg Closure condition applying on the entries
* @return <tt>true</tt> if this map changed as a result of the call
- * @since 2.5
+ * @since 2.5.0
*/
public static <K, V> boolean retainAll(Map<K, V> self, @ClosureParams(MapEntryOrKeyValue.class) Closure condition) {
Iterator<Map.Entry<K, V>> iter = self.entrySet().iterator();
@@ -4684,7 +4684,7 @@ public class DefaultGroovyMethods extends DefaultGroovyMethodsSupport {
* @param self a Map to be modified
* @param condition a 1 or 2 arg Closure condition applying on the entries
* @return <tt>true</tt> if this map changed as a result of the call
- * @since 2.5
+ * @since 2.5.0
*/
public static <K, V> boolean removeAll(Map<K, V> self, @ClosureParams(MapEntryOrKeyValue.class) Closure condition) {
Iterator<Map.Entry<K, V>> iter = self.entrySet().iterator();
http://git-wip-us.apache.org/repos/asf/groovy/blob/ad740b1f/src/main/org/codehaus/groovy/runtime/EncodingGroovyMethods.java
----------------------------------------------------------------------
diff --git a/src/main/org/codehaus/groovy/runtime/EncodingGroovyMethods.java b/src/main/org/codehaus/groovy/runtime/EncodingGroovyMethods.java
index f8aeb49..62b6eeb 100644
--- a/src/main/org/codehaus/groovy/runtime/EncodingGroovyMethods.java
+++ b/src/main/org/codehaus/groovy/runtime/EncodingGroovyMethods.java
@@ -169,7 +169,7 @@ public class EncodingGroovyMethods {
* @param data Byte array to be encoded
* @return object which will write the Base64 URL and Filename Safe encoding of the byte array
* @see org.codehaus.groovy.runtime.EncodingGroovyMethods#encodeBase64Url(Byte[], boolean)
- * @since 2.5
+ * @since 2.5.0
*/
public static Writable encodeBase64Url(Byte[] data) {
return encodeBase64Url(data, false);
@@ -184,7 +184,7 @@ public class EncodingGroovyMethods {
* @param data Byte array to be encoded
* @param pad whether or not the encoded data should be padded
* @return object which will write the Base64 URL and Filename Safe encoding of the byte array
- * @since 2.5
+ * @since 2.5.0
*/
public static Writable encodeBase64Url(Byte[] data, boolean pad) {
return encodeBase64Url(DefaultTypeTransformation.convertToByteArray(data), pad);
@@ -203,7 +203,7 @@ public class EncodingGroovyMethods {
* @param data Byte array to be encoded
* @return object which will write the Base64 URL and Filename Safe encoding of the byte array
* @see org.codehaus.groovy.runtime.EncodingGroovyMethods#encodeBase64Url(byte[], boolean)
- * @since 2.5
+ * @since 2.5.0
*/
public static Writable encodeBase64Url(final byte[] data) {
return encodeBase64Url(data, false);
@@ -218,7 +218,7 @@ public class EncodingGroovyMethods {
* @param data Byte array to be encoded
* @param pad whether or not the encoded data should be padded
* @return object which will write the Base64 URL and Filename Safe encoding of the byte array
- * @since 2.5
+ * @since 2.5.0
*/
public static Writable encodeBase64Url(final byte[] data, final boolean pad) {
return encodeBase64(data, false, true, pad);
@@ -240,7 +240,7 @@ public class EncodingGroovyMethods {
*
* @param value the string to be decoded
* @return the decoded bytes as an array
- * @since 2.5
+ * @since 2.5.0
*/
public static byte[] decodeBase64Url(String value) {
return decodeBase64(value, true);
http://git-wip-us.apache.org/repos/asf/groovy/blob/ad740b1f/subprojects/groovy-json/src/main/java/groovy/json/DefaultJsonGenerator.java
----------------------------------------------------------------------
diff --git a/subprojects/groovy-json/src/main/java/groovy/json/DefaultJsonGenerator.java b/subprojects/groovy-json/src/main/java/groovy/json/DefaultJsonGenerator.java
index a3e54f8..6510d4d 100644
--- a/subprojects/groovy-json/src/main/java/groovy/json/DefaultJsonGenerator.java
+++ b/subprojects/groovy-json/src/main/java/groovy/json/DefaultJsonGenerator.java
@@ -59,7 +59,7 @@ import static groovy.json.JsonOutput.OPEN_BRACKET;
* methods.
*
* @see JsonGenerator.Options#build()
- * @since 2.5
+ * @since 2.5.0
*/
public class DefaultJsonGenerator implements JsonGenerator {
@@ -444,7 +444,7 @@ public class DefaultJsonGenerator implements JsonGenerator {
/**
* A converter that handles converting a given type using a closure.
*
- * @since 2.5
+ * @since 2.5.0
*/
protected static class ClosureConverter implements Converter {
http://git-wip-us.apache.org/repos/asf/groovy/blob/ad740b1f/subprojects/groovy-json/src/main/java/groovy/json/JsonBuilder.java
----------------------------------------------------------------------
diff --git a/subprojects/groovy-json/src/main/java/groovy/json/JsonBuilder.java b/subprojects/groovy-json/src/main/java/groovy/json/JsonBuilder.java
index abaac0b..2c53446 100644
--- a/subprojects/groovy-json/src/main/java/groovy/json/JsonBuilder.java
+++ b/subprojects/groovy-json/src/main/java/groovy/json/JsonBuilder.java
@@ -79,7 +79,7 @@ public class JsonBuilder extends GroovyObjectSupport implements Writable {
* Instantiates a JSON builder with a configured generator.
*
* @param generator used to generate the output
- * @since 2.5
+ * @since 2.5.0
*/
public JsonBuilder(JsonGenerator generator) {
this.generator = generator;
@@ -101,7 +101,7 @@ public class JsonBuilder extends GroovyObjectSupport implements Writable {
*
* @param content a pre-existing data structure
* @param generator used to generate the output
- * @since 2.5
+ * @since 2.5.0
*/
public JsonBuilder(Object content, JsonGenerator generator) {
this.content = content;
http://git-wip-us.apache.org/repos/asf/groovy/blob/ad740b1f/subprojects/groovy-json/src/main/java/groovy/json/JsonGenerator.java
----------------------------------------------------------------------
diff --git a/subprojects/groovy-json/src/main/java/groovy/json/JsonGenerator.java b/subprojects/groovy-json/src/main/java/groovy/json/JsonGenerator.java
index c5b13a3..f6b27f1 100644
--- a/subprojects/groovy-json/src/main/java/groovy/json/JsonGenerator.java
+++ b/subprojects/groovy-json/src/main/java/groovy/json/JsonGenerator.java
@@ -36,7 +36,7 @@ import java.util.TimeZone;
* The {@link Options} builder can be used to configure an instance of a JsonGenerator.
*
* @see Options#build()
- * @since 2.5
+ * @since 2.5.0
*/
public interface JsonGenerator {
@@ -69,7 +69,7 @@ public interface JsonGenerator {
/**
* Handles converting a given type.
*
- * @since 2.5
+ * @since 2.5.0
*/
interface Converter {
@@ -115,7 +115,7 @@ public interface JsonGenerator {
* assert generator.toJson(input) == '{"lastUpdated":"2014"}'
* </code></pre>
*
- * @since 2.5
+ * @since 2.5.0
*/
class Options {
http://git-wip-us.apache.org/repos/asf/groovy/blob/ad740b1f/subprojects/groovy-json/src/main/java/groovy/json/StreamingJsonBuilder.java
----------------------------------------------------------------------
diff --git a/subprojects/groovy-json/src/main/java/groovy/json/StreamingJsonBuilder.java b/subprojects/groovy-json/src/main/java/groovy/json/StreamingJsonBuilder.java
index f8c5f72..f74789b 100644
--- a/subprojects/groovy-json/src/main/java/groovy/json/StreamingJsonBuilder.java
+++ b/subprojects/groovy-json/src/main/java/groovy/json/StreamingJsonBuilder.java
@@ -90,7 +90,7 @@ public class StreamingJsonBuilder extends GroovyObjectSupport {
*
* @param writer A writer to which Json will be written
* @param generator used to generate the output
- * @since 2.5
+ * @since 2.5.0
*/
public StreamingJsonBuilder(Writer writer, JsonGenerator generator) {
this.writer = writer;
@@ -116,7 +116,7 @@ public class StreamingJsonBuilder extends GroovyObjectSupport {
* @param content a pre-existing data structure, default to null
* @param generator used to generate the output
* @throws IOException
- * @since 2.5
+ * @since 2.5.0
*/
public StreamingJsonBuilder(Writer writer, Object content, JsonGenerator generator) throws IOException {
this.writer = writer;
[4/4] groovy git commit: Minor refactoring
Posted by pa...@apache.org.
Minor refactoring
Project: http://git-wip-us.apache.org/repos/asf/groovy/repo
Commit: http://git-wip-us.apache.org/repos/asf/groovy/commit/e7639a3c
Tree: http://git-wip-us.apache.org/repos/asf/groovy/tree/e7639a3c
Diff: http://git-wip-us.apache.org/repos/asf/groovy/diff/e7639a3c
Branch: refs/heads/GROOVY_2_6_X
Commit: e7639a3cc125f2e828fe1d9017158e454431708f
Parents: ad740b1
Author: sunlan <su...@apache.org>
Authored: Sat May 27 23:16:11 2017 +0800
Committer: paulk <pa...@asert.com.au>
Committed: Thu Jun 22 19:57:41 2017 +1000
----------------------------------------------------------------------
.../apache/groovy/parser/antlr4/GroovyParser.g4 | 21 ++++++++++----------
.../apache/groovy/parser/antlr4/AstBuilder.java | 12 +++++------
2 files changed, 16 insertions(+), 17 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/groovy/blob/e7639a3c/subprojects/parser-antlr4/src/main/antlr4/org/apache/groovy/parser/antlr4/GroovyParser.g4
----------------------------------------------------------------------
diff --git a/subprojects/parser-antlr4/src/main/antlr4/org/apache/groovy/parser/antlr4/GroovyParser.g4 b/subprojects/parser-antlr4/src/main/antlr4/org/apache/groovy/parser/antlr4/GroovyParser.g4
index 972da10..d81056b 100644
--- a/subprojects/parser-antlr4/src/main/antlr4/org/apache/groovy/parser/antlr4/GroovyParser.g4
+++ b/subprojects/parser-antlr4/src/main/antlr4/org/apache/groovy/parser/antlr4/GroovyParser.g4
@@ -486,12 +486,12 @@ gstringPath
// LAMBDA EXPRESSION
-lambda
-options { baseContext = standardLambda; }
+lambdaExpression
+options { baseContext = standardLambdaExpression; }
: lambdaParameters nls ARROW nls lambdaBody
;
-standardLambda
+standardLambdaExpression
: standardLambdaParameters nls ARROW nls lambdaBody
;
@@ -730,7 +730,6 @@ finallyBlock
: FINALLY nls block
;
-
resources
: LPAREN nls resourceList sep? rparen
;
@@ -794,11 +793,6 @@ expressionInPar
: LPAREN enhancedStatementExpression rparen
;
-enhancedStatementExpression
- : statementExpression
- | standardLambda
- ;
-
expressionList[boolean canSpread]
: expressionListElement[$canSpread] (COMMA expressionListElement[$canSpread])*
;
@@ -809,6 +803,11 @@ expressionListElement[boolean canSpread]
) expression
;
+enhancedStatementExpression
+ : statementExpression
+ | standardLambdaExpression
+ ;
+
/**
* In order to resolve the syntactic ambiguities, e.g. (String)'abc' can be parsed as a cast expression or a parentheses-less method call(method name: (String), arguments: 'abc')
* try to match expression first.
@@ -1068,7 +1067,7 @@ primary
| SUPER #superPrmrAlt
| parExpression #parenPrmrAlt
| closure #closurePrmrAlt
- | lambda #lambdaPrmrAlt
+ | lambdaExpression #lambdaPrmrAlt
| list #listPrmrAlt
| map #mapPrmrAlt
| builtInType #typePrmrAlt
@@ -1174,7 +1173,7 @@ options { baseContext = enhancedArgumentListElement; }
enhancedArgumentListElement
: expressionListElement[true]
- | standardLambda
+ | standardLambdaExpression
| mapEntry
;
http://git-wip-us.apache.org/repos/asf/groovy/blob/e7639a3c/subprojects/parser-antlr4/src/main/java/org/apache/groovy/parser/antlr4/AstBuilder.java
----------------------------------------------------------------------
diff --git a/subprojects/parser-antlr4/src/main/java/org/apache/groovy/parser/antlr4/AstBuilder.java b/subprojects/parser-antlr4/src/main/java/org/apache/groovy/parser/antlr4/AstBuilder.java
index c8d8eae..037b949 100644
--- a/subprojects/parser-antlr4/src/main/java/org/apache/groovy/parser/antlr4/AstBuilder.java
+++ b/subprojects/parser-antlr4/src/main/java/org/apache/groovy/parser/antlr4/AstBuilder.java
@@ -1875,8 +1875,8 @@ public class AstBuilder extends GroovyParserBaseVisitor<Object> implements Groov
if (asBoolean(ctx.statementExpression())) {
expression = ((ExpressionStatement) this.visit(ctx.statementExpression())).getExpression();
- } else if (asBoolean(ctx.standardLambda())) {
- expression = this.visitStandardLambda(ctx.standardLambda());
+ } else if (asBoolean(ctx.standardLambdaExpression())) {
+ expression = this.visitStandardLambdaExpression(ctx.standardLambdaExpression());
} else {
throw createParsingFailedException("Unsupported enhanced statement expression: " + ctx.getText(), ctx);
}
@@ -2269,8 +2269,8 @@ public class AstBuilder extends GroovyParserBaseVisitor<Object> implements Groov
return this.configureAST(this.visitExpressionListElement(ctx.expressionListElement()), ctx);
}
- if (asBoolean(ctx.standardLambda())) {
- return this.configureAST(this.visitStandardLambda(ctx.standardLambda()), ctx);
+ if (asBoolean(ctx.standardLambdaExpression())) {
+ return this.configureAST(this.visitStandardLambdaExpression(ctx.standardLambdaExpression()), ctx);
}
if (asBoolean(ctx.mapEntry())) {
@@ -2716,7 +2716,7 @@ public class AstBuilder extends GroovyParserBaseVisitor<Object> implements Groov
@Override
public ClosureExpression visitLambdaPrmrAlt(LambdaPrmrAltContext ctx) {
- return this.configureAST(this.visitStandardLambda(ctx.standardLambda()), ctx);
+ return this.configureAST(this.visitStandardLambdaExpression(ctx.standardLambdaExpression()), ctx);
}
@Override
@@ -3201,7 +3201,7 @@ public class AstBuilder extends GroovyParserBaseVisitor<Object> implements Groov
// } gstring --------------------------------------------------------------------
@Override
- public LambdaExpression visitStandardLambda(StandardLambdaContext ctx) {
+ public LambdaExpression visitStandardLambdaExpression(StandardLambdaExpressionContext ctx) {
return this.configureAST(this.createLambda(ctx.standardLambdaParameters(), ctx.lambdaBody()), ctx);
}
[2/4] groovy git commit: some build fixes for Gradle 4.0
Posted by pa...@apache.org.
some build fixes for Gradle 4.0
Project: http://git-wip-us.apache.org/repos/asf/groovy/repo
Commit: http://git-wip-us.apache.org/repos/asf/groovy/commit/164330e1
Tree: http://git-wip-us.apache.org/repos/asf/groovy/tree/164330e1
Diff: http://git-wip-us.apache.org/repos/asf/groovy/diff/164330e1
Branch: refs/heads/GROOVY_2_6_X
Commit: 164330e154dd6a99fd2c2273b2a9325606487c74
Parents: eeba382
Author: paulk <pa...@asert.com.au>
Authored: Sun Jun 18 22:28:21 2017 +1000
Committer: paulk <pa...@asert.com.au>
Committed: Thu Jun 22 19:04:58 2017 +1000
----------------------------------------------------------------------
build.gradle | 10 +++++-----
.../groovy/gradle/WriteExtensionDescriptorTask.groovy | 2 +-
gradle/docs.gradle | 5 +++--
.../org/codehaus/groovy/ant/GroovycTest.xml | 2 +-
.../org/codehaus/groovy/ant/GroovycTest1.groovy | 2 +-
.../test/groovy/org/codehaus/groovy/ant/GroovycTest.java | 2 +-
subprojects/groovy-groovydoc/build.gradle | 2 +-
.../src/test/resources/groovydoc/groovyDocTests.xml | 5 +++--
8 files changed, 16 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/groovy/blob/164330e1/build.gradle
----------------------------------------------------------------------
diff --git a/build.gradle b/build.gradle
index cf46ba5..c70eb6e 100644
--- a/build.gradle
+++ b/build.gradle
@@ -338,14 +338,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
}
}
tasks.withType(Jar) {
doFirst {
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)
}
@@ -386,8 +386,8 @@ apply from: 'gradle/wrapper.gradle'
task dgmConverter(dependsOn:compileJava) {
description = 'Generates DGM info file required for faster startup.'
- def classesDir = sourceSets.main.output.classesDir
- def classpath = files(classesDir, configurations.compile)
+ def classesDir = sourceSets.main.java.outputDir
+ def classpath = files(sourceSets.main.output.classesDirs, configurations.compile)
//main = 'org.codehaus.groovy.tools.DgmConverter'
//args = ['--info', classesDir.absolutePath]
@@ -427,7 +427,7 @@ task bootstrapJar {
destinationDir.mkdirs()
ant.jar(
destfile: archivePath,
- basedir: file(sourceSets.main.output.classesDir)
+ basedir: file(sourceSets.main.java.outputDir)
)
}
inputs.property('indy', useIndy())
http://git-wip-us.apache.org/repos/asf/groovy/blob/164330e1/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 a5e716f..679b083 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}/classes/main/META-INF/services")
+ def metaInfDir = new File("${project.buildDir}/resources/main/META-INF/services")
return new File(metaInfDir, "org.codehaus.groovy.runtime.ExtensionModule")
}
http://git-wip-us.apache.org/repos/asf/groovy/blob/164330e1/gradle/docs.gradle
----------------------------------------------------------------------
diff --git a/gradle/docs.gradle b/gradle/docs.gradle
index 15c3134..90fbe55 100644
--- a/gradle/docs.gradle
+++ b/gradle/docs.gradle
@@ -111,7 +111,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').buildDir}/classes/main")
+ destinationDir = file("${project(':groovy-docgenerator').sourceSets.main.java.outputDir}")
into('META-INF') {
from('src/main/META-INF/groovy-release-info.properties') {
filter(rootProject.propertiesFilter, org.apache.tools.ant.filters.ReplaceTokens)
@@ -129,13 +129,14 @@ 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).asPath,
+ classpath: (sourceSets.main.runtimeClasspath + configurations.tools + groovydocAll.groovyClasspath + docGeneratorPath).asPath,
errorproperty: 'edr',
outputproperty: 'odr') {
arg(value: '-title')
http://git-wip-us.apache.org/repos/asf/groovy/blob/164330e1/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 5e2afba..05e33f4 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/test"/>
+ <property name="destPath" value="${user.dir}/target/classes/groovy/test"/>
<property name="javaVersion" value="6"/>
http://git-wip-us.apache.org/repos/asf/groovy/blob/164330e1/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 a0694ab..32e73ac 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/test/org/codehaus/groovy/ant/GroovycTest1_Result.txt' ) ).write ( 'OK.' )
+ ( new File ( 'target/classes/groovy/test/org/codehaus/groovy/ant/GroovycTest1_Result.txt' ) ).write ( 'OK.' )
}
}
http://git-wip-us.apache.org/repos/asf/groovy/blob/164330e1/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 8dae0aa..81e0253 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/test/org/codehaus/groovy/ant/";
+ private final String classDirectory = "target/classes/groovy/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/164330e1/subprojects/groovy-groovydoc/build.gradle
----------------------------------------------------------------------
diff --git a/subprojects/groovy-groovydoc/build.gradle b/subprojects/groovy-groovydoc/build.gradle
index 421bfb7..6dda7b6 100644
--- a/subprojects/groovy-groovydoc/build.gradle
+++ b/subprojects/groovy-groovydoc/build.gradle
@@ -27,6 +27,6 @@ dependencies {
compileJava {
doLast {
- mkdir "$sourceSets.main.output.classesDir/META-INF"
+ mkdir "$sourceSets.main.java.outputDir/META-INF"
}
}
http://git-wip-us.apache.org/repos/asf/groovy/blob/164330e1/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 d1aa402..7c76e1b 100644
--- a/subprojects/groovy-groovydoc/src/test/resources/groovydoc/groovyDocTests.xml
+++ b/subprojects/groovy-groovydoc/src/test/resources/groovydoc/groovyDocTests.xml
@@ -24,8 +24,9 @@
<property name="tmpdir" value="${java.io.tmpdir}/${user.name}/${ant.project.name}"/>
<path id="classpath">
- <fileset dir="target/classes/main" includes="**/*.*"/>
- <fileset dir="target/classes/test" includes="**/*.*"/>
+ <fileset dir="target/classes/java/main" includes="**/*.*"/>
+ <fileset dir="target/classes/groovy/main" includes="**/*.*"/>
+ <fileset dir="target/classes/groovy/test" includes="**/*.*"/>
</path>
<taskdef name="groovydoc" classpathref="classpath"