Skip to content

Commit

Permalink
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
  • Loading branch information
flang committed Mar 3, 2023
2 parents e3e0aaa + 9549980 commit 5617769
Show file tree
Hide file tree
Showing 3 changed files with 67 additions and 2 deletions.
55 changes: 55 additions & 0 deletions .github/workflows/maven.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
# This workflow will build a Java project with Maven, and cache/restore any dependencies to improve the workflow execution time
# For more information see: https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-java-with-maven

# This workflow uses actions that are not certified by GitHub.
# They are provided by a third-party and are governed by
# separate terms of service, privacy policy, and support
# documentation.

name: Java CI with Maven

on:
push:
branches: [ "master" ]
pull_request:
branches: [ "master" ]

jobs:
build-vaadin14:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- name: Set up JDK
uses: actions/setup-java@v3
with:
java-version: '8'
distribution: 'temurin'
cache: maven
- name: Build (Vaadin 14)
run: mvn -B package --file pom.xml

build-vaadin23:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- name: Set up JDK
uses: actions/setup-java@v3
with:
java-version: '11'
distribution: 'temurin'
cache: maven
- name: Build (Vaadin 23)
run: mvn -B package --file pom.xml -Pv23

build-vaadin24:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- name: Set up JDK
uses: actions/setup-java@v3
with:
java-version: '17'
distribution: 'temurin'
cache: maven
- name: Build (Vaadin 24)
run: mvn -B package --file pom.xml -Pv24
11 changes: 10 additions & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.flowingcode.vaadin.addons</groupId>
<artifactId>twincolgrid</artifactId>
<version>2.9.2-SNAPSHOT</version>
<version>2.9.3-SNAPSHOT</version>
<name>TwinColGrid add-on</name>
<properties>
<vaadin.version>14.8.20</vaadin.version>
Expand Down Expand Up @@ -307,6 +307,15 @@
</plugins>
</build>
</profile>

<profile>
<id>v23</id>
<properties>
<vaadin.version>23.3.5</vaadin.version>
<maven.compiler.source>11</maven.compiler.source>
<maven.compiler.target>11</maven.compiler.target>
</properties>
</profile>

<profile>
<id>v24</id>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,8 @@ public OrientationDemo() {
twinColGrid.setValue(selectedBooks);

FormLayout formLayout = new FormLayout();
Select<TwinColGrid.Orientation> orientationField = new Select<>(Orientation.values());
Select<TwinColGrid.Orientation> orientationField = new Select<>();
orientationField.setItems(Orientation.values());
orientationField.addValueChangeListener(ev -> twinColGrid.withOrientation(ev.getValue()));
orientationField.setValue(twinColGrid.getOrientation());
orientationField.setWidth("225px");
Expand Down

0 comments on commit 5617769

Please sign in to comment.