Skip to content

Commit

Permalink
build: upgrade to Gradle 8.4 and build.gradle.kts
Browse files Browse the repository at this point in the history
Signed-off-by: Fred Bricon <[email protected]>
  • Loading branch information
fbricon committed Oct 20, 2023
1 parent a1a9b8a commit 9f6f976
Show file tree
Hide file tree
Showing 20 changed files with 502 additions and 271 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/IJ-latest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
- name: Grant execute permission for gradlew
run: chmod +x gradlew
- name: Build with Gradle
run: ./gradlew build --continue -PideaVersion=LATEST-EAP-SNAPSHOT
run: ./gradlew build --continue -PplatformVersion=LATEST-EAP-SNAPSHOT
- uses: actions/upload-artifact@v2
if: always()
with:
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/IJ.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
IJ: [IC-2022.2, IC-2022.3, IC-2023.1, IC-2023.2, IC-2023.2.3]
IJ: [2022.2, 2022.3, 2023.1, 2023.2, 2023.2.3]

steps:
- uses: actions/checkout@v2
Expand All @@ -27,9 +27,9 @@ jobs:
- name: Grant execute permission for gradlew
run: chmod +x gradlew
- name: Build with Gradle
run: ./gradlew buildPlugin -PideaVersion=${{ matrix.IJ }}
run: ./gradlew buildPlugin -PplatformVersion=${{ matrix.IJ }}
- name: Verify with Gradle
run: ./gradlew runPluginVerifier -PideaVersion=${{ matrix.IJ }}
run: ./gradlew runPluginVerifier -PplatformVersion=${{ matrix.IJ }}
- name: Upload report
uses: actions/upload-artifact@v2
if: always()
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/buildZip.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@ jobs:

steps:
- uses: actions/checkout@v2
- name: Set up JDK 11
- name: Set up JDK 17
uses: actions/setup-java@v3
with:
java-version: 11
java-version: 17
distribution: 'temurin'
cache: 'gradle'
- name: Grant execute permission for gradlew
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@ jobs:

steps:
- uses: actions/checkout@v2
- name: Set up JDK 11
- name: Set up JDK 17
uses: actions/setup-java@v3
with:
java-version: 11
java-version: 17
distribution: 'temurin'
cache: 'gradle'
- name: Grant execute permission for gradlew
Expand All @@ -36,10 +36,10 @@ jobs:

steps:
- uses: actions/checkout@v2
- name: Set up JDK 11
- name: Set up JDK 17
uses: actions/setup-java@v3
with:
java-version: 11
java-version: 17
distribution: 'temurin'
cache: 'gradle'
- name: Grant execute permission for gradlew
Expand All @@ -57,10 +57,10 @@ jobs:

steps:
- uses: actions/checkout@v2
- name: Set up JDK 11
- name: Set up JDK 17
uses: actions/setup-java@v3
with:
java-version: 11
java-version: 17
distribution: 'temurin'
cache: 'gradle'
- name: Grant execute permission for gradlew
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/itests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@ jobs:

steps:
- uses: actions/checkout@v2
- name: Set up JDK 11
- name: Set up JDK 17
uses: actions/setup-java@v1
with:
java-version: 11
java-version: 17
- name: Run integration tests
run: |
export DISPLAY=:99.0
Expand All @@ -43,10 +43,10 @@ jobs:

steps:
- uses: actions/checkout@v2
- name: Set up JDK 11
- name: Set up JDK 17
uses: actions/setup-java@v1
with:
java-version: 11
java-version: 17
- name: Run integration tests
run: |
./gradlew integrationTest
Expand All @@ -68,10 +68,10 @@ jobs:

steps:
- uses: actions/checkout@v2
- name: Set up JDK 11
- name: Set up JDK 17
uses: actions/setup-java@v1
with:
java-version: 11
java-version: 17
- name: Run integration tests
run: |
.\gradlew.bat integrationTest
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- name: Set up JDK 11
- name: Set up JDK 17
uses: actions/setup-java@v1
with:
java-version: 11
java-version: 17
- name: Grant execute permission for gradlew
run: chmod +x gradlew
- name: Build with Gradle
Expand Down
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
## [Unreleased]
15 changes: 8 additions & 7 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
# Quarkus Tools for IntelliJ
<h1><img src="https://raw.githubusercontent.com/redhat-developer/intellij-quarkus/master/src/main/resources/quarkus_icon_rgb_32px_default.png" /> Quarkus Tools for IntelliJ</h1>

[plugin-repo]: https://plugins.jetbrains.com/plugin/13234-quarkus
[plugin-version-svg]: https://img.shields.io/jetbrains/plugin/v/13234-quarkus.svg
[plugin-downloads-svg]: https://img.shields.io/jetbrains/plugin/d/13234-quarkus.svg
Expand All @@ -11,9 +12,9 @@


## Description

This JetBrains IntelliJ plugin provides support for Quarkus development via a
[Quarkus language server](https://github.com/redhat-developer/quarkus-ls/tree/master/microprofile.ls).
<!-- Plugin description -->
A plugin aimed at Quarkus based development, providing easy bootstrapping and code assist from [Quarkus](https://quarkus.io/) related assets and [Qute](https://quarkus.io/guides/qute-reference).
<!-- Plugin description end -->

### application.properties support

Expand Down Expand Up @@ -230,7 +231,7 @@ When editing `application.properties` files, you have access to:
## Requirements

* Intellij IDEA 2022.2 or more recent (we **try** to support the last 4 major IDEA releases)
* Java JDK (or JRE) 11 or more recent
* Java JDK (or JRE) 17 or more recent

## Contributing
Expand Down Expand Up @@ -268,10 +269,10 @@ So we extracted these classes into the ```intellij-community``` folder. But as t
classes are highly linked to the version of the IntelliJ SDK used to build, there is
a script to copy them from the GitHub intellij-community repository.

This script is ```pulltest.sh```
This script is ```pull_intellij_tests```

If the version of the IntelliJ SDK used to build is changed (see gradle.properties), you must
update the branch in ```pulltest.sh``` and run the script again.
update the branch in ```pull_intellij_tests``` and run the script again.

#### UI testing

Expand Down
210 changes: 0 additions & 210 deletions build.gradle

This file was deleted.

Loading

0 comments on commit 9f6f976

Please sign in to comment.