Skip to content

Commit 33aebeb

Browse files
committed
feat: requestedJavaVersion honored by init templates
1 parent 3f7757d commit 33aebeb

7 files changed

Lines changed: 24 additions & 5 deletions

File tree

src/main/java/dev/jbang/cli/Init.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,7 @@ public Integer doCall() throws IOException {
8989
int reqVersion = buildMixin.javaVersion != null ? JavaUtil.minRequestedVersion(buildMixin.javaVersion)
9090
: JavaUtil.getCurrentMajorJavaVersion();
9191

92+
properties.put("requestedJavaVersion", buildMixin.javaVersion);
9293
properties.put("javaVersion", reqVersion);
9394
properties.put("compactSourceFiles", reqVersion >= 25);
9495
// properties.put("magiccontent", "//no gpt response. make sure you ran with

src/main/resources/init-agent.java.qute

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
11
///usr/bin/env jbang "$0" "$@" ; exit $?
2+
{#if requestedJavaVersion}
3+
//JAVA {requestedJavaVersion}
4+
{/if}
25
{#for dep in dependencies.orEmpty}
36
//DEPS {dep}
47
{/for}

src/main/resources/init-cli.java.qute

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
11
///usr/bin/env jbang "$0" "$@" ; exit $?
2+
{#if requestedJavaVersionr}
3+
//JAVA {requestedJavaVersion}
4+
{/if}
25
//DEPS info.picocli:picocli:4.6.3
36
{#for dep in dependencies.orEmpty}
47
//DEPS {dep}

src/main/resources/init-hello.groovy.qute

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
11
///usr/bin/env jbang "$0" "$@" ; exit $?
2+
{#if requestedJavaVersion}
3+
//JAVA {requestedJavaVersion}
4+
{/if}
25
{#for dep in dependencies.orEmpty}
36
//DEPS {dep}
47
{/for}

src/main/resources/init-hello.java.qute

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,23 @@
11
///usr/bin/env jbang "$0" "$@" ; exit $?
2+
{#if requestedJavaVersion}
3+
//JAVA {requestedJavaVersion}
4+
{#else if compactSourceFiles}
5+
//JAVA 25+
6+
{/if}
27
{#for dep in dependencies.orEmpty}
38
//DEPS {dep}
49
{/for}
510
{#if dependencies.isEmpty()}// //DEPS <dependency1> <dependency2>{/if}
6-
711
{#if magiccontent}
812
{magiccontent}
913
{#else}
10-
import static java.lang.System.*;
11-
1214
{#if compactSourceFiles}
1315
void main(String... args) {
14-
out.println("Hello World");
16+
IO.println("Hello World");
1517
}
1618
{#else}
19+
import static java.lang.System.*;
20+
1721
public class {baseName} {
1822

1923
public static void main(String... args) {

src/main/resources/init-hello.kt.qute

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
///usr/bin/env jbang "$0" "$@" ; exit $?
2-
2+
{#if requestedJavaVersion}
3+
//JAVA {requestedJavaVersion}
4+
{/if}
35
{#for dep in dependencies.orEmpty}
46
//DEPS {dep}
57
{/for}

src/main/resources/init-readme.md.qute

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,9 @@
33
Welcome to a basic example on how to do a readme.md file that can be run with JBang:
44

55
```java
6+
{#if requestedJavaVersion}
7+
//JAVA {requestedJavaVersion}
8+
{/if}
69
{#for dep in dependencies.orEmpty}
710
//DEPS {dep}
811
{/for}

0 commit comments

Comments
 (0)