Skip to content

Commit 2f8ae58

Browse files
committed
chore: update devkitman to 0.3.0
1 parent fec9631 commit 2f8ae58

File tree

3 files changed

+13
-9
lines changed

3 files changed

+13
-9
lines changed

app.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ links:
88
documentation: https://github.com/codejive/java-jvm/blob/main/README.md
99
java: 11
1010
dependencies:
11-
- dev.jbang:devkitman:0.1.4
11+
- dev.jbang:devkitman:0.3.0
1212
- de.vandemeer:asciitable:0.3.2
1313
- info.picocli:picocli:4.7.7
1414
- org.yaml:snakeyaml:2.5

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
<maven.compiler.source>11</maven.compiler.source>
3333
<maven.compiler.target>11</maven.compiler.target>
3434
<mainClass>org.codejive.jvm.Main</mainClass>
35-
<version.devkitman>0.1.4</version.devkitman>
35+
<version.devkitman>0.3.0</version.devkitman>
3636
<version.asciitable>0.3.2</version.asciitable>
3737
<version.picocli>4.7.7</version.picocli>
3838
<version.snakeyaml>2.5</version.snakeyaml>

src/main/java/org/codejive/jvm/Main.java

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ static class ListInstalled extends CmdBase {
7878
public Integer call() {
7979
JdkManager manager = JdkManager.create();
8080
manager.getOrInstallJdk("11+");
81-
List<Jdk> jdks = manager.listInstalledJdks();
81+
List<Jdk.InstalledJdk> jdks = manager.listInstalledJdks();
8282
jdks.sort(Comparator.<Jdk>naturalOrder().reversed());
8383

8484
AsciiTable at = new AsciiTable();
@@ -87,7 +87,7 @@ public Integer call() {
8787
at.addRule();
8888
at.addRow("V", "Version", "Id", "Provider", "Home");
8989
at.addRule();
90-
for (Jdk jdk : jdks) {
90+
for (Jdk.InstalledJdk jdk : jdks) {
9191
at.addRow(
9292
jdk.majorVersion(),
9393
jdk.version(),
@@ -111,7 +111,7 @@ static class ListAvailable extends CmdBase {
111111
public Integer call() {
112112
System.err.println("Retrieving available Java versions, this can take a moment...");
113113
JdkManager manager = JdkManager.create();
114-
List<Jdk> jdks = manager.listAvailableJdks();
114+
List<Jdk.AvailableJdk> jdks = manager.listAvailableJdks();
115115
jdks.sort(Comparator.<Jdk>naturalOrder().reversed());
116116

117117
AsciiTable at = new AsciiTable();
@@ -120,7 +120,7 @@ public Integer call() {
120120
at.addRule();
121121
at.addRow("V", "Version", "Id", "Provider");
122122
at.addRule();
123-
for (Jdk jdk : jdks) {
123+
for (Jdk.AvailableJdk jdk : jdks) {
124124
at.addRow(jdk.majorVersion(), jdk.version(), jdk.id(), jdk.provider().name());
125125
}
126126
at.addRule();
@@ -193,7 +193,9 @@ public Integer call() {
193193
return 2;
194194
}
195195
}
196-
jdk.install();
196+
if (jdk.isInstalled()) {
197+
((Jdk.AvailableJdk) jdk).install();
198+
}
197199
if (!quiet) {
198200
System.err.println("Successfully installed Java version " + versionOrId);
199201
}
@@ -216,7 +218,8 @@ void setJavaVersion(String versionOrId) {
216218
@Override
217219
public Integer call() {
218220
JdkManager jdkMan = JdkManager.create();
219-
Jdk jdk = jdkMan.getInstalledJdk(versionOrId, JdkProvider.Predicates.canUpdate);
221+
Jdk.InstalledJdk jdk =
222+
jdkMan.getInstalledJdk(versionOrId, JdkProvider.Predicates.canUpdate);
220223
if (jdk == null) {
221224
System.err.println("Java version not installed: " + versionOrId);
222225
return 1;
@@ -294,7 +297,8 @@ public Integer call() throws IOException {
294297
return 0;
295298
}
296299
JdkManager jdkMan = JdkManager.create();
297-
Jdk jdk = jdkMan.getOrInstallJdk(javaVersionOptionMixin.getVersionOrId(quiet));
300+
Jdk.InstalledJdk jdk =
301+
jdkMan.getOrInstallJdk(javaVersionOptionMixin.getVersionOrId(quiet));
298302
if (Paths.get(cmd.get(0)).getNameCount() == 1) {
299303
Path cmdPath = OsUtils.searchPath(cmd.get(0), jdk.home().resolve("bin").toString());
300304
if (cmdPath != null) {

0 commit comments

Comments
 (0)