minor improvements

- upgraded core lib
- update Gradle projects after they were loaded too
- updated plugin icon
- added progress bar to notify the user about whats going on

Author: repolevedavaj

CHANGELOG.md

@@ -4,16 +4,12 @@
 
 ## [Unreleased]
 ### Added
+- Added simple progress bar to notify the user about the running Project-Env process.
 
 ### Changed
-
-### Deprecated
-
-### Removed
-
-### Fixed
-
-### Security
+- Updated Project-Env core library to version `1.1.0`.
+- Gradle project's are updated now after they were loaded too.
+- Improved plugin icon.
 
 ## [1.0.1]
 ### Fixed

README.md

@@ -1,4 +1,4 @@
-# project-env-intellij-plugin
+# Project-Env IntelliJ-Plugin
 
 ![Build](https://github.com/Project-Env/project-env-intellij-plugin/workflows/Build/badge.svg)
 [![Version](https://img.shields.io/jetbrains/plugin/v/15746-project-env.svg)](https://plugins.jetbrains.com/plugin/15746-project-env)

build.gradle.kts

@@ -43,7 +43,7 @@ repositories {
     }
 }
 dependencies {
-    implementation("io.projectenv:core:1.0.0")
+    implementation("io.projectenv:core:1.1.0")
     testImplementation("org.assertj:assertj-core:3.19.0")
 }
 

gradle.properties

@@ -3,15 +3,15 @@
 
 pluginGroup = io.projectenv.intellijplugin
 pluginName_ = Project-Env
-pluginVersion = 1.0.1
+pluginVersion = 1.1.0
 pluginSinceBuild = 203
-pluginUntilBuild = 203.*
+pluginUntilBuild = 211.*
 # Plugin Verifier integration -> https://github.com/JetBrains/gradle-intellij-plugin#plugin-verifier-dsl
 # See https://jb.gg/intellij-platform-builds-list for available build versions
-pluginVerifierIdeVersions = 2020.3
+pluginVerifierIdeVersions = 2021.1
 
 platformType = IU
-platformVersion = 2020.3
+platformVersion = LATEST-EAP-SNAPSHOT
 platformDownloadSources = true
 # Plugin Dependencies -> https://www.jetbrains.org/intellij/sdk/docs/basics/plugin_structure/plugin_dependencies.html
 # Example: platformPlugins = com.intellij.java, com.jetbrains.php:203.4449.22

src/main/kotlin/io/projectenv/intellijplugin/configurers/gradle/GradleConfigurer.kt

@@ -29,5 +29,12 @@ class GradleConfigurer(val project: Project) : ToolConfigurer<GradleInfo> {
                 projectSettings.gradleHome = toolInfo.location.canonicalPath
             }
         }
+
+        override fun onProjectsLoaded(settings: MutableCollection<GradleProjectSettings>) {
+            for (projectSettings in settings) {
+                projectSettings.distributionType = DistributionType.LOCAL
+                projectSettings.gradleHome = toolInfo.location.canonicalPath
+            }
+        }
     }
 }

src/main/kotlin/io/projectenv/intellijplugin/services/impl/ProjectEnvServiceImpl.kt

@@ -1,7 +1,9 @@
 package io.projectenv.intellijplugin.services.impl
 
+import com.intellij.openapi.application.ApplicationManager
 import com.intellij.openapi.components.service
 import com.intellij.openapi.extensions.ProjectExtensionPointName
+import com.intellij.openapi.progress.ProgressManager
 import com.intellij.openapi.project.Project
 import io.projectenv.core.configuration.ProjectEnvConfiguration
 import io.projectenv.core.configuration.ProjectEnvConfigurationFactory
@@ -10,23 +12,40 @@ import io.projectenv.core.toolinfo.ToolInfo
 import io.projectenv.intellijplugin.configurers.ToolConfigurer
 import io.projectenv.intellijplugin.services.ExecutionEnvironmentService
 import io.projectenv.intellijplugin.services.ProjectEnvService
+import org.slf4j.LoggerFactory
 import java.io.File
 
 class ProjectEnvServiceImpl(val project: Project) : ProjectEnvService {
 
-    private val TOOL_CONFIGURER_EXTENSION_POINT_NAME: ProjectExtensionPointName<ToolConfigurer<ToolInfo>> =
+    private val logger = LoggerFactory.getLogger(this.javaClass)
+
+    private val toolConfigurerExtensionPoint: ProjectExtensionPointName<ToolConfigurer<ToolInfo>> =
         ProjectExtensionPointName("ch.repolevedavaj.projectenv.intellijplugin.toolConfigurer")
 
     override fun refreshProjectEnv() {
-        val configurationFile = File(project.basePath, "project-env.yml")
-        if (configurationFile.exists()) {
-            val projectEnvConfiguration: ProjectEnvConfiguration =
-                ProjectEnvConfigurationFactory.createFromFile(configurationFile)
-
-            val toolDetailsList = installTools(projectEnvConfiguration)
-            configureExecutionEnvironment(toolDetailsList)
-            configureTools(toolDetailsList)
-        }
+        ProgressManager.getInstance().runProcessWithProgressSynchronously(
+            {
+                try {
+                    val configurationFile = File(project.basePath, "project-env.yml")
+                    if (configurationFile.exists()) {
+                        val projectEnvConfiguration: ProjectEnvConfiguration =
+                            ProjectEnvConfigurationFactory.createFromFile(configurationFile)
+
+                        val toolDetailsList = installTools(projectEnvConfiguration)
+                        configureExecutionEnvironment(toolDetailsList)
+
+                        ApplicationManager.getApplication().invokeLater {
+                            configureTools(toolDetailsList)
+                        }
+                    }
+                } catch (exception: Exception) {
+                    logger.error("failed to refresh project environment", exception)
+                }
+            },
+            "Installing Project-Env",
+            false,
+            project
+        )
     }
 
     private fun installTools(projectEnvConfiguration: ProjectEnvConfiguration): List<ToolInfo> {
@@ -51,7 +70,7 @@ class ProjectEnvServiceImpl(val project: Project) : ProjectEnvService {
 
     private fun configureTools(toolInfos: List<ToolInfo>) {
         for (toolInfo in toolInfos) {
-            for (toolConfigurer in TOOL_CONFIGURER_EXTENSION_POINT_NAME.extensions(project)) {
+            for (toolConfigurer in toolConfigurerExtensionPoint.extensions(project)) {
                 if (toolConfigurer.supportsType(toolInfo)) {
                     toolConfigurer.configureTool(toolInfo)
                 }