diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index 80517736..1f3e830e 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -1,14 +1,3 @@ -# For most projects, this workflow file will not need changing; you simply need -# to commit it to your repository. -# -# You may wish to alter this file to override the set of languages analyzed, -# or to provide custom queries or build logic. -# -# ******** NOTE ******** -# We have attempted to detect the languages in your repository. Please check -# the `language` matrix defined below to confirm you have the correct set of -# supported CodeQL languages. -# name: "CodeQL" on: @@ -22,13 +11,8 @@ on: jobs: analyze: name: Analyze - # Runner size impacts CodeQL analysis time. To learn more, please see: - # - https://gh.io/recommended-hardware-resources-for-running-codeql - # - https://gh.io/supported-runners-and-hardware-resources - # - https://gh.io/using-larger-runners - # Consider using larger runners for possible analysis time improvements. - runs-on: ${{ (matrix.language == 'swift' && 'macos-latest') || 'ubuntu-latest' }} - timeout-minutes: ${{ (matrix.language == 'swift' && 120) || 360 }} + runs-on: 'ubuntu-latest' + timeout-minutes: 360 permissions: actions: read contents: read @@ -36,12 +20,6 @@ jobs: strategy: fail-fast: false - matrix: - language: [ 'java-kotlin' ] - # CodeQL supports [ 'c-cpp', 'csharp', 'go', 'java-kotlin', 'javascript-typescript', 'python', 'ruby', 'swift' ] - # Use only 'java-kotlin' to analyze code written in Java, Kotlin or both - # Use only 'javascript-typescript' to analyze code written in JavaScript, TypeScript or both - # Learn more about CodeQL language support at https://aka.ms/codeql-docs/language-support steps: - name: Checkout repository @@ -49,39 +27,22 @@ jobs: # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL - uses: github/codeql-action/init@v2 + uses: github/codeql-action/init@v3 with: - languages: ${{ matrix.language }} - # If you wish to specify custom queries, you can do so here or in a config file. - # By default, queries listed here will override any specified in a config file. - # Prefix the list here with "+" to use these queries and those in the config file. - - # For more details on CodeQL's query packs, refer to: https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning#using-queries-in-ql-packs - # queries: security-extended,security-and-quality + languages: 'java-kotlin' - name: Setup Java JDK uses: actions/setup-java@v4 with: - distribution: 'corretto' - java-version: '17' - cache: 'gradle' - - # Autobuild attempts to build any compiled languages (C/C++, C#, Go, Java, or Swift). - # If this step fails, then you should remove it and run the build manually (see below) - - name: Autobuild - uses: github/codeql-action/autobuild@v2 - - # ℹī¸ Command-line programs to run using the OS shell. - # 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun - - # If the Autobuild fails above, remove it and uncomment the following three lines. - # modify them (or add more) to build your code if your project, please refer to the EXAMPLE below for guidance. + distribution: 'temurin' + java-version: '21' - # - run: | - # echo "Run, Build Application using script" - # ./location_of_script_within_repo/buildscript.sh + - name: Setup Gradle + uses: gradle/gradle-build-action@v3 + - name: Build with Gradle + run: ./gradlew -Dorg.jetbrains.intellij.platform.downloadSources=false build --no-daemon - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@v2 + uses: github/codeql-action/analyze@v3 with: category: "/language:${{matrix.language}}" diff --git a/.github/workflows/gradle_dependencies.yml b/.github/workflows/gradle_dependencies.yml index aab05cb0..e350cc8c 100644 --- a/.github/workflows/gradle_dependencies.yml +++ b/.github/workflows/gradle_dependencies.yml @@ -20,11 +20,11 @@ jobs: with: use-gradlew: true gradle-build-module: |- - :icons :plugin:common :plugin:v212 :plugin:v223 :plugin:v231 :plugin:v232 + :plugin:v242 gradle-build-configuration: |- compileClasspath diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index cf7ac624..cc8f5634 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -17,7 +17,7 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.14-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/plugin/v212/build.gradle.kts b/plugin/v212/build.gradle.kts index 6cbd556b..dc707edb 100644 --- a/plugin/v212/build.gradle.kts +++ b/plugin/v212/build.gradle.kts @@ -45,6 +45,8 @@ dependencies { antlr(libs.antlr) implementation(libs.antlr.runtime) + + testImplementation(libs.kotlin.test) } repositories { @@ -123,9 +125,6 @@ testing { } } - dependencies { - implementation(libs.kotlin.test) - } project.tasks { compileTestKotlin { dependsOn(generateTestGrammarSource) diff --git a/plugin/v223/build.gradle.kts b/plugin/v223/build.gradle.kts index 94e9cdde..788ebad3 100644 --- a/plugin/v223/build.gradle.kts +++ b/plugin/v223/build.gradle.kts @@ -47,6 +47,8 @@ dependencies { antlr(libs.antlr) implementation(libs.antlr.runtime) + + implementation(libs.kotlin.test) } repositories { @@ -125,9 +127,6 @@ testing { } } - dependencies { - implementation(libs.kotlin.test) - } project.tasks { compileTestKotlin { dependsOn(generateTestGrammarSource) diff --git a/plugin/v231/build.gradle.kts b/plugin/v231/build.gradle.kts index 45988d03..dbee4384 100644 --- a/plugin/v231/build.gradle.kts +++ b/plugin/v231/build.gradle.kts @@ -47,6 +47,8 @@ dependencies { antlr(libs.antlr) implementation(libs.antlr.runtime) + + testImplementation(libs.kotlin.test) } repositories { @@ -125,9 +127,6 @@ testing { } } - dependencies { - implementation(libs.kotlin.test) - } project.tasks { compileTestKotlin { dependsOn(generateTestGrammarSource) diff --git a/plugin/v232/build.gradle.kts b/plugin/v232/build.gradle.kts index c12a75fe..b314b188 100644 --- a/plugin/v232/build.gradle.kts +++ b/plugin/v232/build.gradle.kts @@ -47,6 +47,8 @@ dependencies { antlr(libs.antlr) implementation(libs.antlr.runtime) + + testImplementation(libs.kotlin.test) } repositories { @@ -125,9 +127,6 @@ testing { } } - dependencies { - implementation(libs.kotlin.test) - } project.tasks { compileTestKotlin { dependsOn(generateTestGrammarSource) diff --git a/plugin/v242/build.gradle.kts b/plugin/v242/build.gradle.kts index 41778c96..e663b396 100644 --- a/plugin/v242/build.gradle.kts +++ b/plugin/v242/build.gradle.kts @@ -48,6 +48,8 @@ dependencies { antlr(libs.antlr) implementation(libs.antlr.runtime) + testImplementation(libs.kotlin.test) + intellijPlatform { create("IC", libs.versions.ide.v242) @@ -153,9 +155,6 @@ testing { } } - dependencies { - implementation(libs.kotlin.test) - } project.tasks { compileTestKotlin { dependsOn(generateTestGrammarSource)