Skip to content

Commit 98a7c74

Browse files
authored
Merge pull request #385 from AkibaAT/feature/2024.3
Update build for 2024.3 support
2 parents f44576d + b605a81 commit 98a7c74

File tree

3 files changed

+8
-3
lines changed

3 files changed

+8
-3
lines changed

gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ pluginSinceBuild = 224
77
pluginUntilBuild = 224.*
88

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

1212
# Gradle Releases -> https://github.com/gradle/gradle/releases
1313
gradleVersion = 8.7

src/main/java/de/php_perfect/intellij/ddev/settings/DdevSettingsComponent.java

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,12 @@ public DdevSettingsComponent(Project project) {
3636
panel.add(this.autoConfigurePhpInterpreter, gc);
3737
panel.add(this.autoConfigureNodeJsInterpreter, gc);
3838

39-
this.ddevBinary.addBrowseFolderListener(DdevIntegrationBundle.message("settings.chooseBinary.title"), "", project, new FileChooserDescriptor(true, false, false, false, false, false));
39+
this.ddevBinary.addBrowseFolderListener(
40+
project,
41+
new FileChooserDescriptor(true, false, false, false, false, false)
42+
.withTitle(DdevIntegrationBundle.message("settings.chooseBinary.title"))
43+
.withDescription("")
44+
);
4045

4146
this.jPanel = FormBuilder.createFormBuilder()
4247
.addLabeledComponent(new JBLabel(DdevIntegrationBundle.message("settings.ddevBinary")), this.ddevBinary, 1, false)

src/test/java/de/php_perfect/intellij/ddev/terminal/DdevTerminalRunnerTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ void createProcessNotExistentDdev() throws NoSuchFieldException, IllegalAccessEx
3535
field.set(state, null);
3636

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

4040
Assertions.assertThrowsExactly(ExecutionException.class, () -> ddevTerminalRunner.createProcess(builder.build()));
4141
}

0 commit comments

Comments
 (0)