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 2020/07/03 13:13:16 UTC
[groovy] branch GROOVY_3_0_X updated: GROOVY-9483: adjust for
binary compatibility
This is an automated email from the ASF dual-hosted git repository.
paulk pushed a commit to branch GROOVY_3_0_X
in repository https://gitbox.apache.org/repos/asf/groovy.git
The following commit(s) were added to refs/heads/GROOVY_3_0_X by this push:
new d6a7d37 GROOVY-9483: adjust for binary compatibility
d6a7d37 is described below
commit d6a7d370be8ab412da41f63ccd8c9e8ce014cc99
Author: Paul King <pa...@asert.com.au>
AuthorDate: Fri Jul 3 23:13:07 2020 +1000
GROOVY-9483: adjust for binary compatibility
---
subprojects/groovy-console/build.gradle | 9 +++++++++
.../groovy-console/src/main/groovy/groovy/ui/Console.groovy | 5 +++++
2 files changed, 14 insertions(+)
diff --git a/subprojects/groovy-console/build.gradle b/subprojects/groovy-console/build.gradle
index 4b48627..e89ea75 100644
--- a/subprojects/groovy-console/build.gradle
+++ b/subprojects/groovy-console/build.gradle
@@ -32,3 +32,12 @@ task console(type: JavaExec, dependsOn:classes) {
main = 'groovy.console.ui.Console'
classpath = sourceSets.main.runtimeClasspath
}
+
+compileGroovy {
+ doLast {
+ ant.java(classname:'org.jboss.bridger.Bridger', classpath: rootProject.configurations.tools.asPath, outputproperty: 'stdout') {
+ arg(value: "${sourceSets.main.groovy.outputDir.canonicalPath}/groovy/ui/Console.class")
+ }
+ ant.echo('Bridger (groovy-console): ' + ant.properties.stdout)
+ }
+}
diff --git a/subprojects/groovy-console/src/main/groovy/groovy/ui/Console.groovy b/subprojects/groovy-console/src/main/groovy/groovy/ui/Console.groovy
index e60618f..2a9cad0 100644
--- a/subprojects/groovy-console/src/main/groovy/groovy/ui/Console.groovy
+++ b/subprojects/groovy-console/src/main/groovy/groovy/ui/Console.groovy
@@ -774,6 +774,11 @@ class Console implements CaretListener, HyperlinkListener, ComponentListener, Fo
}
}
+ @Deprecated
+ void exit$$bridge(EventObject evt) {
+ exit(evt)
+ }
+
boolean exit(EventObject evt = null) {
if (askToInterruptScript()) {
def exit = askToSaveFile()