Hotfix for missing methods in the new DSL v2 and disabled control val…

…idation
JetBrains · Jan 24, 2022 · e35af90 · e35af90
1 parent 177dc98
commit e35af90
Show file tree

Hide file tree

Showing 7 changed files with 18 additions and 10 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,10 @@
+<h2>1.2.1</h2>
+<p>
+  <ul>
+    <li>Fix: NoSuchMethodError using the new DSL v2</li>
+    <li>Fix: Disabled optional fields require validation</li>
+  </ul>
+</p>
 <h2>1.2.0</h2>
 <p>
   <ul>

diff --git a/build.gradle b/build.gradle
@@ -4,14 +4,14 @@ import org.apache.tools.ant.taskdefs.condition.Os
 plugins {
     id 'java'
     id 'org.jetbrains.kotlin.jvm' version '1.5.30'
-    id 'org.jetbrains.intellij' version '1.2.0'     // https://github.com/JetBrains/gradle-intellij-plugin/releases
+    id 'org.jetbrains.intellij' version '1.3.1'     // https://github.com/JetBrains/gradle-intellij-plugin/releases
     id 'com.jetbrains.rdgen' version '0.213.391'    // https://www.myget.org/feed/rd-snapshots/package/maven/com.jetbrains.rd/rd-gen
 }
 
 ext {
     isWindows = Os.isFamily(Os.FAMILY_WINDOWS)
     rdLibDirectory = {
-        new File(intellij.getIdeaDependency(project).classes, "lib/rd")
+        new File(setupDependencies.idea.get().classes, "lib/rd")
     }
 }
 

diff --git a/gradle.properties b/gradle.properties
@@ -5,7 +5,7 @@ javaVersion=11
 DotnetPluginId=Rider.Plugins.EfCore
 DotnetSolution=Rider.Plugins.EfCore.sln
 RiderPluginId=me.seclerp.rider.plugins.efcore
-PluginVersion=1.2.0
+PluginVersion=1.2.1
 
 BuildConfiguration=Debug
 
@@ -19,7 +19,7 @@ RiderSdkVersion=2021.3.0
 #   Release:  2020.2
 #   Nightly:  2020.3-SNAPSHOT
 #   EAP:      2020.3-EAP2-SNAPSHOT
-ProductVersion=2021.3
+ProductVersion=2021.3.2
 
 # Kotlin 1.4 will bundle the stdlib dependency by default, causing problems with the version bundled with the IDE
 # https://blog.jetbrains.com/kotlin/2020/07/kotlin-1-4-rc-released/#stdlib-default

diff --git a/...n/me/seclerp/rider/plugins/efcore/features/database/update/UpdateDatabaseDialogWrapper.kt b/...n/me/seclerp/rider/plugins/efcore/features/database/update/UpdateDatabaseDialogWrapper.kt
@@ -70,7 +70,8 @@ class UpdateDatabaseDialogWrapper(
                         .bindText(model::connection)
                         .validationOnInput(validator.connectionValidation())
                         .validationOnApply(validator.connectionValidation())
-                }.enabledIf(useDefaultConnectionCheckbox!!.selected.not())
+                        .enabledIf(useDefaultConnectionCheckbox!!.selected.not())
+                }
             }
         }
     }

diff --git a/...otlin/me/seclerp/rider/plugins/efcore/features/database/update/UpdateDatabaseValidator.kt b/...otlin/me/seclerp/rider/plugins/efcore/features/database/update/UpdateDatabaseValidator.kt
@@ -17,7 +17,7 @@ class UpdateDatabaseValidator(
     }
 
     fun connectionValidation(): ValidationInfoBuilder.(JBTextField) -> ValidationInfo? = {
-        if (it.text.isEmpty())
+        if (it.isEnabled && it.text.isEmpty())
             error("Connection could not be empty")
         else null
     }

diff --git a/...ider/main/kotlin/me/seclerp/rider/plugins/efcore/features/shared/EfCoreDialogValidator.kt b/...ider/main/kotlin/me/seclerp/rider/plugins/efcore/features/shared/EfCoreDialogValidator.kt
@@ -59,14 +59,14 @@ class EfCoreDialogValidator(
     }
 
     fun buildConfigurationValidation(): ValidationInfoBuilder.(ComboBox<BuildConfigurationItem>) -> ValidationInfo? = {
-        if (commonOptions.buildConfiguration == null || availableBuildConfigurations.isEmpty())
+        if (it.isEnabled && (commonOptions.buildConfiguration == null || availableBuildConfigurations.isEmpty()))
             error("Solution doesn't have any build configurations")
         else
             null
     }
 
     fun targetFrameworkValidation(): ValidationInfoBuilder.(ComboBox<BaseTargetFrameworkItem>) -> ValidationInfo? = {
-        if (commonOptions.targetFramework == null || targetFrameworkModel.size == 0)
+        if (it.isEnabled && (commonOptions.targetFramework == null || targetFrameworkModel.size == 0))
             error("Startup project should have at least 1 supported target framework")
         else
             null

diff --git a/src/rider/main/resources/META-INF/plugin.xml b/src/rider/main/resources/META-INF/plugin.xml
@@ -1,9 +1,9 @@
 <idea-plugin require-restart="true">
   <id>me.seclerp.rider.plugins.efcore</id>
   <name>Entity Framework Core UI</name>
-  <version>1.2.0</version>
+  <version>1.2.1</version>
   <vendor url="https://github.com/seclerp">Andrew Rublyov</vendor>
-  <idea-version since-build="2021.3" />
+  <idea-version since-build="2021.3.2" />
   <depends>com.intellij.modules.rider</depends>
 
   <description>