date:20190519

[groovy] branch master updated: no longer needed since all java files are in src/main/java now

2019-05-19 Thread paulk

This is an automated email from the ASF dual-hosted git repository.

paulk pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/groovy.git


The following commit(s) were added to refs/heads/master by this push:
 new 1153475  no longer needed since all java files are in src/main/java now
1153475 is described below

commit 1153475589cc73e8d687b8fe0889b37d7edaa131
Author: Paul King 
AuthorDate: Mon May 20 06:55:41 2019 +1000

no longer needed since all java files are in src/main/java now
---
 build.gradle | 2 --
 1 file changed, 2 deletions(-)

diff --git a/build.gradle b/build.gradle
index 70835eb..9cd26df 100644
--- a/build.gradle
+++ b/build.gradle
@@ -229,8 +229,6 @@ ext.generatedDirectory = "${buildDir}/generated/sources"
 sourceSets {
 main {
 java {
-// the only reason we add src/main/groovy here is for the 
bootstrap compiler
-srcDir 'src/main/groovy'
 srcDir "$generatedDirectory/antlr2/src/main"
 if (!JavaVersion.current().isJava8Compatible()) {
 exclude '**/v8/*'

[groovy-website] branch asf-site updated: typo

2019-05-19 Thread paulk

This is an automated email from the ASF dual-hosted git repository.

paulk pushed a commit to branch asf-site
in repository https://gitbox.apache.org/repos/asf/groovy-website.git


The following commit(s) were added to refs/heads/asf-site by this push:
 new 4109e50  typo
4109e50 is described below

commit 4109e50368c0ea30b9535b53b05d99a14dd4cbf1
Author: Paul King 
AuthorDate: Sun May 19 23:33:39 2019 +1000

typo
---
 site/src/site/releasenotes/groovy-3.0.adoc | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/site/src/site/releasenotes/groovy-3.0.adoc 
b/site/src/site/releasenotes/groovy-3.0.adoc
index 04144db..a000140 100644
--- a/site/src/site/releasenotes/groovy-3.0.adoc
+++ b/site/src/site/releasenotes/groovy-3.0.adoc
@@ -555,7 +555,7 @@ You should not mix and match old and new classes.
 | org.codehaus.groovy.binding
 | org.apache.groovy.swing.binding
 .3+| You can continue to use the old classes if you use them in your existing 
code or from within legacy classes still
-using the old classes. `SwingBuilder` now uses the bew classes.
+using the old classes. `SwingBuilder` now uses the new classes.
 | groovy.model
 | groovy.swing.model
 | groovy.inspect.swingui
@@ -669,8 +669,7 @@ As part of implementing the new grammar, additional support 
has been added.
 
 == JDK requirements
 
-Groovy 3.0 requires JDK9+ to build and JDK8 is the minimum version of the JRE 
that we support. As additional Java 9/10 support is added, the version
-required to build may be bumped to JDK9.
+Groovy 3.0 requires JDK9+ to build and JDK8 is the minimum version of the JRE 
that we support.
 
 [[Groovy3.0releasenotes-Moreinformation]]
 == More information

[groovy] branch master updated: Validate parameter types of method reference(class::instanceMethod)(closes #930)

2019-05-19 Thread sunlan

This is an automated email from the ASF dual-hosted git repository.

sunlan pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/groovy.git


The following commit(s) were added to refs/heads/master by this push:
 new 11c6aab  Validate parameter types of method 
reference(class::instanceMethod)(closes #930)
11c6aab is described below

commit 11c6aaba3a8f2ab4bfbececf7af21e733bf71ae8
Author: Daniel Sun 
AuthorDate: Sun May 19 21:10:06 2019 +0800

Validate parameter types of method reference(class::instanceMethod)(closes 
#930)
---
 ...StaticTypesMethodReferenceExpressionWriter.java | 34 +++---
 .../transform/stc/MethodReferenceTest.groovy   | 18 
 2 files changed, 35 insertions(+), 17 deletions(-)

diff --git 
a/src/main/java/org/codehaus/groovy/classgen/asm/sc/StaticTypesMethodReferenceExpressionWriter.java
 
b/src/main/java/org/codehaus/groovy/classgen/asm/sc/StaticTypesMethodReferenceExpressionWriter.java
index 1fe3772..a89e7a3 100644
--- 
a/src/main/java/org/codehaus/groovy/classgen/asm/sc/StaticTypesMethodReferenceExpressionWriter.java
+++ 
b/src/main/java/org/codehaus/groovy/classgen/asm/sc/StaticTypesMethodReferenceExpressionWriter.java
@@ -240,28 +240,28 @@ public class StaticTypesMethodReferenceExpressionWriter 
extends MethodReferenceE
 
 List candidates = new LinkedList<>();
 for (MethodNode mn : filterMethodsByVisibility(methodNodeList, 
classNode)) {
-if (mn.isStatic()) {
-if 
(ParameterUtils.parametersCompatible(abstractMethodParameters, 
mn.getParameters())) {
-candidates.add(mn);
-}
-} else {
+Parameter[] parameters = abstractMethodParameters;
+if (!mn.isStatic() && isClassExpr(typeOrTargetRef)) { // 
class::instanceMethod
 if (0 == abstractMethodParameters.length) {
-break;
+continue;
 }
 
-Parameter[] parameters;
-if (isClassExpr(typeOrTargetRef)) {
-parameters =
-new 
ArrayList<>(Arrays.asList(abstractMethodParameters))
-.subList(1, 
abstractMethodParameters.length)
-.toArray(Parameter.EMPTY_ARRAY);
-} else {
-parameters = abstractMethodParameters;
+Parameter firstParameter = abstractMethodParameters[0];
+Class typeOrTargetClass = 
typeOrTargetRef.getType().getTypeClass();
+Class firstParameterClass = 
firstParameter.getType().getTypeClass();
+if (!typeOrTargetClass.isAssignableFrom(firstParameterClass)) {
+continue;
 }
 
-if (ParameterUtils.parametersCompatible(parameters, 
mn.getParameters())) {
-candidates.add(mn);
-}
+parameters =
+new 
ArrayList<>(Arrays.asList(abstractMethodParameters))
+.subList(1, abstractMethodParameters.length)
+.toArray(Parameter.EMPTY_ARRAY);
+
+}
+
+if (ParameterUtils.parametersCompatible(parameters, 
mn.getParameters())) {
+candidates.add(mn);
 }
 }
 
diff --git a/src/test/groovy/transform/stc/MethodReferenceTest.groovy 
b/src/test/groovy/transform/stc/MethodReferenceTest.groovy
index 1680ea4..0fe07ca 100644
--- a/src/test/groovy/transform/stc/MethodReferenceTest.groovy
+++ b/src/test/groovy/transform/stc/MethodReferenceTest.groovy
@@ -395,4 +395,22 @@ class MethodReferenceTest extends GroovyTestCase {
 
 assert errMsg.contains('Failed to find the expected 
method[addx(java.math.BigDecimal,java.math.BigDecimal)] in the 
type[java.math.BigDecimal]')
 }
+
+// class::instanceMethod
+void testFunctionCI_WRONGTYPE() {
+def errMsg = shouldFail '''
+import java.util.stream.Collectors
+
+@groovy.transform.CompileStatic
+void p() {
+def result = [1, 2, 
3].stream().map(String::toString).collect(Collectors.toList())
+assert 3 == result.size()
+assert ['1', '2', '3'] == result
+}
+
+p()
+'''
+
+assert errMsg.contains('Failed to find the expected 
method[toString(java.lang.Integer)] in the type[java.lang.String]')
+}
 }

[groovy] branch master updated (a0971cc -> 86f5c82)

2019-05-19 Thread paulk

This is an automated email from the ASF dual-hosted git repository.

paulk pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/groovy.git.


from a0971cc  GROOVY-8647: Split package renaming (a few remaining 
deprecations)
 new 3c1d895  GROOVY-8647: Split package renaming (fix a broken link)
 new 86f5c82  move some java files from src/main/groovy to src/main/java 
and fix up some Javadoc assertion tests that weren't running

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 gradle/test.gradle |  2 +-
 src/main/{groovy => java}/groovy/beans/Bindable.java   |  0
 .../groovy/beans/BindableASTTransformation.java|  0
 .../{groovy => java}/groovy/beans/DefaultPropertyAccessor.java |  0
 .../{groovy => java}/groovy/beans/DefaultPropertyReader.java   |  0
 .../{groovy => java}/groovy/beans/DefaultPropertyWriter.java   |  0
 src/main/{groovy => java}/groovy/beans/PropertyAccessor.java   |  0
 src/main/{groovy => java}/groovy/beans/PropertyReader.java |  0
 src/main/{groovy => java}/groovy/beans/PropertyWriter.java |  0
 src/main/{groovy => java}/groovy/beans/Vetoable.java   |  0
 .../groovy/beans/VetoableASTTransformation.java|  0
 src/main/{groovy => java}/groovy/cli/Option.java   |  0
 src/main/{groovy => java}/groovy/cli/TypedOption.java  |  0
 src/main/{groovy => java}/groovy/cli/Unparsed.java |  0
 .../groovy/grape/GrabAnnotationTransformation.java |  0
 src/main/{groovy => java}/groovy/grape/Grape.java  |  0
 src/main/{groovy => java}/groovy/grape/GrapeEngine.java|  0
 src/main/{groovy => java}/groovy/inspect/Inspector.java|  0
 src/main/{groovy => java}/groovy/inspect/package.html  |  0
 .../groovy/io/EncodingAwareBufferedWriter.java |  0
 src/main/{groovy => java}/groovy/io/FileType.java  |  0
 src/main/{groovy => java}/groovy/io/FileVisitResult.java   |  0
 src/main/{groovy => java}/groovy/io/GroovyPrintStream.java |  0
 src/main/{groovy => java}/groovy/io/GroovyPrintWriter.java |  0
 src/main/{groovy => java}/groovy/io/LineColumnReader.java  |  0
 src/main/{groovy => java}/groovy/io/PlatformLineWriter.java|  0
 src/main/{groovy => java}/groovy/io/package.html   |  0
 src/main/{groovy => java}/groovy/lang/AdaptingMetaClass.java   |  0
 .../{groovy => java}/groovy/lang/BenchmarkInterceptor.java |  0
 src/main/{groovy => java}/groovy/lang/Binding.java |  0
 src/main/{groovy => java}/groovy/lang/Buildable.java   |  0
 src/main/{groovy => java}/groovy/lang/Category.java|  0
 src/main/{groovy => java}/groovy/lang/Closure.java |  2 +-
 src/main/{groovy => java}/groovy/lang/ClosureException.java|  0
 .../{groovy => java}/groovy/lang/ClosureInvokingMethod.java|  0
 src/main/{groovy => java}/groovy/lang/Delegate.java|  0
 src/main/{groovy => java}/groovy/lang/DelegatesTo.java |  0
 src/main/{groovy => java}/groovy/lang/DelegatingMetaClass.java |  0
 .../{groovy => java}/groovy/lang/DeprecationException.java |  0
 src/main/{groovy => java}/groovy/lang/EmptyRange.java  |  0
 src/main/{groovy => java}/groovy/lang/ExpandoMetaClass.java|  0
 .../groovy/lang/ExpandoMetaClassCreationHandle.java|  0
 src/main/{groovy => java}/groovy/lang/GString.java |  0
 .../{groovy => java}/groovy/lang/GeneratedGroovyProxy.java |  0
 src/main/{groovy => java}/groovy/lang/Grab.java|  0
 src/main/{groovy => java}/groovy/lang/GrabConfig.java  |  0
 src/main/{groovy => java}/groovy/lang/GrabExclude.java |  0
 src/main/{groovy => java}/groovy/lang/GrabResolver.java|  0
 src/main/{groovy => java}/groovy/lang/Grapes.java  |  0
 src/main/{groovy => java}/groovy/lang/GroovyCallable.java  |  0
 src/main/{groovy => java}/groovy/lang/GroovyClassLoader.java   |  0
 src/main/{groovy => java}/groovy/lang/GroovyCodeSource.java|  0
 src/main/{groovy => java}/groovy/lang/GroovyInterceptable.java |  0
 src/main/{groovy => java}/groovy/lang/GroovyObject.java|  0
 src/main/{groovy => java}/groovy/lang/GroovyObjectSupport.java |  0
 .../{groovy => java}/groovy/lang/GroovyResourceLoader.java |  0
 .../{groovy => java}/groovy/lang/GroovyRuntimeException.java   |  0
 src/main/{groovy => java}/groovy/lang/GroovyShell.java |  0
 src/main/{groovy => java}/groovy/lang/GroovySystem.java|  0
 src/main/{groovy => java}/groovy/lang/Groovydoc.java   |  0
 .../groovy/lang/IllegalPropertyAccessException.java|  0
 .../groovy/lang/IncorrectClosureArgumentsException.java

[groovy] 02/02: move some java files from src/main/groovy to src/main/java and fix up some Javadoc assertion tests that weren't running

2019-05-19 Thread paulk

This is an automated email from the ASF dual-hosted git repository.

paulk pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/groovy.git

commit 86f5c8216b5d0f042408bdc4ae5d6a7baa247c95
Author: Paul King 
AuthorDate: Sun May 19 19:04:42 2019 +1000

move some java files from src/main/groovy to src/main/java and fix up some 
Javadoc assertion tests that weren't running
---
 gradle/test.gradle |  2 +-
 src/main/{groovy => java}/groovy/beans/Bindable.java   |  0
 .../groovy/beans/BindableASTTransformation.java|  0
 .../{groovy => java}/groovy/beans/DefaultPropertyAccessor.java |  0
 .../{groovy => java}/groovy/beans/DefaultPropertyReader.java   |  0
 .../{groovy => java}/groovy/beans/DefaultPropertyWriter.java   |  0
 src/main/{groovy => java}/groovy/beans/PropertyAccessor.java   |  0
 src/main/{groovy => java}/groovy/beans/PropertyReader.java |  0
 src/main/{groovy => java}/groovy/beans/PropertyWriter.java |  0
 src/main/{groovy => java}/groovy/beans/Vetoable.java   |  0
 .../groovy/beans/VetoableASTTransformation.java|  0
 src/main/{groovy => java}/groovy/cli/Option.java   |  0
 src/main/{groovy => java}/groovy/cli/TypedOption.java  |  0
 src/main/{groovy => java}/groovy/cli/Unparsed.java |  0
 .../groovy/grape/GrabAnnotationTransformation.java |  0
 src/main/{groovy => java}/groovy/grape/Grape.java  |  0
 src/main/{groovy => java}/groovy/grape/GrapeEngine.java|  0
 src/main/{groovy => java}/groovy/inspect/Inspector.java|  0
 src/main/{groovy => java}/groovy/inspect/package.html  |  0
 .../groovy/io/EncodingAwareBufferedWriter.java |  0
 src/main/{groovy => java}/groovy/io/FileType.java  |  0
 src/main/{groovy => java}/groovy/io/FileVisitResult.java   |  0
 src/main/{groovy => java}/groovy/io/GroovyPrintStream.java |  0
 src/main/{groovy => java}/groovy/io/GroovyPrintWriter.java |  0
 src/main/{groovy => java}/groovy/io/LineColumnReader.java  |  0
 src/main/{groovy => java}/groovy/io/PlatformLineWriter.java|  0
 src/main/{groovy => java}/groovy/io/package.html   |  0
 src/main/{groovy => java}/groovy/lang/AdaptingMetaClass.java   |  0
 .../{groovy => java}/groovy/lang/BenchmarkInterceptor.java |  0
 src/main/{groovy => java}/groovy/lang/Binding.java |  0
 src/main/{groovy => java}/groovy/lang/Buildable.java   |  0
 src/main/{groovy => java}/groovy/lang/Category.java|  0
 src/main/{groovy => java}/groovy/lang/Closure.java |  2 +-
 src/main/{groovy => java}/groovy/lang/ClosureException.java|  0
 .../{groovy => java}/groovy/lang/ClosureInvokingMethod.java|  0
 src/main/{groovy => java}/groovy/lang/Delegate.java|  0
 src/main/{groovy => java}/groovy/lang/DelegatesTo.java |  0
 src/main/{groovy => java}/groovy/lang/DelegatingMetaClass.java |  0
 .../{groovy => java}/groovy/lang/DeprecationException.java |  0
 src/main/{groovy => java}/groovy/lang/EmptyRange.java  |  0
 src/main/{groovy => java}/groovy/lang/ExpandoMetaClass.java|  0
 .../groovy/lang/ExpandoMetaClassCreationHandle.java|  0
 src/main/{groovy => java}/groovy/lang/GString.java |  0
 .../{groovy => java}/groovy/lang/GeneratedGroovyProxy.java |  0
 src/main/{groovy => java}/groovy/lang/Grab.java|  0
 src/main/{groovy => java}/groovy/lang/GrabConfig.java  |  0
 src/main/{groovy => java}/groovy/lang/GrabExclude.java |  0
 src/main/{groovy => java}/groovy/lang/GrabResolver.java|  0
 src/main/{groovy => java}/groovy/lang/Grapes.java  |  0
 src/main/{groovy => java}/groovy/lang/GroovyCallable.java  |  0
 src/main/{groovy => java}/groovy/lang/GroovyClassLoader.java   |  0
 src/main/{groovy => java}/groovy/lang/GroovyCodeSource.java|  0
 src/main/{groovy => java}/groovy/lang/GroovyInterceptable.java |  0
 src/main/{groovy => java}/groovy/lang/GroovyObject.java|  0
 src/main/{groovy => java}/groovy/lang/GroovyObjectSupport.java |  0
 .../{groovy => java}/groovy/lang/GroovyResourceLoader.java |  0
 .../{groovy => java}/groovy/lang/GroovyRuntimeException.java   |  0
 src/main/{groovy => java}/groovy/lang/GroovyShell.java |  0
 src/main/{groovy => java}/groovy/lang/GroovySystem.java|  0
 src/main/{groovy => java}/groovy/lang/Groovydoc.java   |  0
 .../groovy/lang/IllegalPropertyAccessException.java|  0
 .../groovy/lang/IncorrectClosureArgumentsException.java|  0
 src/main/{groovy => java}/groovy/lang/IntRange.java|  0
 src/main/{groovy => java}/groovy/lang/Interceptor.java |  0
 src/main/{groovy => java}/groovy/lang/Lazy.java|  0
 src/main/{groovy => java}/groovy/lang/ListWithDefault.java |  0
 src/main/{groovy =>

[groovy] 01/02: GROOVY-8647: Split package renaming (fix a broken link)

2019-05-19 Thread paulk

This is an automated email from the ASF dual-hosted git repository.

paulk pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/groovy.git

commit 3c1d89556a82e2c0dce05c1f4536f6c167d6b7ca
Author: Paul King 
AuthorDate: Sun May 19 15:08:04 2019 +1000

GROOVY-8647: Split package renaming (fix a broken link)
---
 .../groovy-test/src/main/java/groovy/transform/NotYetImplemented.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git 
a/subprojects/groovy-test/src/main/java/groovy/transform/NotYetImplemented.java 
b/subprojects/groovy-test/src/main/java/groovy/transform/NotYetImplemented.java
index 986ef99..0f9ddf3 100644
--- 
a/subprojects/groovy-test/src/main/java/groovy/transform/NotYetImplemented.java
+++ 
b/subprojects/groovy-test/src/main/java/groovy/transform/NotYetImplemented.java
@@ -36,7 +36,7 @@ import java.lang.annotation.Target;
  * The idea for this AST transformation originated in {@link 
groovy.test.GroovyTestCase#notYetImplemented()}.
  *
  * @since 2.0.0
- * @deprecated use {@link groovy.test.transform.NotYetImplemented}
+ * @deprecated use {@link groovy.test.NotYetImplemented}
  */
 @Deprecated
 @java.lang.annotation.Documented

[groovy] branch master updated: no longer needed since all java files are in src/main/java now

[groovy-website] branch asf-site updated: typo

[groovy] branch master updated: Validate parameter types of method reference(class::instanceMethod)(closes #930)

[groovy] branch master updated (a0971cc -> 86f5c82)

[groovy] 02/02: move some java files from src/main/groovy to src/main/java and fix up some Javadoc assertion tests that weren't running

[groovy] 01/02: GROOVY-8647: Split package renaming (fix a broken link)

6 matches

Site Navigation

Mail list logo

Footer information