Skip to content

Commit

Permalink
Update the Groovy plug-in to 3.0.5
Browse files Browse the repository at this point in the history
  • Loading branch information
eric-milles committed Jul 23, 2020
1 parent 48b10a8 commit 7dfee0b
Show file tree
Hide file tree
Showing 58 changed files with 3,454 additions and 7,874 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -1057,8 +1057,7 @@ public void testDGMDeclaring4() {
@Test // https://github.com/groovy/groovy-eclipse/issues/1002
public void testDGMDeclaring5() {
String contents = "new StringBuilder().size()";
String vmplugin = isAtLeastGroovy(30) ? "8" : "5";
assertDeclType(contents, "size", "org.codehaus.groovy.vmplugin.v" + vmplugin + ".PluginDefaultGroovyMethods");
assertDeclType(contents, "size", isAtLeastGroovy(30) ? "org.codehaus.groovy.runtime.StringGroovyMethods" : "org.codehaus.groovy.vmplugin.v5.PluginDefaultGroovyMethods");
}

@Test // https://github.com/groovy/groovy-eclipse/issues/1002
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ protected String[] getDefaultClassPaths() {
System.arraycopy(cps, 0, newcps, 0, cps.length);

String[] ivyVersions = {"2.5.0", "2.4.0"};
String[] groovyVersions = {"3.0.4-indy", "2.5.13-indy", "2.4.20"};
String[] groovyVersions = {"3.0.5-indy", "2.5.13-indy", "2.4.20"};
try {
URL groovyJar = null;
for (String groovyVer : groovyVersions) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4151,8 +4151,6 @@ public void testReferencingFields_DirectAccess6() {

if (!"private".equals(modifier)) {
runConformTest(sources, "A");
} else if (isAtLeastGroovy(30)) {
runConformTest(sources, "C"); // MetaClassImpl.getAttribute(Class,Object,String,boolean) drops super
} else {
runConformTest(sources, "", "groovy.lang.MissingFieldException: No such field: field for class: A");
}
Expand Down Expand Up @@ -4185,8 +4183,6 @@ public void testReferencingFields_DirectAccess7() {

if (!"private".equals(modifier)) {
runConformTest(sources, "x");
} else if (isAtLeastGroovy(30)) {
runConformTest(sources, "", "groovy.lang.MissingFieldException: No such field: field for class: C"); // GROOVY-8999
} else {
runConformTest(sources, "", "groovy.lang.MissingFieldException: No such field: field for class: A");
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1330,12 +1330,16 @@ public void testCompileStatic7996() {
};
//@formatter:on

String strategyOne = isAtLeastGroovy(30) ? "OWNER_FIRST" : "0";
String strategyTwo = isAtLeastGroovy(30) ? "DELEGATE_FIRST" : "1";

runNegativeTest(sources,
"----------\n" +
"1. WARNING in Foo.groovy (at line 4)\n" +
"\treturn this.with(block)\n" +
"\t ^^^^^\n" +
"Groovy:[Static type checking] - Closure parameter with resolve strategy 0 passed to method with resolve strategy 1\n" +
"Groovy:[Static type checking] - Closure parameter with resolve strategy " +
strategyOne + " passed to method with resolve strategy " + strategyTwo + "\n" +
"----------\n");
}

Expand Down
8 changes: 0 additions & 8 deletions base/org.codehaus.groovy30/.checkstyle
Original file line number Diff line number Diff line change
Expand Up @@ -41,17 +41,12 @@
<file-match-pattern match-pattern="groovy/ast/tools/ExpressionUtils.java" include-pattern="false" />
<file-match-pattern match-pattern="groovy/ast/tools/GenericsUtils.java" include-pattern="false" />
<file-match-pattern match-pattern="groovy/classgen/AnnotationVisitor.java" include-pattern="false" />
<file-match-pattern match-pattern="groovy/classgen/AsmClassGenerator.java" include-pattern="false" />
<file-match-pattern match-pattern="groovy/classgen/EnumVisitor.java" include-pattern="false" />
<file-match-pattern match-pattern="groovy/classgen/ExtendedVerifier.java" include-pattern="false" />
<file-match-pattern match-pattern="groovy/classgen/InnerClassVisitor.java" include-pattern="false" />
<file-match-pattern match-pattern="groovy/classgen/VariableScopeVisitor.java" include-pattern="false" />
<file-match-pattern match-pattern="groovy/classgen/Verifier.java" include-pattern="false" />
<file-match-pattern match-pattern="groovy/classgen/asm/BinaryExpressionHelper.java" include-pattern="false" />
<file-match-pattern match-pattern="groovy/classgen/asm/sc/StaticInvocationWriter.java" include-pattern="false" />
<file-match-pattern match-pattern="groovy/classgen/asm/sc/StaticPropertyAccessHelper.java" include-pattern="false" />
<file-match-pattern match-pattern="groovy/classgen/asm/sc/StaticTypesCallSiteWriter.java" include-pattern="false" />
<file-match-pattern match-pattern="groovy/classgen/asm/sc/StaticTypesTypeChooser.java" include-pattern="false" />
<file-match-pattern match-pattern="groovy/control/CompilationUnit.java" include-pattern="false" />
<file-match-pattern match-pattern="groovy/control/CompilerConfiguration.java" include-pattern="false" />
<file-match-pattern match-pattern="groovy/control/ErrorCollector.java" include-pattern="false" />
Expand All @@ -65,13 +60,10 @@
<file-match-pattern match-pattern="groovy/transform/ASTTransformationCollectorCodeVisitor.java" include-pattern="false" />
<file-match-pattern match-pattern="groovy/transform/ASTTransformationVisitor.java" include-pattern="false" />
<file-match-pattern match-pattern="groovy/transform/FieldASTTransformation.java" include-pattern="false" />
<file-match-pattern match-pattern="groovy/transform/LazyASTTransformation.java" include-pattern="false" />
<file-match-pattern match-pattern="groovy/transform/LogASTTransformation.java" include-pattern="false" />
<file-match-pattern match-pattern="groovy/transform/sc/StaticCompilationVisitor.java" include-pattern="false" />
<file-match-pattern match-pattern="groovy/transform/sc/transformers/BinaryExpressionTransformer.java" include-pattern="false" />
<file-match-pattern match-pattern="groovy/transform/sc/transformers/ConstructorCallTransformer.java" include-pattern="false" />
<file-match-pattern match-pattern="groovy/transform/sc/transformers/MethodCallExpressionTransformer.java" include-pattern="false" />
<file-match-pattern match-pattern="groovy/transform/sc/transformers/VariableExpressionTransformer.java" include-pattern="false" />
<file-match-pattern match-pattern="groovy/transform/stc/AbstractExtensionMethodCache.java" include-pattern="false" />
<file-match-pattern match-pattern="groovy/transform/stc/StaticTypeCheckingVisitor.java" include-pattern="false" />
<file-match-pattern match-pattern="groovy/transform/trait/SuperCallTraitTransformer.java" include-pattern="false" />
Expand Down
8 changes: 4 additions & 4 deletions base/org.codehaus.groovy30/.classpath
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,14 @@
<attribute name="javadoc_location" value="jar:platform:/resource/org.codehaus.groovy30/lib/ivy-2.5.0-javadoc.jar!/" />
</attributes>
</classpathentry>
<classpathentry kind="lib" path="lib/groovy-3.0.4-indy.jar" sourcepath="lib/groovy-3.0.4-sources.jar" exported="true">
<classpathentry kind="lib" path="lib/groovy-3.0.5-indy.jar" sourcepath="lib/groovy-3.0.5-sources.jar" exported="true">
<attributes>
<attribute name="javadoc_location" value="jar:platform:/resource/org.codehaus.groovy30/lib/groovy-3.0.4-javadoc.jar!/" />
<attribute name="javadoc_location" value="jar:platform:/resource/org.codehaus.groovy30/lib/groovy-3.0.5-javadoc.jar!/" />
</attributes>
</classpathentry>
<classpathentry kind="lib" path="lib/groovy-test-3.0.4-indy.jar" sourcepath="lib/groovy-test-3.0.4-sources.jar" exported="true">
<classpathentry kind="lib" path="lib/groovy-test-3.0.5-indy.jar" sourcepath="lib/groovy-test-3.0.5-sources.jar" exported="true">
<attributes>
<attribute name="javadoc_location" value="jar:platform:/resource/org.codehaus.groovy30/lib/groovy-test-3.0.4-javadoc.jar!/" />
<attribute name="javadoc_location" value="jar:platform:/resource/org.codehaus.groovy30/lib/groovy-test-3.0.5-javadoc.jar!/" />
</attributes>
</classpathentry>

Expand Down
178 changes: 89 additions & 89 deletions base/org.codehaus.groovy30/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
Expand Up @@ -4,100 +4,100 @@ Bundle-SymbolicName: org.codehaus.groovy
Automatic-Module-Name: org.codehaus.groovy
Bundle-Name: Apache Groovy
Bundle-Vendor: Pivotal Software, Inc.
Bundle-Version: 3.0.4.qualifier
Bundle-Version: 3.0.5.qualifier
Bundle-ClassPath: eclipse-trace.jar,
groovy-eclipse.jar,
lib/ivy-2.5.0.jar,
lib/groovy-3.0.4-indy.jar,
lib/groovy-test-3.0.4-indy.jar
Export-Package: groovy.beans;version="3.0.4",
groovy.cli;version="3.0.4",
groovy.grape;version="3.0.4",
groovy.inspect;version="3.0.4",
groovy.io;version="3.0.4",
groovy.lang;version="3.0.4",
groovy.lang.groovydoc;version="3.0.4",
groovy.mock.interceptor;version="3.0.4",
groovy.namespace;version="3.0.4",
groovy.security;version="3.0.4",
groovy.test;version="3.0.4",
groovy.time;version="3.0.4",
groovy.transform;version="3.0.4",
groovy.transform.builder;version="3.0.4",
groovy.transform.options;version="3.0.4",
groovy.transform.stc;version="3.0.4",
groovy.ui;version="3.0.4",
groovy.util;version="3.0.4",
groovy.util.logging;version="3.0.4",
groovy.xml;version="3.0.4",
lib/groovy-3.0.5-indy.jar,
lib/groovy-test-3.0.5-indy.jar
Export-Package: groovy.beans;version="3.0.5",
groovy.cli;version="3.0.5",
groovy.grape;version="3.0.5",
groovy.inspect;version="3.0.5",
groovy.io;version="3.0.5",
groovy.lang;version="3.0.5",
groovy.lang.groovydoc;version="3.0.5",
groovy.mock.interceptor;version="3.0.5",
groovy.namespace;version="3.0.5",
groovy.security;version="3.0.5",
groovy.test;version="3.0.5",
groovy.time;version="3.0.5",
groovy.transform;version="3.0.5",
groovy.transform.builder;version="3.0.5",
groovy.transform.options;version="3.0.5",
groovy.transform.stc;version="3.0.5",
groovy.ui;version="3.0.5",
groovy.util;version="3.0.5",
groovy.util.logging;version="3.0.5",
groovy.xml;version="3.0.5",
groovyjarjarantlr;x-friends:="org.codehaus.groovy.eclipse.refactoring",
org.apache.groovy.antlr;version="3.0.4",
org.apache.groovy.ast.tools;version="3.0.4",
org.apache.groovy.io;version="3.0.4",
org.apache.groovy.lang.annotation;version="3.0.4",
org.apache.groovy.metaclass;version="3.0.4",
org.apache.groovy.plugin;version="3.0.4",
org.apache.groovy.test;version="3.0.4",
org.apache.groovy.test.transform;version="3.0.4",
org.apache.groovy.util;version="3.0.4",
org.apache.groovy.util.concurrent;version="3.0.4",
org.apache.groovy.util.concurrent.concurrentlinkedhashmap;version="3.0.4",
org.codehaus.groovy;version="3.0.4",
org.codehaus.groovy.antlr;version="3.0.4",
org.codehaus.groovy.antlr.parser;version="3.0.4",
org.codehaus.groovy.ast;version="3.0.4",
org.codehaus.groovy.ast.builder;version="3.0.4",
org.codehaus.groovy.ast.decompiled;version="3.0.4",
org.codehaus.groovy.ast.expr;version="3.0.4",
org.codehaus.groovy.ast.stmt;version="3.0.4",
org.codehaus.groovy.ast.tools;version="3.0.4",
org.codehaus.groovy.classgen;version="3.0.4",
org.codehaus.groovy.classgen.asm;version="3.0.4",
org.codehaus.groovy.classgen.asm.indy;version="3.0.4",
org.codehaus.groovy.classgen.asm.indy.sc;version="3.0.4",
org.codehaus.groovy.classgen.asm.sc;version="3.0.4",
org.codehaus.groovy.classgen.asm.util;version="3.0.4",
org.codehaus.groovy.control;version="3.0.4",
org.codehaus.groovy.control.customizers;version="3.0.4",
org.codehaus.groovy.control.customizers.builder;version="3.0.4",
org.codehaus.groovy.control.io;version="3.0.4",
org.codehaus.groovy.control.messages;version="3.0.4",
org.apache.groovy.antlr;version="3.0.5",
org.apache.groovy.ast.tools;version="3.0.5",
org.apache.groovy.io;version="3.0.5",
org.apache.groovy.lang.annotation;version="3.0.5",
org.apache.groovy.metaclass;version="3.0.5",
org.apache.groovy.plugin;version="3.0.5",
org.apache.groovy.test;version="3.0.5",
org.apache.groovy.test.transform;version="3.0.5",
org.apache.groovy.util;version="3.0.5",
org.apache.groovy.util.concurrent;version="3.0.5",
org.apache.groovy.util.concurrent.concurrentlinkedhashmap;version="3.0.5",
org.codehaus.groovy;version="3.0.5",
org.codehaus.groovy.antlr;version="3.0.5",
org.codehaus.groovy.antlr.parser;version="3.0.5",
org.codehaus.groovy.ast;version="3.0.5",
org.codehaus.groovy.ast.builder;version="3.0.5",
org.codehaus.groovy.ast.decompiled;version="3.0.5",
org.codehaus.groovy.ast.expr;version="3.0.5",
org.codehaus.groovy.ast.stmt;version="3.0.5",
org.codehaus.groovy.ast.tools;version="3.0.5",
org.codehaus.groovy.classgen;version="3.0.5",
org.codehaus.groovy.classgen.asm;version="3.0.5",
org.codehaus.groovy.classgen.asm.indy;version="3.0.5",
org.codehaus.groovy.classgen.asm.indy.sc;version="3.0.5",
org.codehaus.groovy.classgen.asm.sc;version="3.0.5",
org.codehaus.groovy.classgen.asm.util;version="3.0.5",
org.codehaus.groovy.control;version="3.0.5",
org.codehaus.groovy.control.customizers;version="3.0.5",
org.codehaus.groovy.control.customizers.builder;version="3.0.5",
org.codehaus.groovy.control.io;version="3.0.5",
org.codehaus.groovy.control.messages;version="3.0.5",
org.codehaus.groovy.eclipse,
org.codehaus.groovy.plugin;version="3.0.4",
org.codehaus.groovy.reflection;version="3.0.4",
org.codehaus.groovy.reflection.android;version="3.0.4",
org.codehaus.groovy.reflection.stdclasses;version="3.0.4",
org.codehaus.groovy.reflection.v7;version="3.0.4",
org.codehaus.groovy.runtime;version="3.0.4",
org.codehaus.groovy.runtime.callsite;version="3.0.4",
org.codehaus.groovy.runtime.dgmimpl;version="3.0.4",
org.codehaus.groovy.runtime.dgmimpl.arrays;version="3.0.4",
org.codehaus.groovy.runtime.m12n;version="3.0.4",
org.codehaus.groovy.runtime.memoize;version="3.0.4",
org.codehaus.groovy.runtime.metaclass;version="3.0.4",
org.codehaus.groovy.runtime.powerassert;version="3.0.4",
org.codehaus.groovy.runtime.typehandling;version="3.0.4",
org.codehaus.groovy.runtime.wrappers;version="3.0.4",
org.codehaus.groovy.syntax;version="3.0.4",
org.codehaus.groovy.tools;version="3.0.4",
org.codehaus.groovy.tools.ast;version="3.0.4",
org.codehaus.groovy.tools.gse;version="3.0.4",
org.codehaus.groovy.tools.javac;version="3.0.4",
org.codehaus.groovy.tools.shell;version="3.0.4",
org.codehaus.groovy.tools.shell.util;version="3.0.4",
org.codehaus.groovy.transform;version="3.0.4",
org.codehaus.groovy.transform.sc;version="3.0.4",
org.codehaus.groovy.transform.sc.transformers;version="3.0.4",
org.codehaus.groovy.transform.stc;version="3.0.4",
org.codehaus.groovy.transform.tailrec;version="3.0.4",
org.codehaus.groovy.transform.trait;version="3.0.4",
org.codehaus.groovy.util;version="3.0.4",
org.codehaus.groovy.vmplugin;version="3.0.4",
org.codehaus.groovy.vmplugin.v5;version="3.0.4",
org.codehaus.groovy.vmplugin.v6;version="3.0.4",
org.codehaus.groovy.vmplugin.v7;version="3.0.4",
org.codehaus.groovy.vmplugin.v8;version="3.0.4",
org.codehaus.groovy.vmplugin.v9;version="3.0.4"
org.codehaus.groovy.plugin;version="3.0.5",
org.codehaus.groovy.reflection;version="3.0.5",
org.codehaus.groovy.reflection.android;version="3.0.5",
org.codehaus.groovy.reflection.stdclasses;version="3.0.5",
org.codehaus.groovy.reflection.v7;version="3.0.5",
org.codehaus.groovy.runtime;version="3.0.5",
org.codehaus.groovy.runtime.callsite;version="3.0.5",
org.codehaus.groovy.runtime.dgmimpl;version="3.0.5",
org.codehaus.groovy.runtime.dgmimpl.arrays;version="3.0.5",
org.codehaus.groovy.runtime.m12n;version="3.0.5",
org.codehaus.groovy.runtime.memoize;version="3.0.5",
org.codehaus.groovy.runtime.metaclass;version="3.0.5",
org.codehaus.groovy.runtime.powerassert;version="3.0.5",
org.codehaus.groovy.runtime.typehandling;version="3.0.5",
org.codehaus.groovy.runtime.wrappers;version="3.0.5",
org.codehaus.groovy.syntax;version="3.0.5",
org.codehaus.groovy.tools;version="3.0.5",
org.codehaus.groovy.tools.ast;version="3.0.5",
org.codehaus.groovy.tools.gse;version="3.0.5",
org.codehaus.groovy.tools.javac;version="3.0.5",
org.codehaus.groovy.tools.shell;version="3.0.5",
org.codehaus.groovy.tools.shell.util;version="3.0.5",
org.codehaus.groovy.transform;version="3.0.5",
org.codehaus.groovy.transform.sc;version="3.0.5",
org.codehaus.groovy.transform.sc.transformers;version="3.0.5",
org.codehaus.groovy.transform.stc;version="3.0.5",
org.codehaus.groovy.transform.tailrec;version="3.0.5",
org.codehaus.groovy.transform.trait;version="3.0.5",
org.codehaus.groovy.util;version="3.0.5",
org.codehaus.groovy.vmplugin;version="3.0.5",
org.codehaus.groovy.vmplugin.v5;version="3.0.5",
org.codehaus.groovy.vmplugin.v6;version="3.0.5",
org.codehaus.groovy.vmplugin.v7;version="3.0.5",
org.codehaus.groovy.vmplugin.v8;version="3.0.5",
org.codehaus.groovy.vmplugin.v9;version="3.0.5"
Require-Bundle: org.eclipse.core.runtime,
org.junit;resolution:=optional
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Expand Down
1 change: 1 addition & 0 deletions base/org.codehaus.groovy30/VERSION
Original file line number Diff line number Diff line change
Expand Up @@ -10,3 +10,4 @@
2020-03-08: GROOVY_3_0_2
2020-04-10: GROOVY_3_0_3
2020-05-21: GROOVY_3_0_4
2020-07-23: GROOVY_3_0_5
22 changes: 11 additions & 11 deletions base/org.codehaus.groovy30/about.html
Original file line number Diff line number Diff line change
Expand Up @@ -24,12 +24,12 @@ <h3>License</h3>

<h3>Third Party Content</h3>

<h4>groovy-3.0.4-indy.jar</h4>
<h4>groovy-test-3.0.4-indy.jar</h4>
<h4>groovy-3.0.5-indy.jar</h4>
<h4>groovy-test-3.0.5-indy.jar</h4>

<ul>
<li>Obtained from: <a href="https://dl.bintray.com/groovy/maven/apache-groovy-binary-3.0.4.zip">https://dl.bintray.com/groovy/maven/apache-groovy-binary-3.0.4.zip</a></li>
<li>Sources available at: <a href="https://dl.bintray.com/groovy/maven/apache-groovy-src-3.0.4.zip">https://dl.bintray.com/groovy/maven/apache-groovy-src-3.0.4.zip</a></li>
<li>Obtained from: <a href="https://dl.bintray.com/groovy/maven/apache-groovy-binary-3.0.5.zip">https://dl.bintray.com/groovy/maven/apache-groovy-binary-3.0.5.zip</a></li>
<li>Sources available at: <a href="https://dl.bintray.com/groovy/maven/apache-groovy-src-3.0.5.zip">https://dl.bintray.com/groovy/maven/apache-groovy-src-3.0.5.zip</a></li>
<li>License kind: ASL</li>
<li>License URL: <a href="https://www.apache.org/licenses/LICENSE-2.0.html">https://www.apache.org/licenses/LICENSE-2.0.html</a></li>
<li>License text: <a href="about_files/asl2-license.txt">asl2-license.txt</a></li>
Expand All @@ -45,14 +45,14 @@ <h4>ivy-2.5.0.jar</h4>
<li>License text: <a href="about_files/asl2-license.txt">asl2-license.txt</a></li>
</ul>

<h4>groovy-console-3.0.4.jar</h4>
<h4>groovy-groovysh-3.0.4.jar</h4>
<h4>groovy-swing-3.0.4.jar</h4>
<h4>groovy-templates-3.0.4.jar</h4>
<h4>groovy-xml-3.0.4.jar</h4>
<h4>groovy-console-3.0.5.jar</h4>
<h4>groovy-groovysh-3.0.5.jar</h4>
<h4>groovy-swing-3.0.5.jar</h4>
<h4>groovy-templates-3.0.5.jar</h4>
<h4>groovy-xml-3.0.5.jar</h4>

<ul>
<li>Obtained from: <a href="https://dl.bintray.com/groovy/maven/apache-groovy-sdk-3.0.4.zip">https://dl.bintray.com/groovy/maven/apache-groovy-sdk-3.0.4.zip</a></li>
<li>Obtained from: <a href="https://dl.bintray.com/groovy/maven/apache-groovy-sdk-3.0.5.zip">https://dl.bintray.com/groovy/maven/apache-groovy-sdk-3.0.5.zip</a></li>
<li>License kind: ASL</li>
<li>License URL: <a href="https://www.apache.org/licenses/LICENSE-2.0.html">https://www.apache.org/licenses/LICENSE-2.0.html</a></li>
<li>License text: <a href="about_files/asl2-license.txt">asl2-license.txt</a></li>
Expand All @@ -61,7 +61,7 @@ <h4>groovy-xml-3.0.4.jar</h4>
<h4>jline-2.14.6.jar</h4>

<ul>
<li>Obtained from: <a href="https://dl.bintray.com/groovy/maven/apache-groovy-sdk-3.0.4.zip">https://dl.bintray.com/groovy/maven/apache-groovy-sdk-3.0.4.zip</a></li>
<li>Obtained from: <a href="https://dl.bintray.com/groovy/maven/apache-groovy-sdk-3.0.5.zip">https://dl.bintray.com/groovy/maven/apache-groovy-sdk-3.0.5.zip</a></li>
<li>License kind: BSD</li>
<li>License URL: <a href="https://www.opensource.org/licenses/bsd-license.php">https://www.opensource.org/licenses/bsd-license.php</a></li>
<li>License text: <a href="about_files/jline2-license.txt">jline2-license.txt</a></li>
Expand Down
Loading

0 comments on commit 7dfee0b

Please sign in to comment.