Merge pull request #33 from intuit/GED202104-fix_project_settings_bug

Ged202104 - fix project settings bug (#31)

Author: HilaG

.travis.yml

@@ -1,6 +1,6 @@
 language: java
 jdk:
-  - openjdk8
+  - openjdk11
 
 script:
   - ./gradlew build --scan -s
@@ -16,4 +16,4 @@ before_cache:
 cache:
   directories:
     - $HOME/.gradle/caches/
-    - $HOME/.gradle/wrapper/
+    - $HOME/.gradle/wrapper/

build.gradle

@@ -1,5 +1,5 @@
 buildscript {
-    ext.kotlin_version = '1.3.72'
+    ext.kotlin_version = '1.4.32'
 
     repositories {
         mavenCentral()
@@ -11,7 +11,7 @@ buildscript {
 }
 
 plugins {
-    id("org.jetbrains.intellij").version("0.4.21")
+    id "org.jetbrains.intellij" version "0.7.3"
 }
 apply plugin: 'kotlin'
 apply plugin: 'java'
@@ -20,7 +20,7 @@ apply plugin: 'jacoco'
 group 'com.intuit.intellij'
 
 intellij {
-    version '2020.2'
+    version '2020.2.1'
     pluginName rootProject.name
     /* set compatibility range to be *from* IntelliJ version
     and not constrict to specific major build */
@@ -35,7 +35,12 @@ repositories {
 
 sourceSets {
     main {
-        java { srcDirs 'src/main/java', 'gen' }
+        java { srcDirs 'src/main/java', 'gen'
+            compileJava {
+                sourceCompatibility = 11
+                targetCompatibility = 11
+            }
+        }
         kotlin.srcDir 'src/main/kotlin'
         resources.srcDir 'src/main/resources'
     }
@@ -67,8 +72,8 @@ jar {
 
 dependencies {
     compileProcessBuilder
-    implementation "com.fasterxml.jackson.core:jackson-core:2.9.9"
-    implementation "com.fasterxml.jackson.core:jackson-databind:2.9.9"
+    implementation "com.fasterxml.jackson.core:jackson-core:2.12.3"
+    implementation "com.fasterxml.jackson.core:jackson-databind:2.12.3"
     compileOnly "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
     testImplementation "org.hamcrest:hamcrest-all:1.3"
 }

src/main/java/com/intuit/ddb/CmdProcessBuilder.java

@@ -190,4 +190,4 @@ private static void prettyPrint(List<String> command) {
         System.out.println("\n");
     }
 
-}
+}

src/main/kotlin/com/intuit/ddb/DockDockBuildConfigurable.kt

@@ -12,16 +12,18 @@ import javax.swing.JComponent
 import javax.swing.JTextField
 
 // Docker Make project config
-class DockDockBuildConfigurable(project: Project?) : Configurable {
+class DockDockBuildConfigurable(project: Project) : Configurable {
 
-    private val settings = DockDockBuildProjectSettings()
+    private val settings = project.getService(DockDockBuildProjectSettings::class.java)
     private val dockerPathField = TextFieldWithBrowseButton()
     private val codePathField = TextFieldWithBrowseButton()
     private val mavenCachePathField = TextFieldWithBrowseButton()
     private val advancedDockerSettingsField = JTextField()
-    private val defaultCodePath = getDefaultCodePath(project!!)
 
     init {
+        // a hack since we don't always have 'project' in DockDockBuildProjectSettings
+        settings.settings.codePath = settings.settings.codePath.ifEmpty { getDefaultCodePath(project) }
+
         dockerPathField.addBrowseFolderListener(PLUGIN_NAME, "Path to Docker executable", project,
                 FileChooserDescriptor(true, false, false, false, false, false))
         codePathField.addBrowseFolderListener(PLUGIN_NAME, "Path to code root", project,
@@ -31,19 +33,19 @@ class DockDockBuildConfigurable(project: Project?) : Configurable {
     }
 
     override fun isModified(): Boolean {
-        return (settings.settings?.dockerPath != dockerPathField.text) ||
-                (settings.settings?.codePath != codePathField.text) ||
-                (settings.settings?.mavenCachePath != mavenCachePathField.text) ||
-                (settings.settings?.advancedDockerSettings != advancedDockerSettingsField.text)
+        return (settings.settings.dockerPath != dockerPathField.text) ||
+                (settings.settings.codePath != codePathField.text) ||
+                (settings.settings.mavenCachePath != mavenCachePathField.text) ||
+                (settings.settings.advancedDockerSettings != advancedDockerSettingsField.text)
     }
 
     override fun getDisplayName() = PLUGIN_NAME
 
     override fun apply() {
-        settings.settings?.dockerPath = dockerPathField.text
-        settings.settings?.codePath = codePathField.text
-        settings.settings?.mavenCachePath = mavenCachePathField.text
-        settings.settings?.advancedDockerSettings = advancedDockerSettingsField.text
+        settings.settings.dockerPath = dockerPathField.text
+        settings.settings.codePath = codePathField.text
+        settings.settings.mavenCachePath = mavenCachePathField.text
+        settings.settings.advancedDockerSettings = advancedDockerSettingsField.text
     }
 
     override fun createComponent(): JComponent {
@@ -64,11 +66,11 @@ class DockDockBuildConfigurable(project: Project?) : Configurable {
     }
 
     override fun reset() {
-        dockerPathField.text = settings.settings?.dockerPath ?: getDefaultDockerPath()
-        codePathField.text = settings.settings?.codePath ?: defaultCodePath
-        mavenCachePathField.text = settings.settings?.mavenCachePath ?: getDefaultM2Path()
-        advancedDockerSettingsField.text = settings.settings?.advancedDockerSettings ?: ""
+        dockerPathField.text = settings.settings.dockerPath
+        codePathField.text = settings.settings.codePath
+        mavenCachePathField.text = settings.settings.mavenCachePath
+        advancedDockerSettingsField.text = settings.settings.advancedDockerSettings
     }
 
     override fun getHelpTopic() = null
-}
+}

src/main/kotlin/com/intuit/ddb/DockDockBuildSettings.kt

@@ -1,8 +1,9 @@
 package com.intuit.ddb
 
 class DockDockBuildSettings {
-    var dockerPath: String? = null
-    var codePath: String? = null
-    var mavenCachePath: String? = null
-    var advancedDockerSettings: String? = null
-}
+    var dockerPath = getDefaultDockerPath()
+    var codePath = ""
+    var mavenCachePath = getDefaultM2Path()
+    var advancedDockerSettings = ""
+
+}

src/main/kotlin/com/intuit/ddb/conf/DockDockBuildProjectSettings.kt

@@ -6,13 +6,13 @@ import com.intellij.openapi.components.Storage
 import com.intellij.openapi.components.StoragePathMacros
 import com.intuit.ddb.DockDockBuildSettings
 
-@State(name = "DockDockBuild.Settings", storages = arrayOf(Storage(StoragePathMacros.WORKSPACE_FILE)))
+@State(name = "DockDockBuild.Settings", storages = [Storage(StoragePathMacros.WORKSPACE_FILE)])
 class DockDockBuildProjectSettings : PersistentStateComponent<DockDockBuildSettings> {
-  var settings: DockDockBuildSettings? = DockDockBuildSettings()
+  var settings: DockDockBuildSettings = DockDockBuildSettings()
 
   override fun getState() = settings
 
   override fun loadState(state: DockDockBuildSettings) {
     settings = state
   }
-}
+}

src/main/kotlin/com/intuit/ddb/conf/DockDockBuildRunConfiguration.kt

@@ -115,13 +115,13 @@ open class DockDockBuildRunConfiguration(project: Project, factoryDocker: DockDo
 
         // Plugin (project) configuration
         val dockerPath = ServiceManager.getService(project, DockDockBuildProjectSettings::class.java).
-                settings?.dockerPath ?: getDefaultDockerPath()
+                settings.dockerPath
         val codePath = ServiceManager.getService(project, DockDockBuildProjectSettings::class.java).
-                settings?.codePath ?: getDefaultCodePath(project)
+                settings.codePath
         val m2Path = ServiceManager.getService(project, DockDockBuildProjectSettings::class.java).
-                settings?.mavenCachePath ?: getDefaultM2Path()
+                settings.mavenCachePath
         val advancedDockerSettings = ServiceManager.getService(project, DockDockBuildProjectSettings::class.java).
-                settings?.advancedDockerSettings ?: ""
+                settings.advancedDockerSettings
 
         // Runtime configurations
         // on host

src/main/kotlin/com/intuit/ddb/conf/DockDockBuildRunConfigurationEditor.kt

@@ -54,7 +54,7 @@ class DockDockBuildRunConfigurationEditor(private val project: Project) : Settin
                 .addSeparator()
                 .addLabeledComponent("&Makefile", makeFilenameField)
                 .addLabeledComponent("&Target", targetField)
-                .addLabeledComponent("&Environment Script", envScriptPathField)
+                .addLabeledComponent("&Environment script", envScriptPathField)
                 .addSeparator()
                 .addComponent(environmentVarsComponent)
                 .panel
@@ -91,7 +91,7 @@ class DockDockBuildRunConfigurationEditor(private val project: Project) : Settin
             }
         })
 
-        envScriptPathField.addBrowseFolderListener("Environment script", "Environment script path",
+        envScriptPathField.addBrowseFolderListener("Environment Script", "Environment script path",
                 project, FileChooserDescriptorFactory.createSingleFileDescriptor("sh"))
         envScriptPathField.textField.document.addDocumentListener(object : DocumentAdapter() {
             override fun textChanged(event: DocumentEvent) {
@@ -173,4 +173,4 @@ class DockDockBuildRunConfigurationEditor(private val project: Project) : Settin
 
     }
 
-}
+}

src/main/kotlin/name/kropp/intellij/makefile/MakefileTargetRunLineMarkerContributor.kt

@@ -17,10 +17,10 @@ class MakefileTargetRunLineMarkerContributor : RunLineMarkerContributor() {
         if (targetList.firstOrNull() == target &&
             targetList.any { !it.isSpecialTarget }) {
           // IGNORE ERR
-          return Info(MakefileTargetIcon, { "" }, targetList.map(::DockDockBuildRunTargetAction).toTypedArray())
+          return Info(MakefileTargetIcon, { "" }, *targetList.map(::DockDockBuildRunTargetAction).toTypedArray())
         }
       }
     }
     return null
   }
-}
+}

src/main/resources/META-INF/plugin.xml

@@ -1,16 +1,16 @@
 <idea-plugin>
   <id>com.intuit.intellij.makefile</id>
   <name>DockDockBuild</name>
-  <version>1.0.13</version>
+  <version>1.0.14</version>
   <vendor email="[email protected]" url="https://www.intuit.com/">Intuit</vendor>
 
   <description>Support for running UNIX Makefiles on a Docker container</description>
 
   <change-notes>
-    1. Update deprecated IntelliJ APIs
+    1. Fix project settings bug https://github.com/intuit/DockDockBuild/issues/31
   </change-notes>
 
-  <idea-version since-build="202.4357.23"/>
+  <idea-version since-build="202.6948.69"/>
 
   <depends>com.intellij.modules.lang</depends>
   <depends>com.intellij.modules.platform</depends>