2.0

.github/ISSUE_TEMPLATE/config.yml

@@ -1,8 +1,8 @@
 blank_issues_enabled: true
 contact_links:
   - name: Documentation
-    url: https://plugins.jetbrains.com/docs/intellij/tools-gradle-intellij-plugin.html
-    about: Browse the Gradle IntelliJ Plugin documentation.
+    url: https://plugins.jetbrains.com/docs/intellij/tools-intellij-platform-gradle-plugin.html
+    about: Browse the IntelliJ Platform Gradle Plugin documentation.
   - name: Getting Help
     url: https://plugins.jetbrains.com/docs/intellij/getting-help.html
-    about: Check if you search for a help in plugin development.
+    about: For help with plugin development.

.github/pull_request_template.md

@@ -39,7 +39,7 @@
 
 - [ ] I have read the [**CONTRIBUTING**](https://github.com/JetBrains/gradle-intellij-plugin/blob/master/CONTRIBUTING.md) document.
 - [ ] My code follows the code style of this project.
-- [ ] My change requires a change to the [documentation](https://plugins.jetbrains.com/docs/intellij/tools-gradle-intellij-plugin.html).
+- [ ] My change requires a change to the [documentation](https://plugins.jetbrains.com/docs/intellij/tools-intellij-platform-gradle-plugin.html).
 - [ ] I have updated the documentation accordingly.
 - [ ] I have included my change in the [**CHANGELOG**](https://github.com/JetBrains/gradle-intellij-plugin/blob/master/CHANGELOG.md).
 - [ ] I have added tests to cover my changes.

.github/workflows/README.md

@@ -0,0 +1,19 @@
+# GitHub Workflows
+
+## Matrix testing
+
+`reusable-unitTests.yml`
+
+Gradle versions:
+
+- minimum supported version (`8.1`, see `IntelliJPluginConstants.Constraints.getMINIMAL_GRADLE_VERSION`)
+- latest GA (e.g., `8.6`)
+- RC of next GA (potentially)
+
+When updating _latest GA_ version, adjust `exclude` section 
+and adjust `single-unitTest.yml`.
+
+Operating Systems:
+
+- `macos-latest` = Intel arch
+- `macos-14` = Apple Silicon arch

.github/workflows/build.yml

@@ -2,17 +2,18 @@ name: Build
 on:
   # Trigger the workflow on pushes to only the 'master' branch (this avoids duplicate checks being run, e.g. for dependabot pull requests)
   push:
-    branches: [ master ]
+    branches: [ '2.0' ]
     paths-ignore: [ '**.md', '.teamcity/**' ]
   # Trigger the workflow on any pull request
   pull_request:
     paths-ignore: [ '**.md', '.teamcity/**' ]
 
 
+# TODO disabled for now
 # This allows a subsequently queued workflow run to interrupt previous runs
-concurrency:
-  group: '${{ github.workflow }} @ ${{ github.event.pull_request.head.label || github.head_ref || github.ref }}'
-  cancel-in-progress: true
+#concurrency:
+#  group: '${{ github.workflow }} @ ${{ github.event.pull_request.head.label || github.head_ref || github.ref }}'
+#  cancel-in-progress: true
 
 jobs:
 
@@ -62,7 +63,7 @@ jobs:
         uses: actions/setup-java@v4
         with:
           distribution: zulu
-          java-version: 11
+          java-version: 17
 
       - name: Setup Gradle
         uses: gradle/actions/setup-gradle@v3

.github/workflows/release-nightly.yml

@@ -67,7 +67,7 @@ jobs:
         uses: actions/setup-java@v4
         with:
           distribution: zulu
-          java-version: 11
+          java-version: 17
 
       - name: Setup Gradle
         uses: gradle/actions/setup-gradle@v3

.github/workflows/release.yml

@@ -22,7 +22,7 @@ jobs:
         uses: actions/setup-java@v4
         with:
           distribution: zulu
-          java-version: 11
+          java-version: 17
 
       - name: Setup Gradle
         uses: gradle/actions/setup-gradle@v3

.github/workflows/reusable-gradleValidation.yml

@@ -4,23 +4,8 @@ on: [ workflow_call ]
 
 jobs:
   gradleValidation:
-    name: Gradle Wrapper
+    name: Gradle Wrapper Validation
     runs-on: ubuntu-latest
     steps:
-
-      - name: Fetch Sources
-        uses: actions/checkout@v4
-
-      - name: Setup Java
-        uses: actions/setup-java@v4
-        with:
-          distribution: zulu
-          java-version: 11
-
-      - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@v3
-        with:
-          gradle-home-cache-cleanup: true
-
-      - name: Gradle Wrapper Validation
-        uses: gradle/wrapper-validation-action@v2.1.1
+      - uses: actions/checkout@v4
+      - uses: gradle/wrapper-validation-action@v2.1.1

.github/workflows/reusable-integrationTests.yml

@@ -16,12 +16,14 @@ jobs:
       fail-fast: false
       matrix:
         gradleVersion:
-          - "7.6"
+          - "8.1"
           - "8.6"
+          - "8.7-rc-3"
         os:
           - windows-latest
           - ubuntu-latest
           - macos-latest
+          - macos-14
 
     steps:
 
@@ -32,7 +34,7 @@ jobs:
         uses: actions/setup-java@v4
         with:
           distribution: zulu
-          java-version: 11
+          java-version: 17
 
       - name: Setup Gradle
         uses: gradle/actions/setup-gradle@v3

.github/workflows/reusable-single-unitTest.yml

@@ -39,7 +39,7 @@ jobs:
         uses: actions/setup-java@v4
         with:
           distribution: zulu
-          java-version: 11
+          java-version: 17
 
       - name: Setup Gradle
         uses: gradle/actions/setup-gradle@v3
@@ -71,7 +71,7 @@ jobs:
         if: ${{ always() }}
         uses: actions/upload-artifact@v4
         with:
-          name: unit-tests-${{ inputs.gradleVersion }}-${{ runner.os }}
+          name: unit-tests-${{ inputs.gradleVersion }}-${{ inputs.os }}
           path: |
             ${{ github.workspace }}/build/reports/tests
             ${{ github.workspace }}/build/reports/configuration-cache

.github/workflows/reusable-unitTests.yml

@@ -4,10 +4,10 @@ on: [ workflow_call ]
 
 jobs:
   baseUnitTest:
-    name: Gradle 8.5 @ ubuntu-latest
+    name: Gradle 8.6 @ ubuntu-latest
     uses: ./.github/workflows/reusable-single-unitTest.yml
     with:
-      gradleVersion: "8.5"
+      gradleVersion: "8.6"
       os: ubuntu-latest
 
   unitTests:
@@ -22,12 +22,14 @@ jobs:
       fail-fast: false
       matrix:
         gradleVersion:
-          - "7.6"
+          - "8.1"
           - "8.6"
+          - "8.7-rc-3"
         os:
           - windows-latest
           - ubuntu-latest
           - macos-latest
+          - macos-14
         exclude:
           - os: ubuntu-latest
-            gradleVersion: "8.5"
+            gradleVersion: "8.6"

.github/workflows/single-unitTest.yml

@@ -10,7 +10,7 @@ on:
         description: "Gradle Version"
         required: true
         type: string
-        default: "8.5"
+        default: "8.6"
       os:
         description: "Operation System"
         required: true
@@ -19,6 +19,7 @@ on:
           - ubuntu-latest
           - windows-latest
           - macos-latest
+          - macos-14
   workflow_call:
 
 jobs:

.teamcity/settings.kts

@@ -43,7 +43,7 @@ project {
     }
 
     val operatingSystems = listOf("Linux", "Windows", "macOS")
-    val gradleVersions = listOf("7.6", "8.6")
+    val gradleVersions = listOf("8.1", "8.6", "8.7-rc-3")
 
     val buildChain = sequential {
         operatingSystems.forEach { os ->

CHANGELOG.md

@@ -23,6 +23,21 @@
 
 ### Added
 
+- Added `org.jetbrains.intellij.buildFeature.useCacheRedirector` build feature
+- Added `IntelliJPlatformCollectorTransformer` and `IntelliJPlatformExtractTransformer` for handling IntelliJ Platform dependency archives
+- Added `jetbrainsAnnotations` dependency helper for adding JetBrains Annotations dependency
+- Added general `intellijPlatform` along with product-specific dependency helpers for adding IntelliJ Platform dependency
+
+### Changed
+
+- New project name: IntelliJ Platform Gradle Plugin
+- New project ID: `org.jetbrains.intellij.platform`
+- New Maven coordinates: `org.jetbrains.intellij.platform:intellij-platform-gradle-plugin`
+- Move classes under the new package: `org.jetbrains.intellij.platform.gradle`
+- Update minimal supported Gradle version to `8.1`
+
+### Added
+
 - Publish the plugin update and mark it as hidden to prevent public release after approval, using the `publishPlugin.hidden` property.
 - PatchPluginXmlTask: Wrap the content passed to `<change-notes>` and `<description>` elements with `<![CDATA[ ... ]]>` [#1498](../../issues/1498)
 
@@ -64,6 +79,11 @@
 ### Changed
 
 - Disabled caching for `BuildPluginTask`
+- Deprecate `SetupDependenciesTask`
+
+### Removed
+
+- Removed `intellij`, `intellijPlugin`, `intellijPlugins`, `intellijExtra` helper methods from `DependenciesUtils`
 
 ## [1.15.0] - 2023-07-07
 

CONTRIBUTING.md

@@ -1,20 +1,20 @@
-# Contributing to the Gradle IntelliJ Plugin
+# Contributing to the IntelliJ Platform Gradle Plugin
 
-There are many ways to contribute to the Gradle IntelliJ Plugin project, and each of them is valuable to us.
+There are many ways to contribute to the IntelliJ Platform Gradle Plugin project, and each of them is valuable to us.
 Every submitted feedback, issue, or pull request is highly appreciated.
 
 ## Issue Tracker
-Before reporting an issue, please update your configuration to use always the [latest release](https://github.com/JetBrains/gradle-intellij-plugin/releases), or try with the [snapshot release](https://plugins.jetbrains.com/docs/intellij/tools-gradle-intellij-plugin.html#snapshot-release), which contains not-yet publicly available changes.
+Before reporting an issue, please update your configuration to use always the [latest release](https://github.com/JetBrains/gradle-intellij-plugin/releases), or try with the [snapshot release](https://plugins.jetbrains.com/docs/intellij/tools-intellij-platform-gradle-plugin.html), which contains not-yet publicly available changes.
 
 If you find your problem unique, and it wasn't yet reported to us, [file an issue](https://github.com/JetBrains/gradle-intellij-plugin/issues/new) using the provided issue template.
 
 ## Run Integration Tests
 The project provides Unit Tests and Integration Tests to verify if nothing is broken with the real-life project examples.
 [Integration Tests](https://github.com/JetBrains/gradle-intellij-plugin/tree/master/integration-tests) provide various different test cases with a dedicated verification scenarios available in `verify.main.kts` files.
-Read the [Gradle IntelliJ Plugin Integration Tests](https://github.com/JetBrains/gradle-intellij-plugin/tree/master/integration-tests) document to find more about this kind of test and find out how to create new scenarios.
+Read the [IntelliJ Platform Gradle Plugin Integration Tests](INTEGRATION_TESTS.md) document to find more about this kind of test and find out how to create new scenarios.
 
 ## Link With Your Project
-It is possible to link your plugin project with the Gradle IntelliJ Plugin project, so it'll be loaded and built as a module.
+It is possible to link your plugin project with the IntelliJ Platform Gradle Plugin project, so it'll be loaded and built as a module.
 To integrate it with another consumer-like project, add the following line in the Gradle settings file and refresh your Gradle configuration:
 
 ```kotlin