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 2018/04/01 02:46:11 UTC
groovy git commit: binary compatibility changes for Verifier
Repository: groovy
Updated Branches:
refs/heads/master 61e1c01ed -> 650c16c58
binary compatibility changes for Verifier
Project: http://git-wip-us.apache.org/repos/asf/groovy/repo
Commit: http://git-wip-us.apache.org/repos/asf/groovy/commit/650c16c5
Tree: http://git-wip-us.apache.org/repos/asf/groovy/tree/650c16c5
Diff: http://git-wip-us.apache.org/repos/asf/groovy/diff/650c16c5
Branch: refs/heads/master
Commit: 650c16c58f1647f154740ab2bdd2fe338c9ebd39
Parents: 61e1c01
Author: Paul King <pa...@asert.com.au>
Authored: Sun Apr 1 12:46:03 2018 +1000
Committer: Paul King <pa...@asert.com.au>
Committed: Sun Apr 1 12:46:03 2018 +1000
----------------------------------------------------------------------
build.gradle | 1 +
src/main/java/org/codehaus/groovy/classgen/Verifier.java | 6 ++++++
.../org/codehaus/groovy/tools/javac/JavaStubGenerator.java | 1 -
3 files changed, 7 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/groovy/blob/650c16c5/build.gradle
----------------------------------------------------------------------
diff --git a/build.gradle b/build.gradle
index 3f410cb..0ea74ed 100644
--- a/build.gradle
+++ b/build.gradle
@@ -325,6 +325,7 @@ compileJava {
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.java.outputDir.canonicalPath}/org/codehaus/groovy/runtime/StringGroovyMethods.class")
+ arg(value: "${sourceSets.main.java.outputDir.canonicalPath}/org/codehaus/groovy/classgen/Verifier.class")
}
ant.echo('Bridger: ' + ant.properties.stdout)
}
http://git-wip-us.apache.org/repos/asf/groovy/blob/650c16c5/src/main/java/org/codehaus/groovy/classgen/Verifier.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/codehaus/groovy/classgen/Verifier.java b/src/main/java/org/codehaus/groovy/classgen/Verifier.java
index d02b6ca..090cc4f 100644
--- a/src/main/java/org/codehaus/groovy/classgen/Verifier.java
+++ b/src/main/java/org/codehaus/groovy/classgen/Verifier.java
@@ -570,6 +570,12 @@ public class Verifier implements GroovyClassVisitor, Opcodes {
}
}
+ // for binary compatibility only, don't use or override this
+ protected void addMethod$$bridge(ClassNode node, boolean shouldBeSynthetic, String name, int modifiers, ClassNode returnType, Parameter[] parameters,
+ ClassNode[] exceptions, Statement code) {
+ addMethod(node, shouldBeSynthetic, name, modifiers, returnType, parameters, exceptions, code);
+ }
+
@Deprecated
protected void addTimeStamp(ClassNode node) {
}
http://git-wip-us.apache.org/repos/asf/groovy/blob/650c16c5/src/main/java/org/codehaus/groovy/tools/javac/JavaStubGenerator.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/codehaus/groovy/tools/javac/JavaStubGenerator.java b/src/main/java/org/codehaus/groovy/tools/javac/JavaStubGenerator.java
index b6af6ab..56f6fbc 100644
--- a/src/main/java/org/codehaus/groovy/tools/javac/JavaStubGenerator.java
+++ b/src/main/java/org/codehaus/groovy/tools/javac/JavaStubGenerator.java
@@ -165,7 +165,6 @@ public class JavaStubGenerator {
}
public void addCovariantMethods(ClassNode cn) {}
- protected void addTimeStamp(ClassNode node) {}
protected void addInitialization(ClassNode node) {}
protected void addPropertyMethod(MethodNode method) {
doAddMethod(method);