Skip to content

Commit

Permalink
Upgrading IntelliJ from 2024.1.5 to 2024.2.0 (#323)
Browse files Browse the repository at this point in the history
  • Loading branch information
ChrisCarini authored Aug 20, 2024
1 parent a29c0e1 commit baca7bb
Show file tree
Hide file tree
Showing 13 changed files with 414 additions and 305 deletions.
14 changes: 7 additions & 7 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -54,13 +54,13 @@ jobs:
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
timeout-minutes: 1

# Setup Java 17 environment for the next steps
- name: Setup Java 17
# Setup Java environment for the next steps
- name: Setup Java
uses: actions/setup-java@6a0805fcefea3d4657a47ac4c165951e33482018 # v4.2.2
timeout-minutes: 5
with:
distribution: zulu
java-version: 17
java-version: 21
cache: gradle

# Set environment variables
Expand Down Expand Up @@ -97,7 +97,7 @@ jobs:

# Run IntelliJ Plugin Verifier action using GitHub Action
- name: Run Plugin Verifier
run: ./gradlew runPluginVerifier -Pplugin.verifier.home.dir=${{ steps.properties.outputs.pluginVerifierHomeDir }}
run: ./gradlew verifyPlugin -Pplugin.verifier.home.dir=${{ steps.properties.outputs.pluginVerifierHomeDir }}

# Build plugin with buildPlugin Gradle task and provide the artifact for the next workflow jobs
# Requires test job to be passed
Expand All @@ -117,13 +117,13 @@ jobs:
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
timeout-minutes: 1

# Setup Java 17 environment for the next steps
- name: Setup Java 17
# Setup Java environment for the next steps
- name: Setup Java
uses: actions/setup-java@6a0805fcefea3d4657a47ac4c165951e33482018 # v4.2.2
timeout-minutes: 5
with:
distribution: zulu
java-version: 17
java-version: 21
cache: gradle

# Set environment variables
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/compatibility.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,11 @@ jobs:
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
timeout-minutes: 1

- name: Setup Java 17
- name: Setup Java
uses: actions/setup-java@6a0805fcefea3d4657a47ac4c165951e33482018 # v4.2.2
timeout-minutes: 5
with:
java-version: 17
java-version: 21
distribution: 'zulu'
cache: gradle

Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,13 @@ jobs:
with:
ref: ${{ github.event.release.tag_name }}

# Setup Java 17 environment for the next steps
- name: Setup Java 17
# Setup Java environment for the next steps
- name: Setup Java
uses: actions/setup-java@6a0805fcefea3d4657a47ac4c165951e33482018 # v4.2.2
timeout-minutes: 5
with:
distribution: zulu
java-version: 17
java-version: 21
cache: gradle

# Set environment variables
Expand Down
6 changes: 5 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,15 @@
*.iws
.gradle/
.qodana/
.shelf/
build/
gradle/
out/
gradlew*
jetbrainsCredentials.gradle
private.pem
chain.crt
*.DS_Store
*.DS_Store
.idea/
.installedPlugins/
.intellijPlatform/
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@
### Added

### Changed
- Upgrading IntelliJ from 2024.1.5 to 2024.2.0
- Changed gradle build to Kotlin DSL (from Groovy DSL) in preparation of `IntelliJ Platform Gradle Plugin 2.0.0`.

### Deprecated

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

This file was deleted.

3 changes: 3 additions & 0 deletions build.gradle.kts
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
plugins {
id("build-standard-jetbrains-plugin-build")
}
17 changes: 17 additions & 0 deletions buildSrc/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
plugins {
`kotlin-dsl`
}

repositories {
mavenCentral()
maven {
url = uri("https://plugins.gradle.org/m2/")
}
}

dependencies {
implementation("org.jetbrains.intellij.platform:intellij-platform-gradle-plugin:2.0.1")
implementation("org.jetbrains.intellij.plugins:gradle-changelog-plugin:2.2.1")
implementation("com.dorongold.plugins:task-tree:4.0.0") // provides `taskTree` task (e.g. `./gradlew build taskTree`; docs: https://github.com/dorongold/gradle-task-tree)
}

Loading

0 comments on commit baca7bb

Please sign in to comment.