Skip to content

Commit

Permalink
chore: min SDK version is now 2022.3 / JDK 17
Browse files Browse the repository at this point in the history
  • Loading branch information
bjansen committed Sep 12, 2024
1 parent 7e47e4d commit 666d632
Show file tree
Hide file tree
Showing 6 changed files with 13 additions and 52 deletions.
18 changes: 2 additions & 16 deletions .github/workflows/gradle.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,27 +16,13 @@ jobs:
env:
# see https://www.jetbrains.com/idea/download/previous.html
# and https://www.jetbrains.com/intellij-repository/snapshots/
- IDEA_VERSION: IC-2020.3 # Oldest supported version
- IDEA_VERSION: IC-2021.3.3
- IDEA_VERSION: IC-2022.3.3
JDK_VERSION: 17
- IDEA_VERSION: IC-2022.3 # Oldest supported version
- IDEA_VERSION: IC-2023.1
JDK_VERSION: 17
- IDEA_VERSION: IC-2023.3.2
JDK_VERSION: 17
- IDEA_VERSION: IU-LATEST-EAP-SNAPSHOT
JDK_VERSION: 17

steps:
- uses: actions/checkout@v3
- name: Set up JDK 11
if: matrix.env.JDK_VERSION != '17'
uses: actions/setup-java@v3
with:
java-version: 11
distribution: temurin
- name: Set up JDK 17
if: matrix.env.JDK_VERSION == '17'
uses: actions/setup-java@v3
with:
java-version: 17
Expand All @@ -50,4 +36,4 @@ jobs:
with:
name: "antlr-intellij-development"
path: build/distributions/antlr-intellij-plugin-v4-*.zip
if: matrix.env.IDEA_VERSION == 'IC-2020.3'
if: matrix.env.IDEA_VERSION == 'IC-2022.3'
23 changes: 5 additions & 18 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,34 +18,21 @@ jobs:
env:
# see https://www.jetbrains.com/idea/download/previous.html
# and https://www.jetbrains.com/intellij-repository/snapshots/
- IDEA_VERSION: IC-2020.3 # Oldest supported version
SINCE_VERSION: 203
UNTIL_VERSION: 210.*
VERSION_SUFFIX: "-2020"
- IDEA_VERSION: IC-2021.3.3
SINCE_VERSION: 210
UNTIL_VERSION: 220.*
VERSION_SUFFIX: "-2021"
- IDEA_VERSION: IC-2022.3.3
SINCE_VERSION: 220
SINCE_VERSION: 223
UNTIL_VERSION: 230.*
VERSION_SUFFIX: "-2022"
JDK_VERSION: 17
- IDEA_VERSION: IC-2023.1
SINCE_VERSION: 230
JDK_VERSION: 17
UNTIL_VERSION: 240.*
VERSION_SUFFIX: "-2023"
- IDEA_VERSION: IC-2023.1
SINCE_VERSION: 240
VERSION_SUFFIX:

steps:
- uses: actions/checkout@v3
- name: Set up JDK 11
if: matrix.env.JDK_VERSION != '17'
uses: actions/setup-java@v3
with:
java-version: 11
distribution: temurin
- name: Set up JDK 17
if: matrix.env.JDK_VERSION == '17'
uses: actions/setup-java@v3
with:
java-version: 17
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# IntelliJ Idea Plugin for ANTLR v4 ![Java CI](https://github.com/antlr/intellij-plugin-v4/workflows/Java%20CI/badge.svg?branch=master) [![Latest version](https://img.shields.io/jetbrains/plugin/v/7358.svg?label=latest%20version)](https://plugins.jetbrains.com/plugin/7358) ![Downloads](https://img.shields.io/jetbrains/plugin/d/7358.svg)

An [IntelliJ](https://www.jetbrains.com/idea/) 2020.3+ plugin for ANTLR v4 ([plugin source at github](https://github.com/antlr/intellij-plugin-v4)).
An [IntelliJ](https://www.jetbrains.com/idea/) 2022.3+ plugin for ANTLR v4 ([plugin source at github](https://github.com/antlr/intellij-plugin-v4)).

[Plugin page at JetBrains Marketplace](http://plugins.jetbrains.com/plugin/7358?pr=idea)

Expand Down
4 changes: 2 additions & 2 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ apply plugin: 'org.jetbrains.intellij'
apply plugin: 'antlr'

compileJava {
sourceCompatibility = '11'
targetCompatibility = '11'
sourceCompatibility = '17'
targetCompatibility = '17'
}

intellij {
Expand Down
14 changes: 1 addition & 13 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -6,19 +6,7 @@ pluginVersion=1.23
# https://www.jetbrains.com/idea/download/other.html

# Oldest version currently supported
#ideaVersion=IC-2020.3 # requires jdk 11 from here on

#ideaVersion=IC-2021.2

#ideaVersion=IC-2021.3.3

#ideaVersion=IC-2022.1

#ideaVersion=IC-2022.2

ideaVersion=IC-2022.2.1

#ideaVersion=IC-2022.3 # requires jdk 17 from here on
ideaVersion=IC-2022.3

#ideaVersion=IC-2023.1

Expand Down
4 changes: 2 additions & 2 deletions src/main/resources/META-INF/plugin.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<description><![CDATA[
<p>
This plugin is for ANTLR v4 grammars and includes ANTLR 4.13.1. It works with
2020.3 and above. It should work in other JetBrains IDEs.
2022.3 and above. It should work in other JetBrains IDEs.
</p>
<ul>
Expand Down Expand Up @@ -82,7 +82,7 @@ For really big files and slow grammars, there is an appreciable delay when displ

<!-- please see https://plugins.jetbrains.com/docs/intellij/build-number-ranges.html for description -->
<!-- can be overriden by the Gradle build if needed -->
<idea-version since-build="203"/> <!-- requires IntelliJ 2020.3+ due to java 11 issue really -->
<idea-version since-build="223"/>

<!-- please see http://confluence.jetbrains.net/display/IDEADEV/Plugin+Compatibility+with+IntelliJ+Platform+Products
on how to target different products -->
Expand Down

0 comments on commit 666d632

Please sign in to comment.