[groovy] branch master updated: Remove deprecated option `groovy.generate.stub.in.memory`

[su...@apache.org]

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 8336f28  Remove deprecated option `groovy.generate.stub.in.memory`
8336f28 is described below

commit 8336f28212498e4c707804fbee1a2a5b23454f43
Author: Daniel Sun <su...@apache.org>
AuthorDate: Mon Jun 22 07:52:35 2020 +0800

    Remove deprecated option `groovy.generate.stub.in.memory`
---
 .../org/codehaus/groovy/tools/javac/JavaAwareCompilationUnit.java     | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/main/java/org/codehaus/groovy/tools/javac/JavaAwareCompilationUnit.java b/src/main/java/org/codehaus/groovy/tools/javac/JavaAwareCompilationUnit.java
index dd58618..0936a8e 100644
--- a/src/main/java/org/codehaus/groovy/tools/javac/JavaAwareCompilationUnit.java
+++ b/src/main/java/org/codehaus/groovy/tools/javac/JavaAwareCompilationUnit.java
@@ -73,9 +73,7 @@ public class JavaAwareCompilationUnit extends CompilationUnit {
             String sourceEncoding = this.configuration.getSourceEncoding();
             Object memStub = options.get(CompilerConfiguration.MEM_STUB);
             if (memStub == null) {
-                memStub = Boolean.parseBoolean(SystemUtil.getSystemPropertySafe("groovy.mem.stub", "false"))
-                                // the following JVM option will be removed since Groovy 4
-                            || Boolean.parseBoolean(SystemUtil.getSystemPropertySafe("groovy.generate.stub.in.memory", "false"));
+                memStub = Boolean.parseBoolean(SystemUtil.getSystemPropertySafe("groovy.mem.stub", "false"));
                 options.put(CompilerConfiguration.MEM_STUB, memStub);
             }