refactor: adapt to Vaadin snapshot changes (#575)

mcollovati · Feb 23, 2024 · 7e471d0 · 7e471d0
1 parent 0017bb4
commit 7e471d0
Show file tree

Hide file tree

Showing 23 changed files with 1,561 additions and 1,086 deletions.
diff --git a/etc/release-version-rules.xml b/etc/release-version-rules.xml
@@ -3,5 +3,6 @@
          xsi:schemaLocation="https://www.mojohaus.org/VERSIONS/RULE/2.1.0 https://www.mojohaus.org/versions/versions-model/xsd/rule-2.1.0.xsd">
   <rules>
     <rule groupId="com.vaadin.hilla" comparisonMethod="numeric"/>
+    <rule groupId="com.vaadin" comparisonMethod="numeric"/>
   </rules>
 </ruleset>
diff --git a/hilla-jandex/pom.xml b/hilla-jandex/pom.xml
@@ -15,8 +15,8 @@
 
     <dependencies>
         <dependency>
-            <groupId>com.vaadin.hilla</groupId>
-            <artifactId>endpoint</artifactId>
+            <groupId>com.vaadin</groupId>
+            <artifactId>hilla-endpoint</artifactId>
             <exclusions>
                 <exclusion>
                     <groupId>org.springframework</groupId>
@@ -33,7 +33,7 @@
             </exclusions>
         </dependency>
         <dependency>
-            <groupId>com.vaadin.hilla</groupId>
+            <groupId>com.vaadin</groupId>
             <artifactId>hilla</artifactId>
             <exclusions>
                 <exclusion>

diff --git a/hilla-react-jandex/pom.xml b/hilla-react-jandex/pom.xml
@@ -15,8 +15,8 @@
 
     <dependencies>
         <dependency>
-            <groupId>com.vaadin.hilla</groupId>
-            <artifactId>endpoint</artifactId>
+            <groupId>com.vaadin</groupId>
+            <artifactId>hilla-endpoint</artifactId>
             <exclusions>
                 <exclusion>
                     <groupId>org.springframework</groupId>
@@ -33,15 +33,19 @@
             </exclusions>
         </dependency>
         <dependency>
-            <groupId>com.vaadin.hilla</groupId>
-            <artifactId>hilla-react</artifactId>
+            <groupId>com.vaadin</groupId>
+            <artifactId>hilla</artifactId>
             <exclusions>
                 <exclusion>
                     <groupId>org.springframework.boot</groupId>
                     <artifactId>*</artifactId>
                 </exclusion>
             </exclusions>
         </dependency>
+        <dependency>
+            <groupId>com.vaadin</groupId>
+            <artifactId>vaadin-dev</artifactId>
+        </dependency>
     </dependencies>
 
     <build>

diff --git a/hilla-shaded-deps/pom.xml b/hilla-shaded-deps/pom.xml
@@ -15,12 +15,12 @@
 
     <dependencies>
         <dependency>
-            <groupId>com.vaadin.hilla</groupId>
-            <artifactId>endpoint</artifactId>
+            <groupId>com.vaadin</groupId>
+            <artifactId>hilla-endpoint</artifactId>
         </dependency>
         <dependency>
-            <groupId>com.vaadin.hilla</groupId>
-            <artifactId>engine-runtime</artifactId>
+            <groupId>com.vaadin</groupId>
+            <artifactId>hilla-engine-runtime</artifactId>
         </dependency>
         <!--
             vaadin-core-versions.json and vaadin-versions.json have been removed frm the Hilla artifacts in

diff --git a/integration-tests/hybrid-smoke-tests/frontend/auth.ts b/integration-tests/hybrid-smoke-tests/frontend/auth.ts
@@ -1,5 +1,5 @@
 // Uses the Vaadin provided login an logout helper methods
-import { login as loginImpl, LoginResult, logout as logoutImpl } from '@vaadin/hilla-core';
+import { login as loginImpl, LoginResult, logout as logoutImpl } from '@vaadin/hilla-frontend';
 import * as UserInfoEndpoint from 'Frontend/generated/UserInfoEndpoint';
 import UserInfo from 'Frontend/generated/com/example/application/entities/UserInfo';
 import {appStore} from "Frontend/stores/app-store";

diff --git a/integration-tests/hybrid-smoke-tests/frontend/views/helloworld/hello-world-view.ts b/integration-tests/hybrid-smoke-tests/frontend/views/helloworld/hello-world-view.ts
@@ -7,7 +7,7 @@ import * as HelloWorldEndpoint from 'Frontend/generated/HelloWorldEndpoint';
 import {html, nothing} from 'lit';
 import {customElement, state} from 'lit/decorators.js';
 import {View} from '../../views/view';
-import {Subscription} from "@vaadin/hilla-core";
+import {Subscription} from "@vaadin/hilla-frontend";
 
 @customElement('hello-world-view')
 export class HelloWorldView extends View {

diff --git a/integration-tests/hybrid-smoke-tests/frontend/views/push/push-view.ts b/integration-tests/hybrid-smoke-tests/frontend/views/push/push-view.ts
@@ -5,7 +5,7 @@ import * as HelloWorldEndpoint from 'Frontend/generated/HelloWorldEndpoint';
 import {html, nothing} from 'lit';
 import {customElement, state} from 'lit/decorators.js';
 import {View} from '../../views/view';
-import {Subscription} from "@vaadin/hilla-core";
+import {Subscription} from "@vaadin/hilla-frontend";
 import {
     getClock,
     getClockCancellable,