From e4383d0985f6984d6922d187f454b5836dec07fc Mon Sep 17 00:00:00 2001 From: Tomasz Pasternak Date: Thu, 5 Sep 2024 14:51:33 +0200 Subject: [PATCH] chore: drop 222: Inline CidrOwnModuleDetectorWrapper (#6732) --- .../blaze/cpp/BlazeOwnModuleDetector.java | 4 ++-- .../cpp/CidrOwnModuleDetectorWrapper.java | 11 ---------- .../cpp/CidrOwnModuleDetectorWrapper.java | 9 -------- .../cpp/CidrOwnModuleDetectorWrapper.java | 9 -------- .../cpp/CidrOwnModuleDetectorWrapper.java | 21 ------------------- .../cpp/CidrOwnModuleDetectorWrapper.java | 21 ------------------- .../cpp/CidrOwnModuleDetectorWrapper.java | 21 ------------------- .../cpp/CidrOwnModuleDetectorWrapper.java | 21 ------------------- 8 files changed, 2 insertions(+), 115 deletions(-) delete mode 100644 sdkcompat/asdev/com/google/idea/sdkcompat/cpp/CidrOwnModuleDetectorWrapper.java delete mode 100644 sdkcompat/v223/com/google/idea/sdkcompat/cpp/CidrOwnModuleDetectorWrapper.java delete mode 100644 sdkcompat/v231/com/google/idea/sdkcompat/cpp/CidrOwnModuleDetectorWrapper.java delete mode 100644 sdkcompat/v232/com/google/idea/sdkcompat/cpp/CidrOwnModuleDetectorWrapper.java delete mode 100644 sdkcompat/v233/com/google/idea/sdkcompat/cpp/CidrOwnModuleDetectorWrapper.java delete mode 100644 sdkcompat/v241/com/google/idea/sdkcompat/cpp/CidrOwnModuleDetectorWrapper.java delete mode 100644 sdkcompat/v242/com/google/idea/sdkcompat/cpp/CidrOwnModuleDetectorWrapper.java diff --git a/cpp/src/com/google/idea/blaze/cpp/BlazeOwnModuleDetector.java b/cpp/src/com/google/idea/blaze/cpp/BlazeOwnModuleDetector.java index f49c1f17689..0d9d2c0318a 100644 --- a/cpp/src/com/google/idea/blaze/cpp/BlazeOwnModuleDetector.java +++ b/cpp/src/com/google/idea/blaze/cpp/BlazeOwnModuleDetector.java @@ -1,12 +1,12 @@ package com.google.idea.blaze.cpp; -import com.google.idea.sdkcompat.cpp.CidrOwnModuleDetectorWrapper; import com.intellij.openapi.module.Module; +import com.jetbrains.cidr.project.workspace.CidrOwnModuleDetector; import org.jetbrains.annotations.NotNull; import static com.google.idea.blaze.base.settings.Blaze.isBlazeProject; -public class BlazeOwnModuleDetector implements CidrOwnModuleDetectorWrapper { +public class BlazeOwnModuleDetector implements CidrOwnModuleDetector { @Override public boolean isOwnModule(@NotNull Module module) { return isBlazeProject(module.getProject()); diff --git a/sdkcompat/asdev/com/google/idea/sdkcompat/cpp/CidrOwnModuleDetectorWrapper.java b/sdkcompat/asdev/com/google/idea/sdkcompat/cpp/CidrOwnModuleDetectorWrapper.java deleted file mode 100644 index 0dbddba4966..00000000000 --- a/sdkcompat/asdev/com/google/idea/sdkcompat/cpp/CidrOwnModuleDetectorWrapper.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.google.idea.sdkcompat.cpp; - -import com.intellij.openapi.module.Module; -import org.jetbrains.annotations.NotNull; - -/** - * #api222 - */ -public interface CidrOwnModuleDetectorWrapper { - boolean isOwnModule(@NotNull Module module); -} \ No newline at end of file diff --git a/sdkcompat/v223/com/google/idea/sdkcompat/cpp/CidrOwnModuleDetectorWrapper.java b/sdkcompat/v223/com/google/idea/sdkcompat/cpp/CidrOwnModuleDetectorWrapper.java deleted file mode 100644 index 7d053c5e7d1..00000000000 --- a/sdkcompat/v223/com/google/idea/sdkcompat/cpp/CidrOwnModuleDetectorWrapper.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.google.idea.sdkcompat.cpp; - -import com.jetbrains.cidr.project.workspace.CidrOwnModuleDetector; - -/** - * #api222 - */ -public interface CidrOwnModuleDetectorWrapper extends CidrOwnModuleDetector { -} \ No newline at end of file diff --git a/sdkcompat/v231/com/google/idea/sdkcompat/cpp/CidrOwnModuleDetectorWrapper.java b/sdkcompat/v231/com/google/idea/sdkcompat/cpp/CidrOwnModuleDetectorWrapper.java deleted file mode 100644 index 7d053c5e7d1..00000000000 --- a/sdkcompat/v231/com/google/idea/sdkcompat/cpp/CidrOwnModuleDetectorWrapper.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.google.idea.sdkcompat.cpp; - -import com.jetbrains.cidr.project.workspace.CidrOwnModuleDetector; - -/** - * #api222 - */ -public interface CidrOwnModuleDetectorWrapper extends CidrOwnModuleDetector { -} \ No newline at end of file diff --git a/sdkcompat/v232/com/google/idea/sdkcompat/cpp/CidrOwnModuleDetectorWrapper.java b/sdkcompat/v232/com/google/idea/sdkcompat/cpp/CidrOwnModuleDetectorWrapper.java deleted file mode 100644 index d9f6a409ecd..00000000000 --- a/sdkcompat/v232/com/google/idea/sdkcompat/cpp/CidrOwnModuleDetectorWrapper.java +++ /dev/null @@ -1,21 +0,0 @@ -/* - * Copyright 2016 The Bazel Authors. All rights reserved. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package com.google.idea.sdkcompat.cpp; - -import com.jetbrains.cidr.project.workspace.CidrOwnModuleDetector; - -/** #api231 */ -public interface CidrOwnModuleDetectorWrapper extends CidrOwnModuleDetector {} diff --git a/sdkcompat/v233/com/google/idea/sdkcompat/cpp/CidrOwnModuleDetectorWrapper.java b/sdkcompat/v233/com/google/idea/sdkcompat/cpp/CidrOwnModuleDetectorWrapper.java deleted file mode 100644 index d9f6a409ecd..00000000000 --- a/sdkcompat/v233/com/google/idea/sdkcompat/cpp/CidrOwnModuleDetectorWrapper.java +++ /dev/null @@ -1,21 +0,0 @@ -/* - * Copyright 2016 The Bazel Authors. All rights reserved. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package com.google.idea.sdkcompat.cpp; - -import com.jetbrains.cidr.project.workspace.CidrOwnModuleDetector; - -/** #api231 */ -public interface CidrOwnModuleDetectorWrapper extends CidrOwnModuleDetector {} diff --git a/sdkcompat/v241/com/google/idea/sdkcompat/cpp/CidrOwnModuleDetectorWrapper.java b/sdkcompat/v241/com/google/idea/sdkcompat/cpp/CidrOwnModuleDetectorWrapper.java deleted file mode 100644 index d9f6a409ecd..00000000000 --- a/sdkcompat/v241/com/google/idea/sdkcompat/cpp/CidrOwnModuleDetectorWrapper.java +++ /dev/null @@ -1,21 +0,0 @@ -/* - * Copyright 2016 The Bazel Authors. All rights reserved. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package com.google.idea.sdkcompat.cpp; - -import com.jetbrains.cidr.project.workspace.CidrOwnModuleDetector; - -/** #api231 */ -public interface CidrOwnModuleDetectorWrapper extends CidrOwnModuleDetector {} diff --git a/sdkcompat/v242/com/google/idea/sdkcompat/cpp/CidrOwnModuleDetectorWrapper.java b/sdkcompat/v242/com/google/idea/sdkcompat/cpp/CidrOwnModuleDetectorWrapper.java deleted file mode 100644 index d9f6a409ecd..00000000000 --- a/sdkcompat/v242/com/google/idea/sdkcompat/cpp/CidrOwnModuleDetectorWrapper.java +++ /dev/null @@ -1,21 +0,0 @@ -/* - * Copyright 2016 The Bazel Authors. All rights reserved. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package com.google.idea.sdkcompat.cpp; - -import com.jetbrains.cidr.project.workspace.CidrOwnModuleDetector; - -/** #api231 */ -public interface CidrOwnModuleDetectorWrapper extends CidrOwnModuleDetector {}