diff --git a/.github/workflows/bld.yml b/.github/workflows/bld.yml index b735609..7ab7ffa 100644 --- a/.github/workflows/bld.yml +++ b/.github/workflows/bld.yml @@ -8,7 +8,7 @@ jobs: strategy: matrix: - java-version: [ 17, 19 ] + java-version: [ 17, 19, 21 ] steps: - name: Checkout source repository diff --git a/.idea/bld.xml b/.idea/bld.xml new file mode 100644 index 0000000..6600cee --- /dev/null +++ b/.idea/bld.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/.idea/libraries/bld.xml b/.idea/libraries/bld.xml index 48e8fd5..8105a64 100644 --- a/.idea/libraries/bld.xml +++ b/.idea/libraries/bld.xml @@ -2,12 +2,12 @@ - + - + diff --git a/.idea/libraries/compile.xml b/.idea/libraries/compile.xml index 143dc93..5316b95 100644 --- a/.idea/libraries/compile.xml +++ b/.idea/libraries/compile.xml @@ -9,9 +9,9 @@ - - - - + + + + \ No newline at end of file diff --git a/.idea/libraries/runtime.xml b/.idea/libraries/runtime.xml index 2ae5c4b..d4069f2 100644 --- a/.idea/libraries/runtime.xml +++ b/.idea/libraries/runtime.xml @@ -8,7 +8,7 @@ - - + + \ No newline at end of file diff --git a/.idea/libraries/test.xml b/.idea/libraries/test.xml index c16475a..05f52ce 100644 --- a/.idea/libraries/test.xml +++ b/.idea/libraries/test.xml @@ -10,9 +10,9 @@ - - - - + + + + \ No newline at end of file diff --git a/.vscode/settings.json b/.vscode/settings.json index 4863b25..cea2254 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -9,7 +9,7 @@ ], "java.configuration.updateBuildConfiguration": "automatic", "java.project.referencedLibraries": [ - "${HOME}/.bld/dist/bld-1.9.1.jar", + "${HOME}/.bld/dist/bld-2.1.0.jar", "lib/**/*.jar" ] } diff --git a/lib/bld/bld-wrapper.jar b/lib/bld/bld-wrapper.jar index 76b0b29..ccabcba 100644 Binary files a/lib/bld/bld-wrapper.jar and b/lib/bld/bld-wrapper.jar differ diff --git a/lib/bld/bld-wrapper.properties b/lib/bld/bld-wrapper.properties index 8022d33..a32a939 100644 --- a/lib/bld/bld-wrapper.properties +++ b/lib/bld/bld-wrapper.properties @@ -3,4 +3,4 @@ bld.downloadExtensionSources=true bld.extensions= bld.repositories=MAVEN_CENTRAL,RIFE2_RELEASES bld.downloadLocation= -bld.version=1.9.1 +bld.version=2.1.0 diff --git a/src/bld/java/hello/AppBuild.java b/src/bld/java/hello/AppBuild.java index fd052e6..ae957e1 100644 --- a/src/bld/java/hello/AppBuild.java +++ b/src/bld/java/hello/AppBuild.java @@ -22,15 +22,15 @@ public class AppBuild extends WebProject { repositories = List.of(MAVEN_CENTRAL, RIFE2_RELEASES); scope(compile) - .include(dependency("com.uwyn.rife2", "rife2", version(1,8,0))); + .include(dependency("com.uwyn.rife2", "rife2", version(1,9,0))); scope(test) .include(dependency("org.jsoup", "jsoup", version(1,18,1))) - .include(dependency("org.junit.jupiter", "junit-jupiter", version(5,10,3))) - .include(dependency("org.junit.platform", "junit-platform-console-standalone", version(1,10,3))); + .include(dependency("org.junit.jupiter", "junit-jupiter", version(5,11,0))) + .include(dependency("org.junit.platform", "junit-platform-console-standalone", version(1,11,0))); scope(standalone) - .include(dependency("org.eclipse.jetty.ee10", "jetty-ee10", version(12,0,11))) - .include(dependency("org.eclipse.jetty.ee10", "jetty-ee10-servlet", version(12,0,11))) - .include(dependency("org.slf4j", "slf4j-simple", version(2,0,13))); + .include(dependency("org.eclipse.jetty.ee10", "jetty-ee10", version(12,0,12))) + .include(dependency("org.eclipse.jetty.ee10", "jetty-ee10-servlet", version(12,0,12))) + .include(dependency("org.slf4j", "slf4j-simple", version(2,0,16))); precompileOperation().templateTypes(HTML); }