Merge pull request #3 from gbevin/main

Updated to latest versions
rife2 · Oct 19, 2023 · 9330c6e · 9330c6e
2 parents cdddd46 + 8e16b4b
commit 9330c6e
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 9 deletions.
diff --git a/.idea/app.iml b/.idea/app.iml
diff --git a/.idea/libraries/bld.xml b/.idea/libraries/bld.xml
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -8,6 +8,7 @@
     ],
     "java.configuration.updateBuildConfiguration": "automatic",
     "java.project.referencedLibraries": [
+        "${HOME}/.bld/dist/bld-1.7.4.jar",
         "lib/compile/*.jar",
         "lib/runtime/*.jar",
         "lib/standalone/*.jar",

diff --git a/lib/bld/bld-wrapper.jar b/lib/bld/bld-wrapper.jar
diff --git 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.7.0
+bld.version=1.7.4
diff --git a/src/bld/java/pokemon/PokemonBuild.java b/src/bld/java/pokemon/PokemonBuild.java
@@ -25,15 +25,15 @@ public PokemonBuild() {
 
         repositories = List.of(MAVEN_CENTRAL, SONATYPE_SNAPSHOTS);
         scope(compile)
-            .include(dependency("com.uwyn.rife2", "rife2", version(1,7,0)))
+            .include(dependency("com.uwyn.rife2", "rife2", version(1,7,2)))
             .include(dependency("dev.mccue", "json", version(0,2,3)));
         scope(test)
             .include(dependency("org.jsoup", "jsoup", version(1,16,1)))
             .include(dependency("org.junit.jupiter", "junit-jupiter", version(5,9,3)))
             .include(dependency("org.junit.platform", "junit-platform-console-standalone", version(1,9,3)));
         scope(standalone)
-            .include(dependency("org.eclipse.jetty", "jetty-server", version(11,0,15)))
-            .include(dependency("org.eclipse.jetty", "jetty-servlet", version(11,0,15)))
+            .include(dependency("org.eclipse.jetty", "jetty-server", version(11,0,17)))
+            .include(dependency("org.eclipse.jetty", "jetty-servlet", version(11,0,17)))
             .include(dependency("org.slf4j", "slf4j-simple", version(2,0,7)));
 
         precompileOperation()