Skip to content

Update build for 2024.3 support #385

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.

Sign up for GitHub

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

Merged
nico-loeber merged 1 commit into from
Nov 24, 2024
Merged

Update build for 2024.3 support #385

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ pluginSinceBuild = 224
pluginUntilBuild = 224.*

# IntelliJ Platform Properties -> https://plugins.jetbrains.com/docs/intellij/tools-gradle-intellij-plugin.html#configuration-intellij-extension
platformVersion = 2024.2
platformVersion = 2024.3

# Gradle Releases -> https://github.com/gradle/gradle/releases
gradleVersion = 8.7
Expand Down
7 changes: 6 additions & 1 deletion src/main/java/de/php_perfect/intellij/ddev/settings/DdevSettingsComponent.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,12 @@ public DdevSettingsComponent(Project project) {
panel.add(this.autoConfigurePhpInterpreter, gc);
panel.add(this.autoConfigureNodeJsInterpreter, gc);

this.ddevBinary.addBrowseFolderListener(DdevIntegrationBundle.message("settings.chooseBinary.title"), "", project, new FileChooserDescriptor(true, false, false, false, false, false));
this.ddevBinary.addBrowseFolderListener(
project,
new FileChooserDescriptor(true, false, false, false, false, false)
.withTitle(DdevIntegrationBundle.message("settings.chooseBinary.title"))
.withDescription("")
);

this.jPanel = FormBuilder.createFormBuilder()
.addLabeledComponent(new JBLabel(DdevIntegrationBundle.message("settings.ddevBinary")), this.ddevBinary, 1, false)
Expand Down
2 changes: 1 addition & 1 deletion src/test/java/de/php_perfect/intellij/ddev/terminal/DdevTerminalRunnerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ void createProcessNotExistentDdev() throws NoSuchFieldException, IllegalAccessEx
field.set(state, null);

final Map<String, String> envVariables = Map.of();
final ShellStartupOptions.Builder builder = new ShellStartupOptions.Builder(project.getBasePath(), null, null, null, null, null, envVariables);
final ShellStartupOptions.Builder builder = new ShellStartupOptions.Builder(project.getBasePath(), null, null, null, null, null, envVariables, null);

Assertions.assertThrowsExactly(ExecutionException.class, () -> ddevTerminalRunner.createProcess(builder.build()));
}
Expand Down
Loading