Skip to content

Fix broken AndroidProjectInfo.requiresAnroidModel() in new API #1951

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 15, 2023
Merged

Fix broken AndroidProjectInfo.requiresAnroidModel() in new API #1951

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions ...in/kotlin/org/androidstudio/plugin/util/UtAndroidGradleJavaProjectModelModifierWrapper.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package org.androidstudio.plugin.util

import com.android.tools.idea.project.AndroidProjectInfo
import com.android.tools.idea.model.AndroidModel
import com.intellij.facet.ProjectFacetManager
import com.intellij.ide.plugins.PluginManager
import com.intellij.openapi.extensions.PluginId
import com.intellij.openapi.module.Module
Expand All @@ -10,6 +11,7 @@ import com.intellij.openapi.roots.ExternalLibraryDescriptor
import com.intellij.openapi.roots.impl.IdeaProjectModelModifier
import com.intellij.openapi.roots.libraries.Library
import com.intellij.pom.java.LanguageLevel
import org.jetbrains.android.facet.AndroidFacet
import org.jetbrains.concurrency.Promise

/*
Expand Down Expand Up @@ -55,6 +57,7 @@ class UtAndroidGradleJavaProjectModelModifierWrapper(val project: Project): Idea
return false
}

return AndroidProjectInfo.getInstance(project).requiresAndroidModel()
return ProjectFacetManager.getInstance(project).getFacets(AndroidFacet.ID).stream()
.anyMatch { AndroidModel.isRequired(it) }
}
}