chore: Try tweaking verifyPlugin config to avoid configuration error

bric3 · May 17, 2024 · 3b9f841 · 3b9f841
1 parent 061dbeb
commit 3b9f841
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 25 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -122,7 +122,7 @@ jobs:
 
       # Run Verify Plugin task and IntelliJ Plugin Verifier tool
       - name: Run Plugin Verification tasks
-        run: ./gradlew runPluginVerifier -Pplugin.verifier.home.dir=${{ steps.properties.outputs.pluginVerifierHomeDir }}
+        run: ./gradlew verifyPlugin -Pplugin.verifier.home.dir=${{ steps.properties.outputs.pluginVerifierHomeDir }}
 
       # Collect Plugin Verifier Result
       - name: Collect Plugin Verifier Result

diff --git a/plugin/build.gradle.kts b/plugin/build.gradle.kts
@@ -35,14 +35,16 @@ dependencies {
         bundledPlugins(providers.gradleProperty("platformBundledPlugins").map { it.split(',') }.getOrElse(emptyList()))
 
         // instrumentationTools()
-        // pluginVerifier()
-        // zipSigner()
+        pluginVerifier()
+        zipSigner()
     }
 
     testImplementation(kotlin("test"))
 }
 
-// Read more: https://github.com/JetBrains/gradle-intellij-plugin
+// Read more:
+// * https://github.com/JetBrains/intellij-platform-gradle-plugin/
+// * https://plugins.jetbrains.com/docs/intellij/tools-intellij-platform-gradle-plugin.html
 intellijPlatform {
     pluginConfiguration {
         id = providers.gradleProperty("pluginId")
@@ -98,21 +100,20 @@ intellijPlatform {
         }.map { listOf(it) }
     }
 
-    // verifyPlugin {
-    //     ides {
-    // //         ides(providers.gradleProperty("pluginVerifierIdeVersions").map { it.split(',') }.getOrElse(emptyList()))
-    // //         recommended()
-    // //         // channels = listOf(ProductRelease.Channel.RELEASE)
-    //
-    // // try
-    // //         select {
-    // //             types = listOf(IntelliJPlatformType.IntellijIdeaCommunity)
-    // //             channels = listOf(ProductRelease.Channel.RELEASE)
-    // //             sinceBuild = "223"
-    // //             untilBuild = "241.*"
-    // //         }
-    //    }
-    // }
+    verifyPlugin {
+        ides {
+            ides(providers.gradleProperty("pluginVerifierIdeVersions").map { it.split(',') }.getOrElse(emptyList()))
+            // recommended()
+            // channels = listOf(ProductRelease.Channel.RELEASE)
+
+            select {
+                types = listOf(IntelliJPlatformType.IntellijIdeaCommunity)
+                channels = listOf(ProductRelease.Channel.RELEASE, ProductRelease.Channel.RC)
+                sinceBuild = "223"
+                untilBuild = "241.*"
+            }
+       }
+    }
 }
 
 // Read more: https://github.com/JetBrains/gradle-changelog-plugin
@@ -176,18 +177,14 @@ tasks {
         }
     }
 
-    // runPluginVerifier {
-    //     ideVersions = properties("pluginVerifierIdeVersions").split(',').map(String::trim).filter(String::isNotEmpty)
-    // }
-
     runIde {
         dependsOn(processResources)
         applySystemProperties()
     }
 
-    // val runIdeUltimate by registering(CustomRunIdeTask::class) {
+    // val runIdeUltimate by registering(org.jetbrains.intellij.platform.gradle.tasks.CustomRunIdeTask::class) {
     //     type = IntelliJPlatformType.IntellijIdeaUltimate
-    //     version = providers.gradleProperty("intellij.version")
+    //     version = providers.gradleProperty("platformVersion")
     //
     //     applySystemProperties()
     // }