Skip to content

Commit

Permalink
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'v3.0.0' of github.com:FlowingCode/TwinColGridAddon into…
Browse files Browse the repository at this point in the history
… v3.0.0
flang committed Jul 7, 2023
2 parents 5617769 + aa49587 commit fe6230d
Showing 5 changed files with 59 additions and 4 deletions.
8 changes: 8 additions & 0 deletions .github/workflows/commits.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
name: Check Commits

on:
pull_request:

jobs:
check-commits:
uses: FlowingCode/GithubActions/.github/workflows/check-commits.yml@main
22 changes: 18 additions & 4 deletions pom.xml
Original file line number Diff line number Diff line change
@@ -3,14 +3,15 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.flowingcode.vaadin.addons</groupId>
<artifactId>twincolgrid</artifactId>
<version>2.9.3-SNAPSHOT</version>
<version>3.0.0-SNAPSHOT</version>
<name>TwinColGrid add-on</name>
<properties>
<vaadin.version>14.8.20</vaadin.version>
<maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<jetty.version>9.4.36.v20210114</jetty.version>
</properties>
<organization>
<name>Flowing Code</name>
@@ -126,7 +127,7 @@
<dependency>
<groupId>com.flowingcode.vaadin.addons.demo</groupId>
<artifactId>commons-demo</artifactId>
<version>3.5.0</version>
<version>3.6.0</version>
<scope>test</scope>
</dependency>
</dependencies>
@@ -161,10 +162,23 @@
</configuration>
</plugin>

<plugin>
<groupId>com.vaadin</groupId>
<artifactId>vaadin-maven-plugin</artifactId>
<version>${vaadin.version}</version>
<executions>
<execution>
<goals>
<goal>prepare-frontend</goal>
</goals>
</execution>
</executions>
</plugin>

<plugin>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-maven-plugin</artifactId>
<version>9.4.36.v20210114</version>
<version>${jetty.version}</version>
<configuration>
<scanIntervalSeconds>3</scanIntervalSeconds>
<!-- Use test scope because the UI/demo classes are in
@@ -322,7 +336,7 @@
<properties>
<maven.compiler.source>17</maven.compiler.source>
<maven.compiler.target>17</maven.compiler.target>
<vaadin.version>24.0.0.alpha6</vaadin.version>
<vaadin.version>24.0.0.beta1</vaadin.version>
<jetty.version>11.0.12</jetty.version>
</properties>
<repositories>
Original file line number Diff line number Diff line change
@@ -18,6 +18,9 @@
* #L%
*/

.twincol-grid {
min-height: calc(var(--lumo-space-m) * 13);
}
.twincol-grid .twincol-grid-label {
color: var(--lumo-secondary-text-color);
font-weight: 500;
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
package com.flowingcode.vaadin.addons.twincolgrid;

import com.vaadin.flow.component.select.Select;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;

/** Binary compatibility utils for Vaadin 14-24 */
public class CompatibilityExtension {

private static final Method setItems = lookupSetItems();

private static Method lookupSetItems() {
try {
return Select.class.getMethod("setItems", Object[].class);
} catch (NoSuchMethodException e) {
throw new RuntimeException(e);
}
}

public static <T> void setItems(Select<T> select, T[] items) {
try {
setItems.invoke(select, (Object) items);
} catch (IllegalAccessException | InvocationTargetException e) {
throw new RuntimeException(e);
}
}

}
Original file line number Diff line number Diff line change
@@ -30,11 +30,13 @@
import java.util.HashSet;
import java.util.List;
import java.util.Set;
import lombok.experimental.ExtensionMethod;

@SuppressWarnings("serial")
@PageTitle("Orientation")
@DemoSource
@Route(value = "twincolgrid/orientation", layout = TwincolDemoView.class)
@ExtensionMethod(CompatibilityExtension.class) // hide-source
public class OrientationDemo extends VerticalLayout {

private final Set<Book> selectedBooks = new HashSet<>();

0 comments on commit fe6230d

Please sign in to comment.