From b58890eb0540ee518711a55d09ee392b79c1d7c4 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 21 May 2021 06:09:13 +0000 Subject: [PATCH 01/20] Bump io.gitlab.arturbosch.detekt from 1.16.0 to 1.17.1 Bumps io.gitlab.arturbosch.detekt from 1.16.0 to 1.17.1. Signed-off-by: dependabot[bot] --- build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle.kts b/build.gradle.kts index 2be5790..2f5110b 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -15,7 +15,7 @@ plugins { // gradle-changelog-plugin - read more: https://github.com/JetBrains/gradle-changelog-plugin id("org.jetbrains.changelog") version "1.1.2" // detekt linter - read more: https://detekt.github.io/detekt/gradle.html - id("io.gitlab.arturbosch.detekt") version "1.16.0" + id("io.gitlab.arturbosch.detekt") version "1.17.1" // ktlint linter - read more: https://github.com/JLLeitschuh/ktlint-gradle id("org.jlleitschuh.gradle.ktlint") version "10.0.0" } From 63fa7f28e4cd622ca42a7c1c35af87407b2a29dd Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 5 Aug 2021 15:49:55 +0000 Subject: [PATCH 02/20] Bump org.jlleitschuh.gradle.ktlint from 10.0.0 to 10.1.0 Bumps org.jlleitschuh.gradle.ktlint from 10.0.0 to 10.1.0. --- updated-dependencies: - dependency-name: org.jlleitschuh.gradle.ktlint dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle.kts b/build.gradle.kts index 2f5110b..4ad102b 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -17,7 +17,7 @@ plugins { // detekt linter - read more: https://detekt.github.io/detekt/gradle.html id("io.gitlab.arturbosch.detekt") version "1.17.1" // ktlint linter - read more: https://github.com/JLLeitschuh/ktlint-gradle - id("org.jlleitschuh.gradle.ktlint") version "10.0.0" + id("org.jlleitschuh.gradle.ktlint") version "10.1.0" } group = properties("pluginGroup") From e1ca10e5c1df60a2086a629084b9232c89fc0411 Mon Sep 17 00:00:00 2001 From: Pr1st0n Date: Thu, 5 Aug 2021 18:13:53 +0200 Subject: [PATCH 03/20] Update `pluginVerifierIdeVersions` to `2020.3.4`, `2021.1.3`, `212.4535.15` --- CHANGELOG.md | 2 +- gradle.properties | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d6f867e..33ab20b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,7 +11,7 @@ - Upgraded `actions/checkout` to `v2.3.4` - Upgraded `actions/upload-release-asset` to `v1.0.2` - Upgraded `actions/create-release` to `v1.1.4` -- Updated `pluginVerifierIdeVersions` to `2020.3.4, 2021.1.1` +- Update `pluginVerifierIdeVersions` to `2020.3.4`, `2021.1.3`, `212.4535.15` - Removed reference to the `jcenter()` from Gradle configuration file ## [0.2.2] diff --git a/gradle.properties b/gradle.properties index e7c796f..f81b6ef 100644 --- a/gradle.properties +++ b/gradle.properties @@ -8,10 +8,10 @@ pluginVersion = 0.2.2 # See https://plugins.jetbrains.com/docs/intellij/build-number-ranges.html#intellij-platform-based-products-of-recent-ide-versions # for insight into build numbers and IntelliJ Platform versions. pluginSinceBuild = 203 -pluginUntilBuild = 211.* +pluginUntilBuild = 212.* # Plugin Verifier integration -> https://github.com/JetBrains/gradle-intellij-plugin#plugin-verifier-dsl # See https://plugins.jetbrains.com/docs/intellij/build-number-ranges.html -pluginVerifierIdeVersions = IU-2020.3.4, IU-2021.1.1 +pluginVerifierIdeVersions = IU-2020.3.4, IU-2021.1.3, IU-212.4535.15 platformType = IU platformVersion = 2020.3.4 From edc6426599df067d3640cd1ecd9a19e2416989ec Mon Sep 17 00:00:00 2001 From: Pr1st0n Date: Thu, 5 Aug 2021 18:29:06 +0200 Subject: [PATCH 04/20] Add workflow to launch UI tests on Linux, Windows and macOS --- .github/workflows/run-ui-tests.yml | 55 ++++++++++++++++++++++++++++++ 1 file changed, 55 insertions(+) create mode 100644 .github/workflows/run-ui-tests.yml diff --git a/.github/workflows/run-ui-tests.yml b/.github/workflows/run-ui-tests.yml new file mode 100644 index 0000000..9bd512c --- /dev/null +++ b/.github/workflows/run-ui-tests.yml @@ -0,0 +1,55 @@ +# GitHub Actions Workflow created for launching UI tests on Linux, Windows, and Mac in the following steps: +# - prepare and launch Idea with your plugin and robot-server plugin, which is need to interact with UI +# - wait for the Idea started +# - run UI tests with separate Gradle task +# +# Please check https://github.com/JetBrains/intellij-ui-test-robot for information about UI tests with IntelliJ IDEA. +# +# Workflow is triggered manually. + +name: Run UI Tests +on: + workflow_dispatch + +jobs: + + testUI: + runs-on: ${{ matrix.os }} + strategy: + fail-fast: false + matrix: + include: + - os: ubuntu-latest + runIde: | + export DISPLAY=:99.0 + Xvfb -ac :99 -screen 0 1920x1080x16 & + gradle runIdeForUiTests & + - os: windows-latest + runIde: start gradlew.bat runIdeForUiTests + - os: macos-latest + runIde: ./gradlew runIdeForUiTests & + + steps: + + # Setup Java 11 environment for the next steps + - name: Setup Java + uses: actions/setup-java@v2 + with: + distribution: zulu + java-version: 11 + + # Check out current repository + - name: Fetch Sources + uses: actions/checkout@v2.3.4 + + # Run IDEA prepared for UI testing + - name: Run IDE + run: ${{ matrix.runIde }} + + # Wait for IDEA to be started + - name: Health Check + uses: jtalk/url-health-check-action@v1.5 + with: + url: http://127.0.0.1:8082 + max-attempts: 15 + retry-delay: 30s From 09ddcfb0aedb1df4c92540730d40bf3facb955fd Mon Sep 17 00:00:00 2001 From: Pr1st0n Date: Thu, 5 Aug 2021 19:27:42 +0200 Subject: [PATCH 05/20] Sync plugin state with template repository --- .github/workflows/build.yml | 35 ++++--- .github/workflows/release.yml | 6 +- .run/Publish Plugin.run.xml | 29 ++++++ .run/Run IDE with Plugin.run.xml | 12 +-- .run/Run Plugin Tests.run.xml | 2 +- .run/Run Plugin Verification.run.xml | 12 +-- CHANGELOG.md | 31 ++++-- build.gradle.kts | 120 +++++++++++------------ detekt-config.yml | 16 --- gradle.properties | 15 ++- gradle/wrapper/gradle-wrapper.jar | Bin 59203 -> 59536 bytes gradle/wrapper/gradle-wrapper.properties | 2 +- gradlew | 2 +- 13 files changed, 148 insertions(+), 134 deletions(-) create mode 100644 .run/Publish Plugin.run.xml delete mode 100644 detekt-config.yml diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 28418b8..87669ff 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -35,7 +35,7 @@ jobs: # Validate wrapper - name: Gradle Wrapper Validation - uses: gradle/wrapper-validation-action@v1.0.3 + uses: gradle/wrapper-validation-action@v1.0.4 # Run verifyPlugin and test Gradle tasks test: @@ -46,8 +46,9 @@ jobs: # Setup Java 11 environment for the next steps - name: Setup Java - uses: actions/setup-java@v1 + uses: actions/setup-java@v2 with: + distribution: zulu java-version: 11 # Check out current repository @@ -56,21 +57,21 @@ jobs: # Cache Gradle dependencies - name: Setup Gradle Dependencies Cache - uses: actions/cache@v2 + uses: actions/cache@v2.1.6 with: path: ~/.gradle/caches key: ${{ runner.os }}-gradle-caches-${{ hashFiles('**/*.gradle', '**/*.gradle.kts', 'gradle.properties') }} # Cache Gradle Wrapper - name: Setup Gradle Wrapper Cache - uses: actions/cache@v2 + uses: actions/cache@v2.1.6 with: path: ~/.gradle/wrapper key: ${{ runner.os }}-gradle-wrapper-${{ hashFiles('**/gradle/wrapper/gradle-wrapper.properties') }} - # Run detekt, ktlint and tests - - name: Run Linters and Test - run: ./gradlew check + # Run tests + - name: Run Tests + run: ./gradlew test # Run verifyPlugin Gradle task - name: Verify Plugin @@ -91,8 +92,9 @@ jobs: # Setup Java 11 environment for the next steps - name: Setup Java - uses: actions/setup-java@v1 + uses: actions/setup-java@v2 with: + distribution: zulu java-version: 11 # Check out current repository @@ -101,14 +103,14 @@ jobs: # Cache Gradle Dependencies - name: Setup Gradle Dependencies Cache - uses: actions/cache@v2 + uses: actions/cache@v2.1.6 with: path: ~/.gradle/caches key: ${{ runner.os }}-gradle-caches-${{ hashFiles('**/*.gradle', '**/*.gradle.kts', 'gradle.properties') }} # Cache Gradle Wrapper - name: Setup Gradle Wrapper Cache - uses: actions/cache@v2 + uses: actions/cache@v2.1.6 with: path: ~/.gradle/wrapper key: ${{ runner.os }}-gradle-wrapper-${{ hashFiles('**/gradle/wrapper/gradle-wrapper.properties') }} @@ -138,7 +140,7 @@ jobs: # Upload plugin artifact to make it available in the next jobs - name: Upload artifact - uses: actions/upload-artifact@v1 + uses: actions/upload-artifact@v2.2.4 with: name: plugin-artifact path: ./build/distributions/${{ steps.properties.outputs.artifact }} @@ -153,8 +155,9 @@ jobs: # Setup Java 11 environment for the next steps - name: Setup Java - uses: actions/setup-java@v1 + uses: actions/setup-java@v2 with: + distribution: zulu java-version: 11 # Check out current repository @@ -163,14 +166,14 @@ jobs: # Cache Gradle Dependencies - name: Setup Gradle Dependencies Cache - uses: actions/cache@v2 + uses: actions/cache@v2.1.6 with: path: ~/.gradle/caches key: ${{ runner.os }}-gradle-caches-${{ hashFiles('**/*.gradle', '**/*.gradle.kts', 'gradle.properties') }} # Cache Gradle Wrapper - name: Setup Gradle Wrapper Cache - uses: actions/cache@v2 + uses: actions/cache@v2.1.6 with: path: ~/.gradle/wrapper key: ${{ runner.os }}-gradle-wrapper-${{ hashFiles('**/gradle/wrapper/gradle-wrapper.properties') }} @@ -188,7 +191,7 @@ jobs: # Cache Plugin Verifier IDEs - name: Setup Plugin Verifier IDEs Cache - uses: actions/cache@v2 + uses: actions/cache@v2.1.6 with: path: ${{ steps.properties.outputs.pluginVerifierHomeDir }}/ides key: ${{ runner.os }}-plugin-verifier-${{ steps.properties.outputs.ideVersions }} @@ -201,7 +204,7 @@ jobs: # If accepted and published, release workflow would be triggered releaseDraft: name: Release Draft - if: github.ref == 'refs/heads/main' + if: github.event_name != 'pull_request' needs: [build, verify] runs-on: ubuntu-latest steps: diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 53ea2f1..cb7f5d9 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -16,8 +16,9 @@ jobs: # Setup Java 11 environment for the next steps - name: Setup Java - uses: actions/setup-java@v1 + uses: actions/setup-java@v2 with: + distribution: zulu java-version: 11 # Check out current repository @@ -41,8 +42,9 @@ jobs: # Setup Java 11 environment for the next steps - name: Setup Java - uses: actions/setup-java@v1 + uses: actions/setup-java@v2 with: + distribution: zulu java-version: 11 # Check out current repository diff --git a/.run/Publish Plugin.run.xml b/.run/Publish Plugin.run.xml new file mode 100644 index 0000000..57effe0 --- /dev/null +++ b/.run/Publish Plugin.run.xml @@ -0,0 +1,29 @@ + + + + + + + + true + true + false + + + \ No newline at end of file diff --git a/.run/Run IDE with Plugin.run.xml b/.run/Run IDE with Plugin.run.xml index 62c05bf..d15ff68 100644 --- a/.run/Run IDE with Plugin.run.xml +++ b/.run/Run IDE with Plugin.run.xml @@ -18,17 +18,7 @@ true true - - false - + \ No newline at end of file diff --git a/.run/Run Plugin Tests.run.xml b/.run/Run Plugin Tests.run.xml index 132d9ad..ae9ae13 100644 --- a/.run/Run Plugin Tests.run.xml +++ b/.run/Run Plugin Tests.run.xml @@ -11,7 +11,7 @@