Merge pull request #409 from Checkmarx/feature/project_ignite_AST-131708

Project Ignite Phase I - Forking Jetbrains Plugin (AST-131708)

Author: cx-anand-nandeshwar

.github/workflows/ci.yml

@@ -44,15 +44,16 @@ jobs:
           export DISPLAY=:99.0
           Xvfb -ac :99 -screen 0 1920x1080x24 &
           sleep 10
-          ./gradlew -i runIdeForUiTests > idea.log 2>&1 &
+          ./gradlew -i :plugin-checkmarx-ast:runIdeForUiTests > idea.log 2>&1 &
+          sleep 30
       # Wait for IDEA to be started
       - name: Health Check
         run: curl --fail -sv --retry "15" --retry-delay "10" --retry-connrefused "http://127.0.0.1:8580"
       # Run tests
       - name: Tests
         run: |
           export DISPLAY=:99.0
-          ./gradlew test -PuiWaitDuration=800  --info --tests com.checkmarx.intellij.ui*
+          ./gradlew :plugin-checkmarx-ast:test -PuiWaitDuration=800 --info --tests "com.checkmarx.intellij.ast.test.ui*"
       - name: Move video
         if: ${{ failure() }}
         run: mv video build/reports
@@ -92,28 +93,35 @@ jobs:
       - name: Run Tests with coverage report
         id: test_results
         run: |
-          ./gradlew test --tests "com.checkmarx.intellij.unit*" jacocoTestReport \
-            -PjacocoTask=unit
+          ./gradlew :plugin-checkmarx-ast:test --tests "com.checkmarx.intellij.ast.test.unit*" \
+                    :devassist-lib:test --tests "com.checkmarx.intellij.devassist.test*" \
+                    :plugin-checkmarx-devassist:test --tests "com.checkmarx.intellij.cxdevassist.test*" \
+                    :plugin-checkmarx-ast:jacocoTestReport \
+                    :devassist-lib:jacocoTestReport \
+                    :plugin-checkmarx-devassist:jacocoTestReport \
+                    -PjacocoTask=unit
 
       - name: Generate JaCoCo Badge
         uses: cicirello/jacoco-badge-generator@f33476a5a3fd5a4f77cb5eef2ebe728c1dd5b921 #v2.11.0
         with:
-          jacoco-csv-file: build/reports/jacoco/test/jacocoTestReport.csv
+          jacoco-csv-file: plugin-checkmarx-ast/build/reports/jacoco/test/jacocoTestReport.csv
 
       # Save coverage report as an artifact
       - name: Upload Coverage Report
         uses: actions/upload-artifact@v4
         with:
           name: unit-coverage-report
-          path: build/reports/jacoco/test/html/
+          path: plugin-checkmarx-ast/build/reports/jacoco/test/html/
       # Save report if tests fail
       - name: Save fails report
         if: ${{ failure() }}
         uses: actions/upload-artifact@v4
         with:
-          name: test-fails-report-integration
+          name: test-fails-report-unit
           path: |
-            build/reports
+            plugin-checkmarx-ast/build/reports/tests
+            devassist-lib/build/reports/tests
+            plugin-checkmarx-devassist/build/reports/tests
 
   testIntegration:
     runs-on: ubuntu-latest
@@ -134,25 +142,26 @@ jobs:
       - name: Run Tests with coverage report
         id: test_results
         run: |
-          ./gradlew test --tests "com.checkmarx.intellij.integration.standard*" jacocoTestReport \
-            -PjacocoTask=integration
+          ./gradlew :plugin-checkmarx-ast:test --tests "com.checkmarx.intellij.ast.test.integration.standard*" \
+                    :plugin-checkmarx-ast:jacocoTestReport \
+                    -PjacocoTask=integration
 
       - name: Generate JaCoCo Badge
         uses: cicirello/jacoco-badge-generator@f33476a5a3fd5a4f77cb5eef2ebe728c1dd5b921 #v2.11.0
         with:
-          jacoco-csv-file: build/reports/jacoco/test/jacocoTestReport.csv
+          jacoco-csv-file: plugin-checkmarx-ast/build/reports/jacoco/test/jacocoTestReport.csv
 
       # Save coverage report as an artifact
       - name: Upload Coverage Report
         uses: actions/upload-artifact@v4
         with:
           name: integration-coverage-report
-          path: build/reports/jacoco/test/html/
+          path: plugin-checkmarx-ast/build/reports/jacoco/test/html/
       # Save report if tests fail
       - name: Save fails report
         if: ${{ failure() }}
         uses: actions/upload-artifact@v4
         with:
           name: test-fails-report-integration
           path: |
-            build/reports
+            plugin-checkmarx-ast/build/reports/tests

.github/workflows/update-wrapper-version.yml

@@ -7,6 +7,10 @@ on:
         description: "Specify a version (e.g., 1.2.3). Leave empty for the latest official version."
         required: false
         default: ""
+      base_branch:
+        description: "Target branch for PR (e.g., main, demo). Leave empty for default branch."
+        required: false
+        default: ""
   repository_dispatch:
     types: [java-wrapper-version-update]
 
@@ -20,12 +24,19 @@ jobs:
     steps:
       - name: Checkout Repository
         uses: actions/checkout@v4
+        with:
+          ref: ${{ github.event.inputs.base_branch || github.event.repository.default_branch }}
 
       - name: Determine Version
         id: get_version
         run: |
+          # Check for manual workflow_dispatch input first
           if [[ -n "${{ github.event.inputs.version }}" ]]; then
             VERSION="${{ github.event.inputs.version }}"
+          # Then check for repository_dispatch payload
+          elif [[ -n "${{ github.event.client_payload.cli_version }}" ]]; then
+            VERSION="${{ github.event.client_payload.cli_version }}"
+          # Fall back to fetching latest version
           else
             VERSION=$(curl -s "https://api.github.com/repos/Checkmarx/ast-cli-java-wrapper/releases" | jq -r '[.[] | .tag_name | select(test("^[0-9]+\\.[0-9]+\\.[0-9]+$"))] | sort_by(split(".") | map(tonumber)) | .[-1]')
           fi
@@ -42,15 +53,15 @@ jobs:
           echo "VERSION=$VERSION"
           echo "VERSION=$VERSION" >> $GITHUB_ENV
 
-      - name: Update build.gradle File
+      - name: Update gradle.properties File
         run: |
-          sed -i "s|com.checkmarx.ast:ast-cli-java-wrapper:[0-9]*\\.[0-9]*\\.[0-9]*|com.checkmarx.ast:ast-cli-java-wrapper:${VERSION}|" build.gradle
+          sed -i "s|defaultJavaWrapperVersion=[0-9]*\\.[0-9]*\\.[0-9]*|defaultJavaWrapperVersion=${VERSION}|" gradle.properties
 
       - name: Commit Changes
         run: |
           git config --global user.name "github-actions"
           git config --global user.email "github-actions@github.com"
-          git add build.gradle
+          git add gradle.properties
           git commit -m "Update AST CLI Java Wrapper to version ${VERSION}"
 
       - name: Create Pull Request
@@ -63,5 +74,6 @@ jobs:
             Updates the AST CLI Java Wrapper to version `${{ env.VERSION }}`
 
             Auto-generated by [create-pull-request][2]
+          base: ${{ github.event.inputs.base_branch || github.event.repository.default_branch }}
           labels: cxone
           branch: other/update_java_wrapper_${{ env.VERSION }}

build.gradle

@@ -1,142 +1,82 @@
 plugins {
-    id 'io.freefair.lombok' version '8.6'
-    id 'org.jetbrains.intellij' version '1.17.4'
+    id 'io.freefair.lombok' version "${lombokPluginVersion}"
+    id 'org.jetbrains.intellij' version "${intellijPluginVersion}"
     id 'java'
     id 'jacoco'
 }
 
-group 'com.checkmarx'
-version System.getenv('RELEASE_VERSION') ?: "dev"
+def javaWrapperVersion = System.getenv('JAVA_WRAPPER_VERSION') ?: defaultJavaWrapperVersion
 
-def javaWrapperVersion = System.getenv('JAVA_WRAPPER_VERSION')
-def remoteRobotVersion = '0.11.23'
+// Common configuration for all projects
+allprojects {
+    group "${projectGroup}"
+    version System.getenv('RELEASE_VERSION') ?: "dev"
 
-repositories {
-
-    mavenCentral()
-    maven {
-        url = 'https://packages.jetbrains.team/maven/p/ij/intellij-dependencies'
-    }
-    maven {
-        url = 'https://oss.sonatype.org/content/repositories/snapshots'
+    repositories {
+        mavenCentral()
+        maven {
+            url = 'https://packages.jetbrains.team/maven/p/ij/intellij-dependencies'
+        }
+        maven {
+            url = 'https://oss.sonatype.org/content/repositories/snapshots'
+        }
     }
 }
 
-jacoco {
-    toolVersion = "0.8.12"
-}
+// Common configuration for all submodules
+subprojects {
+    apply plugin: 'java'
 
-dependencies {
-    testImplementation 'com.intellij.remoterobot:remote-robot:' + remoteRobotVersion
-    testImplementation('com.intellij.remoterobot:remote-fixtures:' + remoteRobotVersion) {
-        exclude group: 'com.square.okio', module: 'okio'
+    java {
+        toolchain {
+            languageVersion.set(JavaLanguageVersion.of(Integer.parseInt(javaVersion)))
+        }
     }
-    testImplementation 'com.squareup.okio:okio:3.8.0'
-    testImplementation 'org.junit.jupiter:junit-jupiter-api:5.10.1'
-    testImplementation 'com.squareup.okhttp3:okhttp:4.12.0'
-    testImplementation 'junit:junit:4.11-redhat-1'
-    testImplementation 'junit:junit:4.13.1'
-    testImplementation group: 'org.mockito', name: 'mockito-core', version: '5.15.2'
 
-    // Video Recording
-    testImplementation('com.automation-remarks:video-recorder-junit5:2.0') {
-        exclude group: 'log4j', module: 'log4j'
-    }
-    testImplementation 'org.apache.logging.log4j:log4j-api:2.23.1'
-    testImplementation 'org.apache.logging.log4j:log4j-core:2.23.1'
-    testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.10.2'
+    dependencies {
+        testImplementation "com.intellij.remoterobot:remote-robot:${remoteRobotVersion}"
+        testImplementation("com.intellij.remoterobot:remote-fixtures:${remoteRobotVersion}") {
+            exclude group: 'com.square.okio', module: 'okio'
+        }
+        testImplementation "com.squareup.okio:okio:${okioVersion}"
+        testImplementation "org.junit.jupiter:junit-jupiter-api:${junitBomVersion}"
+        testImplementation "com.squareup.okhttp3:okhttp:${okhttpVersion}"
+        testImplementation 'junit:junit:4.11-redhat-1'
+        testImplementation 'junit:junit:4.13.1'
+        testImplementation group: 'org.mockito', name: 'mockito-core', version: '5.15.2'
+
+        // Video Recording
+        testImplementation('com.automation-remarks:video-recorder-junit5:2.0') {
+            exclude group: 'log4j', module: 'log4j'
+        }
+        testImplementation "org.apache.logging.log4j:log4j-api:${log4jVersion}"
+        testImplementation "org.apache.logging.log4j:log4j-core:${log4jVersion}"
+        testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:${junitEngineVersion}"
 
-    // https://mvnrepository.com/artifact/com.miglayout/miglayout-swing
-    implementation 'com.miglayout:miglayout-swing:11.3'
+        // https://mvnrepository.com/artifact/com.miglayout/miglayout-swing
+        implementation "com.miglayout:miglayout-swing:${miglayoutVersion}"
 
-    if (javaWrapperVersion == "" || javaWrapperVersion == null) {
-        implementation('com.checkmarx.ast:ast-cli-java-wrapper:2.4.20'){
-            exclude group: 'junit', module: 'junit'
-        }
-    } else {
-        implementation('com.checkmarx.ast:ast-cli-java-wrapper:' + javaWrapperVersion){
+        implementation("com.checkmarx.ast:ast-cli-java-wrapper:${javaWrapperVersion}"){
             exclude group: 'junit', module: 'junit'
         }
+        implementation(platform("com.fasterxml.jackson:jackson-bom:${jacksonBomVersion}"))
+        // Temporary workaround https://github.com/FasterXML/jackson-databind/issues/3428
+
+        testImplementation "org.mockito:mockito-core:${mockitoVersion}"
+        testImplementation "org.mockito:mockito-junit-jupiter:${mockitoVersion}"
     }
-    implementation(platform("com.fasterxml.jackson:jackson-bom:2.16.1"))
-    // Temporary workaround https://github.com/FasterXML/jackson-databind/issues/3428
 
-    testImplementation 'org.mockito:mockito-core:5.0.0'
-    testImplementation 'org.mockito:mockito-junit-jupiter:5.0.0' // maybe remove
+    jacoco {
+        toolVersion = "${jacocoVersion}"
+    }
 }
 
 // See https://github.com/JetBrains/gradle-intellij-plugin/
 intellij {
-    version = '2022.2.1'
+    version = "${intellijVersion}"
     updateSinceUntilBuild = false
 }
 
 runPluginVerifier {
-    ideVersions = ['IC-2023.1', 'IC-2023.2', 'IC-2023.3', 'IC-2024.1']
-}
-
-downloadRobotServerPlugin {
-    version = remoteRobotVersion
-}
-
-test {
-    useJUnitPlatform()
-    systemProperty 'uiWaitDuration', project.findProperty('uiWaitDuration') ?: 300
-    testLogging {
-        events "passed", "skipped", "failed", "standardOut", "standardError"
-        showExceptions true
-        showCauses true
-        showStackTraces true
-        showStandardStreams = true
-    }
-    jacoco {
-        includeNoLocationClasses = true
-        excludes = ["jdk.internal.*"]
-    }
-}
-
-runIdeForUiTests {
-    systemProperty 'jb.privacy.policy.text', '<!--999.999-->'
-    systemProperty 'jb.consents.confirmation.enabled', 'false'
-}
-
-def jacocoTask = project.hasProperty('jacocoTask') ? project.jacocoTask : "unit"
-
-jacocoTestReport {
-    dependsOn test
-    classDirectories.setFrom(instrumentCode)
-
-    if (jacocoTask == "integration") {
-        afterEvaluate {
-            classDirectories.setFrom(files(classDirectories.files.collect {
-                fileTree(dir: it, include: 'com/checkmarx/intellij/commands/**',
-                        exclude: 'com/checkmarx/intellij/commands/results/obj')
-            }))
-        }
-    }
-
-    reports {
-        csv.required = true
-        html.required = true
-    }
-}
-
-
-
-publishPlugin {
-    token.set System.getenv("PUBLISH_TOKEN")
-    if (project.hasProperty("rchannels")) {
-        channels = [rchannels.toString()]
-    }
-}
-
-java {
-    toolchain {
-        languageVersion.set(JavaLanguageVersion.of(11))
-    }
-}
-
-patchPluginXml {
-    sinceBuild = '222'
-}
-
+    ideVersions = verifierIdeVersions.split(',').toList()
+}

common-lib/build.gradle

@@ -0,0 +1,21 @@
+plugins {
+    id 'java-library'
+    id 'io.freefair.lombok'
+    id 'org.jetbrains.intellij'
+}
+
+group = 'com.checkmarx.intellij.common'
+version = rootProject.version
+
+intellij {
+    version = "${intellijVersion}"
+    updateSinceUntilBuild = false
+}
+
+tasks.withType(JavaCompile).configureEach {
+    options.encoding = 'UTF-8'
+}
+
+test {
+    useJUnitPlatform()
+}