Skip to content

Commit 57cd907

Browse files
authored
Remove use of AndroidFacet (#8464)
This should fix one of the critical problems in plugin compatibility (instead of using something from Android Studio / Android plugin, just declare a new facet), but further examination of how the modules should work is still needed (this is still in info-gathering stage and in a doc).
1 parent 394c970 commit 57cd907

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

src/io/flutter/android/AndroidModuleLibraryManager.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
import com.android.tools.idea.gradle.project.sync.GradleSyncInvoker;
99
import com.android.tools.idea.gradle.project.sync.GradleSyncListener;
1010
import com.intellij.facet.FacetManager;
11+
import com.intellij.facet.FacetTypeId;
1112
import com.intellij.notification.Notification;
1213
import com.intellij.notification.NotificationType;
1314
import com.intellij.notification.Notifications;
@@ -39,7 +40,6 @@
3940
import io.flutter.settings.FlutterSettings;
4041
import io.flutter.utils.FlutterModuleUtils;
4142
import io.flutter.utils.OpenApiUtils;
42-
import org.jetbrains.android.facet.AndroidFacet;
4343
import org.jetbrains.annotations.NotNull;
4444
import org.jetbrains.annotations.Nullable;
4545

@@ -153,7 +153,7 @@ protected void updateModuleLibraryDependencies(@NotNull Library library) {
153153
private void updateAndroidModuleLibraryDependencies(Module flutterModule) {
154154
for (final Module module : OpenApiUtils.getModules(getProject())) {
155155
if (module != flutterModule) {
156-
if (null != FacetManager.getInstance(module).findFacet(AndroidFacet.ID, "Android")) {
156+
if (null != FacetManager.getInstance(module).findFacet(new FacetTypeId<>("android"), "Android")) {
157157
Object circularModules = CircularModuleDependenciesDetector.addingDependencyFormsCircularity(module, flutterModule);
158158
if (circularModules == null) {
159159
ModuleRootManager rootManager = ModuleRootManager.getInstance(module);

0 commit comments

Comments
 (0)