From 89e9f9a7c1d28776dec699194a1aaf943eba94ca Mon Sep 17 00:00:00 2001 From: Mai Hussien Date: Mon, 31 Jul 2023 14:30:31 -0700 Subject: [PATCH] Fix CI for AS Canary - Remove private keyword in interface methods not supported in -source 8 - Replace `var` with `List` the return type of the method (cherry picked from commit 47f9f2047f414c95503738abd506aefce4f9d46a) --- .../com/android/tools/idea/run/tasks/DeployTasksCompat.java | 3 ++- .../blaze/android/run/runner/BlazeAndroidDebuggerService.java | 2 +- .../com/android/tools/idea/run/tasks/DeployTasksCompat.java | 3 ++- .../blaze/android/run/runner/BlazeAndroidDebuggerService.java | 2 +- 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/aswb/sdkcompat/as231/com/android/tools/idea/run/tasks/DeployTasksCompat.java b/aswb/sdkcompat/as231/com/android/tools/idea/run/tasks/DeployTasksCompat.java index d2fb52defee..8c5bde9785e 100644 --- a/aswb/sdkcompat/as231/com/android/tools/idea/run/tasks/DeployTasksCompat.java +++ b/aswb/sdkcompat/as231/com/android/tools/idea/run/tasks/DeployTasksCompat.java @@ -23,6 +23,7 @@ import com.google.idea.common.experiments.BoolExperiment; import com.intellij.openapi.project.Project; import java.util.Collection; +import java.util.List; /** Compat class for {@link DeployTask} */ public class DeployTasksCompat { @@ -35,7 +36,7 @@ public static BlazeLaunchTask createDeployTask( Project project, Collection packages, DeployOptions deployOptions) { return launchContext -> { try { - var unused = + List unused = new DeployTask( project, packages, diff --git a/aswb/sdkcompat/as231/com/google/idea/blaze/android/run/runner/BlazeAndroidDebuggerService.java b/aswb/sdkcompat/as231/com/google/idea/blaze/android/run/runner/BlazeAndroidDebuggerService.java index 9b5866e84ed..5715392a171 100644 --- a/aswb/sdkcompat/as231/com/google/idea/blaze/android/run/runner/BlazeAndroidDebuggerService.java +++ b/aswb/sdkcompat/as231/com/google/idea/blaze/android/run/runner/BlazeAndroidDebuggerService.java @@ -129,7 +129,7 @@ public void configureNativeDebugger( } } - private static boolean isNdkPluginLoaded() { + static boolean isNdkPluginLoaded() { return PluginManagerCore.getLoadedPlugins().stream() .anyMatch( d -> d.isEnabled() && d.getPluginId().getIdString().equals("com.android.tools.ndk")); diff --git a/aswb/sdkcompat/asdev/com/android/tools/idea/run/tasks/DeployTasksCompat.java b/aswb/sdkcompat/asdev/com/android/tools/idea/run/tasks/DeployTasksCompat.java index d475822b285..ce440ca9d52 100644 --- a/aswb/sdkcompat/asdev/com/android/tools/idea/run/tasks/DeployTasksCompat.java +++ b/aswb/sdkcompat/asdev/com/android/tools/idea/run/tasks/DeployTasksCompat.java @@ -23,6 +23,7 @@ import com.google.idea.common.experiments.BoolExperiment; import com.intellij.openapi.project.Project; import java.util.Collection; +import java.util.List; /** Compat class for {@link DeployTask} */ public class DeployTasksCompat { @@ -35,7 +36,7 @@ public static BlazeLaunchTask createDeployTask( Project project, Collection packages, DeployOptions deployOptions) { return launchContext -> { try { - var unused = + List unused = new DeployTask( project, packages, diff --git a/aswb/sdkcompat/asdev/com/google/idea/blaze/android/run/runner/BlazeAndroidDebuggerService.java b/aswb/sdkcompat/asdev/com/google/idea/blaze/android/run/runner/BlazeAndroidDebuggerService.java index 9b5866e84ed..5715392a171 100644 --- a/aswb/sdkcompat/asdev/com/google/idea/blaze/android/run/runner/BlazeAndroidDebuggerService.java +++ b/aswb/sdkcompat/asdev/com/google/idea/blaze/android/run/runner/BlazeAndroidDebuggerService.java @@ -129,7 +129,7 @@ public void configureNativeDebugger( } } - private static boolean isNdkPluginLoaded() { + static boolean isNdkPluginLoaded() { return PluginManagerCore.getLoadedPlugins().stream() .anyMatch( d -> d.isEnabled() && d.getPluginId().getIdString().equals("com.android.tools.ndk"));