upgrade to Vaadin version 24

bisq-network · Nov 30, 2023 · 736129f · 736129f
1 parent ffcfa77
commit 736129f
Show file tree

Hide file tree

Showing 12 changed files with 197 additions and 421 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -1,4 +1,4 @@
 [submodule "bisq"]
 	path = bisq
 	url = https://github.com/salokiam/bisq2.git
-	branch = update-to-vaadin24
+	branch = up-bisq2-libs
diff --git a/.run/Alice_clear.run.xml b/.run/Alice_clear.run.xml
@@ -2,8 +2,8 @@
   <configuration default="false" name="Alice_clear" type="Application" factoryName="Application">
     <option name="ALTERNATIVE_JRE_PATH" value="corretto-18" />
     <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="true" />
-    <option name="MAIN_CLASS_NAME" value="bisq.desktopapp.Main" />
-    <module name="bisq.desktopapp.main" />
+    <option name="MAIN_CLASS_NAME" value="bisq.desktop_app.DesktopApp" />
+    <module name="bisq.desktop_app.main" />
     <option name="PROGRAM_PARAMETERS" value="--appName=bisq2_Alice --data-dir=~/work/bisq2/web-ui/" />
     <option name="VM_PARAMETERS" value="-Dapplication.network.supportedTransportTypes.0=CLEAR -Dapplication.network.seedAddressByTransportType.clear.0=127.0.0.1:8000 -Dapplication.network.seedAddressByTransportType.clear.1=127.0.0.1:8001" />
     <method v="2">

diff --git a/.run/Charly_clear.run.xml b/.run/Charly_clear.run.xml
diff --git a/.run/Seed_1.run.xml b/.run/Seed_1.run.xml
@@ -4,7 +4,7 @@
       <env name="APPDATA" value="~/work/bisq2/web-ui/" />
     </envs>
     <option name="MAIN_CLASS_NAME" value="bisq.seed_node.SeedNodeApp" />
-    <module name="bisq.seed_node_app.test" />
+    <module name="bisq.seed_node_app.main" />
     <option name="PROGRAM_PARAMETERS" value="--appName=bisq2_seed1" />
     <option name="VM_PARAMETERS" value="-Dapplication.network.defaultNodePortByTransportType.clear=8000 -Dapplication.network.supportedTransportTypes.0=CLEAR -Dapplication.network.seedAddressByTransportType.clear.0=127.0.0.1:8000 -Dapplication.network.seedAddressByTransportType.clear.1=127.0.0.1:8001" />
     <method v="2">

diff --git a/.run/Seed_2.run.xml b/.run/Seed_2.run.xml
@@ -3,10 +3,10 @@
     <envs>
       <env name="APPDATA" value="~/work/bisq2/web-ui/" />
     </envs>
-    <option name="MAIN_CLASS_NAME" value="bisq.seed.SeedMain" />
-    <module name="bisq.seed.main" />
+    <option name="MAIN_CLASS_NAME" value="bisq.seed_node.SeedNodeApp" />
+    <module name="bisq.seed_node_app.main" />
     <option name="PROGRAM_PARAMETERS" value="--appName=bisq2_seed2" />
-    <option name="VM_PARAMETERS" value="-Dapplication.network.defaultNodePortByTransportType.clear=8001 -Dapplication.network.supportedTransportTypes.0=CLEAR -Dapplication.network.seedAddressByTransportType.clear.0=127.0.0.1:8000 -Dapplication.network.seedAddressByTransportType.clear.1=127.0.0.1:8001" />
+    <option name="VM_PARAMETERS" value="-Dapplication.network.configByTransportType.clear.defaultNodePort=8001 -Dapplication.network.supportedTransportTypes.0=CLEAR -Dapplication.network.seedAddressByTransportType.clear.0=127.0.0.1:8000 -Dapplication.network.seedAddressByTransportType.clear.1=127.0.0.1:8001" />
     <method v="2">
       <option name="Make" enabled="true" />
     </method>

diff --git a/.run/Tomcat 9.0.64 vanilla2.run.xml b/.run/Tomcat 9.0.64 vanilla2.run.xml
diff --git a/build.gradle b/build.gradle
@@ -11,7 +11,7 @@ plugins {
     id 'com.vaadin'
 }
 
-vaadinVersion = '23.1.3'
+vaadinVersion = '24.2.5'
 
 defaultTasks("build")
 

diff --git a/gradle.properties b/gradle.properties
@@ -1 +1 @@
-vaadinVersion=23.1.2
+vaadinVersion=24.2.5