Remove deprecated or internal types, mark unused code deprecated

Fixes gwtproject#9923
niloc132 · Feb 12, 2024 · ed68198 · ed68198
1 parent a848ffa
commit ed68198
Show file tree

Hide file tree

Showing 11 changed files with 12 additions and 216 deletions.
diff --git a/dev/core/src/com/google/gwt/dev/GetJreEmulation.java b/dev/core/src/com/google/gwt/dev/GetJreEmulation.java
@@ -31,6 +31,7 @@
 /**
  * Entry point that outputs the GWT JRE support.
  */
+@Deprecated
 public class GetJreEmulation {
 
   /**
@@ -68,6 +69,10 @@ public static void main(String[] args) {
       PrintWriterTreeLogger logger = new PrintWriterTreeLogger(new PrintWriter(
           System.err, true));
       logger.setMaxDetail(TreeLogger.WARN);
+      logger.log(TreeLogger.Type.WARN,
+              "GetJreEmulation is deprecated for removal, please consider other options to get " +
+                      "this information from the GWT jar. See https://github.com/gwtproject/gwt/issues/9923 " +
+                      "to discuss other options.");
       CompilerContext.Builder compilerContextBuilder = new CompilerContext.Builder();
       CompilerContext compilerContext = compilerContextBuilder.build();
       ModuleDef module =

diff --git a/dev/core/src/com/google/gwt/dev/RunWebApp.java b/dev/core/src/com/google/gwt/dev/RunWebApp.java
@@ -35,6 +35,7 @@
  * An utility class for running web apps with Jetty and launching the default
  * browser.
  */
+@Deprecated
 public class RunWebApp {
 
   interface RunWebAppOptions extends OptionStartupURLs, OptionPort {
@@ -130,6 +131,9 @@ public RunWebApp(RunWebAppOptions options) {
 
   protected void run() {
     PrintWriterTreeLogger logger = new PrintWriterTreeLogger();
+    logger.log(TreeLogger.Type.WARN,
+            "RunWebApp is deprecated for removal, please run your server directly. Visit " +
+                    "https://github.com/gwtproject/gwt/issues/9923 to discuss other options.");
     logger.setMaxDetail(TreeLogger.WARN);
     int port = options.getPort();
     try {

diff --git a/dev/core/src/com/google/gwt/dev/SignatureDumper.java b/dev/core/src/com/google/gwt/dev/SignatureDumper.java
@@ -25,6 +25,7 @@
 
 import java.io.PrintStream;
 
+@Deprecated
 class SignatureDumper {
 
   public interface Filter {

diff --git a/dev/core/src/com/google/gwt/dev/shell/HostedModeServletConfigProxy.java b/dev/core/src/com/google/gwt/dev/shell/HostedModeServletConfigProxy.java
diff --git a/dev/core/src/com/google/gwt/dev/shell/WorkDirs.java b/dev/core/src/com/google/gwt/dev/shell/WorkDirs.java
@@ -22,6 +22,7 @@
 /**
  * Provides information about work directories.
  */
+@Deprecated
 public interface WorkDirs {
   /**
    * Gets the compiler output directory for a particular module.

diff --git a/dev/core/src/com/google/gwt/dev/shell/log/ServletContextTreeLogger.java b/dev/core/src/com/google/gwt/dev/shell/log/ServletContextTreeLogger.java
@@ -22,6 +22,7 @@
 /**
  * Tree logger that logs servlet context information.
  */
+@Deprecated
 public class ServletContextTreeLogger extends AbstractTreeLogger {
 
   private final ServletContext ctx;

diff --git a/dev/core/src/com/google/gwt/dev/shell/rewrite/ForceClassVersion15.java b/dev/core/src/com/google/gwt/dev/shell/rewrite/ForceClassVersion15.java
diff --git a/dev/core/src/com/google/gwt/dev/shell/rewrite/HostedModeClassRewriter.java b/dev/core/src/com/google/gwt/dev/shell/rewrite/HostedModeClassRewriter.java
@@ -245,11 +245,6 @@ public byte[] rewrite(TypeOracle typeOracle, String className,
 
     v = new RewriteJsniMethods(v, anonymousClassMap);
 
-    if (Double.parseDouble(System.getProperty("java.class.version")) < Opcodes.V1_8) {
-      // TODO(cromwellian) implement Retrolambda?
-      v = new ForceClassVersion15(v);
-    }
-
     new ClassReader(classBytes).accept(v, 0);
     classBytesRewriteEvent.end();
     return writer.toByteArray();

diff --git a/dev/core/src/com/google/gwt/dev/util/arg/ArgHandlerLibraries.java b/dev/core/src/com/google/gwt/dev/util/arg/ArgHandlerLibraries.java
diff --git a/dev/core/src/com/google/gwt/dev/util/arg/ArgHandlerLink.java b/dev/core/src/com/google/gwt/dev/util/arg/ArgHandlerLink.java
diff --git a/dev/core/src/com/google/gwt/dev/util/arg/ArgHandlerOutputLibrary.java b/dev/core/src/com/google/gwt/dev/util/arg/ArgHandlerOutputLibrary.java