Fix remaining test compats and other small changes for Giraffe

(cherry picked from commit 673c7df)
ergatta · Mar 7, 2023 · 71513e2 · 71513e2
1 parent db62317
commit 71513e2
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/java/src/com/google/idea/blaze/java/run/producers/NonBlazeProducerSuppressor.java b/java/src/com/google/idea/blaze/java/run/producers/NonBlazeProducerSuppressor.java
@@ -26,6 +26,7 @@ public class NonBlazeProducerSuppressor implements StartupActivity {
 
   private static final ImmutableList<String> KOTLIN_PRODUCERS =
       ImmutableList.of(
+          "org.jetbrains.kotlin.idea.gradleCodeInsightCommon.native.KotlinNativeRunConfigurationProducer",
           "org.jetbrains.kotlin.idea.gradleJava.run.KotlinJvmTestClassGradleConfigurationProducer",
           "org.jetbrains.kotlin.idea.gradleJava.run.KotlinJvmTestMethodGradleConfigurationProducer",
           "org.jetbrains.kotlin.idea.gradleJava.run.KotlinMultiplatformJvmTestClassGradleConfigurationProducer",

diff --git a/testing/cidr/com/google/idea/testing/cidr/StubOCWorkspace.java b/testing/cidr/com/google/idea/testing/cidr/StubOCWorkspace.java
@@ -44,7 +44,7 @@ public StubOCResolveConfigurationBase getModifiableStubConfiguration() {
     return (StubOCResolveConfigurationBase) resolveConfigurations.get(0);
   }
 
-  @Override
+  // @Override removed in #api223
   public int getClientVersion() {
     return 0;
   }
@@ -82,7 +82,7 @@ public OCResolveConfiguration getConfigurationById(String id) {
     return ContainerUtil.find(resolveConfigurations, it -> Objects.equals(id, it.getUniqueId()));
   }
 
-  @Override
+  // @Override removed in #api223
   public ModifiableModel getModifiableModel() {
     throw new UnsupportedOperationException();
   }