Merge pull request #6 from EgoriusE/develop

1.0.0-alpha 5
EgoriusE · May 16, 2021 · 0838bbe · 0838bbe
2 parents 2e6cbb9 + 02d69ab
commit 0838bbe
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 14 deletions.
diff --git a/build.gradle b/build.gradle
@@ -5,7 +5,7 @@ plugins {
 }
 
 group 'com.bobrusik.plugin.android_libraries_agent'
-version '1.0.0-alpha4'
+version '1.0.0-alpha5'
 
 repositories {
     mavenCentral()
@@ -29,6 +29,6 @@ intellij {
 
 patchPluginXml {
     version = project.version
-    sinceBuild = '194'
+    sinceBuild = '201'
     untilBuild = '203.*'
 }
diff --git a/src/main/kotlin/core/ActionHandler.kt b/src/main/kotlin/core/ActionHandler.kt
@@ -1,7 +1,7 @@
 package core
 
 import com.android.tools.idea.gradle.dsl.api.GradleBuildModel
-import com.android.tools.idea.gradle.dsl.api.GradleModelProvider
+import com.android.tools.idea.gradle.dsl.api.ProjectBuildModel
 import com.android.tools.idea.projectsystem.ProjectSystemSyncManager
 import com.android.tools.idea.projectsystem.gradle.GradleProjectSystemSyncManager
 import com.intellij.openapi.components.Service
@@ -22,7 +22,7 @@ import utils.extensions.canCreateFile
 class ActionHandler(
     private val project: Project
 ) {
-    private val projectGradleBuildModel: GradleBuildModel? = GradleModelProvider.get().getBuildModel(project)
+    private val projectGradleBuildModel: GradleBuildModel? = ProjectBuildModel.get(project).projectBuildModel
     private val gradleDependenciesManager = GradleDependenciesManager()
     private val notificationFactory by lazy { NotificationsFactory.getInstance(project) }
     private val gradleProjectSystemSyncManager = GradleProjectSystemSyncManager(project)
@@ -110,8 +110,7 @@ class ActionHandler(
         step: ModificationStep.GradleModificationStep,
         model: ModificationModel
     ) {
-
-        val buildModuleModel: GradleBuildModel? = GradleModelProvider.get().getBuildModel(model.module)
+        val buildModuleModel: GradleBuildModel? = ProjectBuildModel.get(project).getModuleBuildModel(model.module)
 
         when (step) {
             is ModificationStep.GradleModificationStep.DependencyModification -> {

diff --git a/src/main/kotlin/utils/extensions/Ext.kt b/src/main/kotlin/utils/extensions/Ext.kt
@@ -8,11 +8,9 @@ import com.intellij.openapi.command.executeCommand
 import com.intellij.openapi.module.Module
 import com.intellij.openapi.wm.ToolWindowManager
 import com.intellij.psi.PsiBinaryFile
-import com.intellij.psi.PsiDirectory
 import com.intellij.psi.PsiElement
 import com.intellij.refactoring.copy.CopyHandler
 import org.jetbrains.android.facet.AndroidFacet
-import org.jetbrains.kotlin.idea.core.util.toPsiDirectory
 import org.jetbrains.kotlin.idea.util.application.runWriteAction
 import org.jetbrains.kotlin.idea.util.module
 import utils.extensions.isAndroidProject
@@ -27,12 +25,6 @@ fun AnActionEvent.getSelectedPsiElement(): PsiElement? = getData(PlatformDataKey
 val AnActionEvent.androidFacet: AndroidFacet?
     get() = getSelectedPsiElement()?.module?.androidFacet
 
-val Module.moduleParentPsiDirectory: PsiDirectory?
-    get() = moduleFile?.parent?.parent?.toPsiDirectory(project)
-
-val Module.rootPsiDirectory: PsiDirectory?
-    get() = moduleFile?.parent?.toPsiDirectory(project)
-
 fun execRunWriteAction(command: () -> Unit) {
     executeCommand {
         runWriteAction {