gradle intellij platform 2.* build migration CI issues.

- build cleanup. amend plugin publishing properties
wrdv · Sep 16, 2024 · 94cb492 · 94cb492
1 parent 628a63c
commit 94cb492
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 62 deletions.
diff --git a/build.gradle b/build.gradle
@@ -1,7 +1,7 @@
 import org.gradle.api.tasks.testing.logging.TestExceptionFormat
 import org.gradle.api.tasks.testing.logging.TestLogEvent
 import org.jetbrains.intellij.platform.gradle.TestFrameworkType
-//import org.jetbrains.intellij.platform.gradle.IntelliJPlatformType
+import org.jetbrains.intellij.platform.gradle.IntelliJPlatformType
 
 plugins {
     id 'jacoco'
@@ -51,43 +51,14 @@ dependencies {
         prepareTestSandbox {
             disabledPlugins = turnOffPlugins
         }
-
-//        pluginVerifier()
-//        zipSigner()
-//    pluginVerification {
-//        freeArgs = listOf(
-//                "-mute",
-//                "TemplateWordInPluginId,ForbiddenPluginIdPrefix"
-//        )
-//    }
-//        testFramework(TestFrameworkType.Platform.INSTANCE)
+        pluginVerifier()
         testFramework(TestFrameworkType.JUnit5.INSTANCE)
         testFramework(TestFrameworkType.Plugin.Java.INSTANCE)
         pluginModule(implementation(project(':testme-intellij-common')))
         pluginModule(implementation(project(':testme-intellij-groovy')))
         pluginModule(implementation(project(':testme-intellij-scala')))
     }
 
-//    implementation(project(':testme-intellij-common')) {
-//        exclude group: 'com.jetbrains', module: 'ideaIC'
-//        exclude group: 'org.jetbrains.plugins', module: 'junit'
-//        exclude group: 'org.jetbrains.plugins', module: 'properties'
-//        exclude group: 'org.jetbrains.plugins', module: 'Groovy'
-//    }
-//    implementation(project(':testme-intellij-groovy')) {
-//        exclude group: 'com.jetbrains', module: 'ideaIC'
-//        exclude group: 'org.jetbrains.plugins', module: 'junit'
-//        exclude group: 'org.jetbrains.plugins', module: 'properties'
-//        exclude group: 'org.jetbrains.plugins', module: 'Groovy'
-//    }
-//    implementation(project(':testme-intellij-scala')) {
-//        exclude group: 'com.jetbrains', module: 'ideaIC'
-//        exclude group: 'org.jetbrains.plugins', module: 'junit'
-//        exclude group: 'org.jetbrains.plugins', module: 'properties'
-//        exclude group: 'org.jetbrains.plugins', module: 'Groovy'
-//        exclude group: 'org.jetbrains.plugins', module: 'Scala'
-//    }
-//
     compileOnly 'org.projectlombok:lombok:1.18.20'
     annotationProcessor 'org.projectlombok:lombok:1.18.20'
 
@@ -114,6 +85,17 @@ intellijPlatform {
         token = System.getenv("ORG_GRADLE_PROJECT_intellijPublishToken")
         channels = [ideaPublishChannel]
     }
+    pluginVerification {
+        ides {
+            recommended()
+//            ide IntelliJPlatformType.IntellijIdeaUltimate, "2023.3"
+//            ide IntelliJPlatformType.IntellijIdeaCommunity, "2024.2"
+        }
+//            freeArgs = listOf(
+//                "-mute",
+//                "TemplateWordInPluginId,ForbiddenPluginIdPrefix"
+//            )
+    }
 }
 
 allprojects {
@@ -183,7 +165,6 @@ jacocoTestReport {
     outputs.upToDateWhen { false } // Always generate report
 }
 
-
 //tasks.register('jacocoRootReport', JacocoReport) {
 //    description = 'Generates an aggregate report from all subprojects'
 //    dependsOn check, jacocoMerge
@@ -201,6 +182,7 @@ jacocoTestReport {
 //        html.destination file("${buildDir}/jacocoHtml")
 //    }
 //}
+
 def javadocHeader = ""
 task templateContextJavadocs(type: Javadoc, description: 'Generate javadocs for template context', group: 'Documentation') {
     dependsOn delombok

diff --git a/gradle.properties b/gradle.properties
@@ -1,21 +1,18 @@
-group =  'com.weirddev.testme'
+group =  com.weirddev.testme
 testMeVersion = 6.7.0
 
-#jvmTargetVersion = 1.8
 jvmTargetVersion = 17
-#jbrJvmVersion= 11_0_2b159
 
 #If JAVA_HOME env var does not point to JDK 6 installation dir - run gradle while with systems/env var - javaHome
 javaHome=
 org.gradle.jvmargs=-XX:+HeapDumpOnOutOfMemoryError -Xmx1024m -Dfile.encoding=utf-8 -Dkotlin.daemon.jvm.options=--illegal-access=permit -Djava.awt.headless=true
 #org.gradle.unsafe.configuration-cache = true
 
 #Supported versions:
-#ideaVersion = 2024.2.1
 ideaType = IC
 ideaVersion = 2023.2
+#ideaVersion = 2024.2.1
 #ideaVersion = LATEST-EAP-SNAPSHOT
-#ideaVersion = 233.11799-EAP-CANDIDATE-SNAPSHOT
 ideaPublishChannel =
 #ideaPublishChannel = EAP
 

diff --git a/src/main/resources/META-INF/plugin.xml b/src/main/resources/META-INF/plugin.xml
@@ -1,9 +1,10 @@
 <idea-plugin>
-  <id>com.weirddev.testme</id>
-  <name>TestMe</name>
-  <version>6.6.0</version>
+<!--  plugin.xml properties patched by build tasks: -->
+<!--  <id>com.weirddev.testme</id>-->
+<!--  <name>TestMe</name>-->
+<!--  <version>6.6.0</version>-->
+<!--  <idea-version since-build="232" until-build="241.*"/>-->
   <vendor email="testme@weirddev.com" url="https://weirddev.com">WeirdDev</vendor>
-
   <description><![CDATA[
    <p>Auto Generate Unit Tests in Java, Groovy or Scala.</p>
    <p>No more boilerplate!</p>
@@ -19,14 +20,12 @@
     ]]></description>
   <change-notes><![CDATA[
         <ul>
-          <li>Generate Test Methods selection popup - Added a checkout to include/exclude inherited methods (contributed by <a href="https://github.com/zhangfj88">zhangfj88</a> - <a href="https://github.com/wrdv/testme-idea/pull/44">PR #44</a>)</li>
-          <li>bugfix: Lombok generated @superbuilder results in NPE (contributed by <a href="https://github.com/huangliang992">HuangLiang</a> - <a href="https://github.com/wrdv/testme-idea/pull/45">PR #45</a>, raised in <a href="https://github.com/wrdv/testme-idea/pull/43">Issue #43</a>, raised by <a href="https://github.com/winint1988">winint1988</a>)</li>
+          <li>Support IDEA 2024.2 with new IDEA plugins build system (contributed by <a href="https://github.com/huangliang992">HuangLiang</a> - <a href="https://github.com/wrdv/testme-idea/pull/48">PR #48</a>. raised in <a href="https://github.com/wrdv/testme-idea/issues/47">Issue #47</a> by <a href="https://github.com/sycho-c">sycho-c</a>)</li>
         </ul>
         <a href="https://weirddev.com/testme/release-notes">Complete Release Notes listing</a>
     ]]>
   </change-notes>
   <!-- please see https://confluence.jetbrains.com/display/IDEADEV/Build+Number+Ranges for description -->
-  <idea-version since-build="232" until-build="241.*"/>
   <depends>com.intellij.modules.java</depends>
   <depends>JUnit</depends>
   <depends optional="true" config-file="plugin-groovy.xml">org.intellij.groovy</depends>

diff --git a/testme-intellij-common/build.gradle b/testme-intellij-common/build.gradle
@@ -13,12 +13,6 @@ repositories {
     }
 }
 
-//intellijPlatform {
-//    pluginConfiguration {
-//        name = 'TestMe-common'
-//    }
-//}
-
 dependencies {
     intellijPlatform {
         create(providers.gradleProperty("ideaType"), providers.gradleProperty("ideaVersion"), useInstaller)

diff --git a/testme-intellij-groovy/build.gradle b/testme-intellij-groovy/build.gradle
@@ -12,12 +12,6 @@ repositories {
     }
 }
 
-//intellijPlatform {
-//    pluginConfiguration {
-//        name = 'TestMe-groovy'
-//    }
-//}
-
 dependencies {
     intellijPlatform {
         create(providers.gradleProperty("ideaType"), providers.gradleProperty("ideaVersion"), useInstaller)

diff --git a/testme-intellij-scala/build.gradle b/testme-intellij-scala/build.gradle
@@ -12,12 +12,6 @@ repositories {
     }
 }
 
-//intellijPlatform {
-//    pluginConfiguration {
-//        name = 'TestMe-scala'
-//    }
-//}
-
 dependencies {
     intellijPlatform {
         create(providers.gradleProperty("ideaType"), providers.gradleProperty("ideaVersion"), useInstaller)