Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix compatibility issue #4

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,11 @@ jobs:
- name: Checkout Repository
uses: actions/checkout@v4

- name: Set up JDK 11
- name: Set up JDK 17
uses: actions/setup-java@v3
with:
distribution: 'corretto'
java-version: '11'
java-version: '17'

- name: Grant execute permissions to Gradle wrapper
run: chmod +x ./gradlew
Expand All @@ -47,11 +47,11 @@ jobs:
- name: Checkout Repository
uses: actions/checkout@v4

- name: Set up JDK 11
- name: Set up JDK 17
uses: actions/setup-java@v3
with:
distribution: 'corretto'
java-version: '11'
java-version: '17'

- name: Grant execute permissions to Gradle wrapper
run: chmod +x ./gradlew
Expand Down Expand Up @@ -85,11 +85,11 @@ jobs:
- name: Checkout Repository
uses: actions/checkout@v4

- name: Set up JDK 11
- name: Set up JDK 17
uses: actions/setup-java@v3
with:
distribution: 'corretto'
java-version: '11'
java-version: '17'

- name: Grant execute permissions to Gradle wrapper
run: chmod +x ./gradlew
Expand Down
10 changes: 6 additions & 4 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
plugins {
id "org.jetbrains.intellij" version "1.7.0"
id "org.jetbrains.intellij" version "1.15.0"
id "java"
id "idea"
}
Expand All @@ -8,7 +8,7 @@ group 'org.jboss.tools.intellij'
version project.hasProperty('projectVersion') ? project.property('projectVersion') : '7.2.0'

intellij {
version = project.hasProperty('ideaVersion') ? project.property('ideaVersion') : '2022.2'
version = project.hasProperty('ideaVersion') ? project.property('ideaVersion') : '2024.1'
pluginName = 'org.jboss.tools.mta'
updateSinceUntilBuild = false
plugins = ['java']
Expand All @@ -29,12 +29,14 @@ dependencies {
implementation 'com.fasterxml.jackson.core:jackson-core:2.12.4'
implementation 'com.fasterxml.jackson.core:jackson-databind:2.12.4'
implementation 'com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.12.4'
implementation 'org.yaml:snakeyaml:1.29'

implementation files(new File(buildDir, 'resources/resources')) {
builtBy 'copyResources'
}

testImplementation 'org.mockito:mockito-core:2.28.2'
testImplementation 'org.mockito:mockito-core:4.8.0'
testImplementation 'org.mockito:mockito-inline:4.8.0'
}

publishPlugin {
Expand All @@ -56,7 +58,7 @@ repositories {

// Using the 'tasks' block to configure the runPluginVerifier task correctly
tasks.withType(org.jetbrains.intellij.tasks.RunPluginVerifierTask) {
ideVersions = ['IC-2022.2', 'IC-2021.2', 'IC-2021.3'] // Adjusted IDE versions to available versions
ideVersions = ['IC-2024.1'] // Adjusted IDE versions to available versions
downloadDir = "$buildDir/pluginVerifier/ides"
verificationReportsDir = "$buildDir/pluginVerifier/reports"
failureLevel = ['COMPATIBILITY_PROBLEMS', 'INVALID_PLUGIN'].collect {
Expand Down
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ideaVersion=2022.2
ideaVersion=2024.1
projectVersion=7.2.0
jetBrainsToken=invalid
jetBrainsChannel=stable
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.0-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ public static void showIssueDetailsView(Issue issue, Project project) {
toolWindow.activate(() -> IssueDetailsView.getInstance(project).renderIssue(issue));
}
}

@SuppressWarnings("removal")
public void createToolWindowContent(@NotNull ToolWindow toolWindow) {
ContentFactory contentFactory = ContentFactory.SERVICE.getInstance();
Content content = contentFactory.createContent(myToolWindowPanel, "Issue Details", false);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ public class ConfigurationFileTypeFactory implements FileTypeUsageSchemaDescript
@NonNls static final String DOT_CONFIGURATION_EXTENSION = "." + CONFIGURATION_EXTENSION;

@Override
@SuppressWarnings("removal")
public boolean describes(@NotNull VirtualFile file) {
return false;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@

public class VertxService implements Disposable {

public static final String PLUGIN_ID = "org.jboss.tools.intellij.mta";
public static final String PLUGIN_ID = "org.jboss.tools.mta";

private Vertx vertx;
private EventBus eventBus;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ public WindupToolWindow(ModelService modelService, Project project, ToolWindow t
this.init();
this.cliRunner = new WindupCliRunner();
}

@SuppressWarnings("removal")
private void init() {
WindupExplorerTreeStructure treeStructure = new WindupExplorerTreeStructure(modelService, vertxService);
AsyncTreeModel asyncTreeModelModel = new AsyncTreeModel(treeStructure.getTreeModel(), true, project);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ public ConfigurationNode(WindupConfiguration configuration, ModelService modelSe
}

@Override
@SuppressWarnings("removal")
protected void update(PresentationData presentation) {
presentation.setPresentableText(this.getText());
presentation.setIcon(IconLoader.getIcon("/icons/configuration/configuration.svg"));
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ public static void parseConfigurationOptionsObject(Map optionsObject, WindupConf
}
}
}

@SuppressWarnings("removal")
private static void parseSummary(Map optionsObject, WindupConfiguration configuration, ModelService modelService) {
AnalysisResultsSummary summary = new AnalysisResultsSummary(modelService);
configuration.setSummary(summary);
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
@@ -1,5 +1,5 @@
<idea-plugin>
<id>org.jboss.tools.intellij.mta</id>
<id>org.jboss.tools.mta</id>
<name>Migration Toolkit for Applications (MTA) by Red Hat</name>
<vendor email="[email protected]" url="http://www.redhat.com">Red-Hat</vendor>

Expand All @@ -10,7 +10,7 @@
<p>Read more about MTA <a href="https://developers.redhat.com/products/mtr/download">here</a>.</p>
]]></description>

<idea-version since-build="222"/>
<idea-version since-build="241"/>

<depends>com.intellij.modules.lang</depends>
<depends>com.intellij.modules.java</depends>
Expand Down