From 516d2bef57bb1863c56d6642db480dd365d3ae59 Mon Sep 17 00:00:00 2001 From: Mateusz Bajorek Date: Fri, 4 Aug 2023 17:03:24 +0200 Subject: [PATCH] #895: add support for IntelliJ 2023.2 (#896) * #895: add support for IntelliJ 2023.2 --------- Co-authored-by: Mateusz Bajorek --- .github/workflows/ci-build.yaml | 2 +- build-all.sh | 2 +- build.gradle | 11 +++++++++-- camel-idea-plugin/build.gradle | 4 ++-- gradle.properties | 2 +- readme.md | 2 +- 6 files changed, 15 insertions(+), 8 deletions(-) diff --git a/.github/workflows/ci-build.yaml b/.github/workflows/ci-build.yaml index d6041934..71a90980 100644 --- a/.github/workflows/ci-build.yaml +++ b/.github/workflows/ci-build.yaml @@ -40,7 +40,7 @@ jobs: strategy: matrix: os: [ubuntu-latest, macos-latest, windows-latest] - version: [2022.2.5, 2022.3.3, 2023.1.3] + version: [2022.3.3, 2023.1.3, 2023.2] runs-on: ${{ matrix.os }} steps: - uses: actions/checkout@v3 diff --git a/build-all.sh b/build-all.sh index 83b5acc7..912cb3c9 100755 --- a/build-all.sh +++ b/build-all.sh @@ -1,5 +1,5 @@ #!/bin/bash -for v in "2022.2.5" "2022.3.3" "2023.1.3"; do +for v in "2022.3.3" "2023.1.3" "2023.2"; do ./build.sh $v done diff --git a/build.gradle b/build.gradle index 5cec85e9..d1015add 100644 --- a/build.gradle +++ b/build.gradle @@ -22,7 +22,7 @@ allprojects { toolVersion = '10.11.0' configDirectory = file("$rootProject.projectDir/config/checkstyle") } - + group = 'com.github.camel-tooling' version = '1.0.2' } @@ -62,8 +62,15 @@ subprojects { logger.quiet "Executing test ${desc.name} [${desc.className}] with result: ${result.resultType}" } } - + tasks.withType(JavaCompile) { options.encoding = 'UTF-8' } + + tasks.withType(Test).configureEach { + jvmArgs = [ + // avoid JBUIScale "Must be precomputed" error, because IDE is not started (LoadingState.APP_STARTED.isOccurred is false) + '-Djava.awt.headless=true' + ] + } } diff --git a/camel-idea-plugin/build.gradle b/camel-idea-plugin/build.gradle index 3bad05ec..2f2d46e0 100644 --- a/camel-idea-plugin/build.gradle +++ b/camel-idea-plugin/build.gradle @@ -33,11 +33,11 @@ intellij { // http://www.jetbrains.org/intellij/sdk/docs/basics/getting_started/build_number_ranges.html patchPluginXml { sinceBuild = "222" - untilBuild = "231.*" + untilBuild = "232.*" } runPluginVerifier { - ideVersions = [ "2022.2", "2022.3", "2023.1" ] + ideVersions = [ "2022.3", "2023.1", "2023.2" ] } // publishPlugin { diff --git a/gradle.properties b/gradle.properties index aa84b0f9..51f3f067 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,4 +1,4 @@ camelVersion = 3.20.6 camelQuarkusVersion = 2.16.0 camelKameletVersion = 3.20.6 -ideaVersion=2023.1.3 +ideaVersion=2023.2 diff --git a/readme.md b/readme.md index 73d15831..448c8fa6 100644 --- a/readme.md +++ b/readme.md @@ -98,7 +98,7 @@ Importing the project into IntelliJ as plug-in only require you choose ìmport f #### Running the plug-in with a previous versions of IDEA -The plugin is tested with `IDEA 2023.1.3` or newer, but if you want to try with an older version you can follow this guide +The plugin is tested with `IDEA 2023.2` or newer, but if you want to try with an older version you can follow this guide > - Follow the guide [build from source](#buildingfromsource) > - Change the attribute `` in `camel-idea-plugin/src/main/resources/META-INF/plugin.xml` to match the version. please see [document](http://www.jetbrains.org/intellij/sdk/docs/basics/getting_started/build_number_ranges.html) for build number description