diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index dcf46582..50cfd65a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -1,5 +1,5 @@ ############################################################################### -# Copyright (c) 2022, 2023 SWTChart project +# Copyright (c) 2022, 2024 SWTChart project # # This program and the accompanying materials are made available under the # terms of the Eclipse Public License 2.0 which is available at @@ -15,6 +15,9 @@ name: Continuous Integration on: pull_request: +permissions: + contents: read + jobs: build: runs-on: ubuntu-latest @@ -22,13 +25,24 @@ jobs: steps: - name: Checkout SWTChart uses: actions/checkout@v3 - - name: Set up JDK 17 - uses: actions/setup-java@v3 + + - uses: sdkman/sdkman-action@main + name: Setup Temurin + id: temurin with: - distribution: 'temurin' - java-version: '17' - cache: 'maven' + candidate: java + version: 17.0.11-tem + + - uses: sdkman/sdkman-action@main + name: Setup Maven + id: maven + with: + candidate: maven + version: 3.9.6 + - name: Build with Maven uses: coactions/setup-xvfb@v1 with: - run: mvn -f org.eclipse.swtchart.cbi/pom.xml -T 1C verify --batch-mode --no-transfer-progress + run: | + source $HOME/.sdkman/bin/sdkman-init.sh + mvn -f org.eclipse.swtchart.cbi/pom.xml -T 1C verify --batch-mode --no-transfer-progress diff --git a/org.eclipse.swtchart.cbi/pom.xml b/org.eclipse.swtchart.cbi/pom.xml index c3632323..29353932 100644 --- a/org.eclipse.swtchart.cbi/pom.xml +++ b/org.eclipse.swtchart.cbi/pom.xml @@ -87,9 +87,9 @@ --> - 2.7.5 - 2.7.1 - 2.9.1 + 4.0.7 + 3.22.0 + 3.3.1 org.eclipse.tycho org.apache.maven.plugins @@ -184,7 +184,7 @@ true -nl en - + ${maven.groupid} diff --git a/org.eclipse.swtchart.extensions.examples/META-INF/MANIFEST.MF b/org.eclipse.swtchart.extensions.examples/META-INF/MANIFEST.MF index a674eff8..066b54b5 100644 --- a/org.eclipse.swtchart.extensions.examples/META-INF/MANIFEST.MF +++ b/org.eclipse.swtchart.extensions.examples/META-INF/MANIFEST.MF @@ -12,8 +12,8 @@ Require-Bundle: org.eclipse.ui, org.eclipse.swtchart.extensions;bundle-version="0.14.0", org.eclipse.e4.ui.di;bundle-version="1.1.100", org.eclipse.e4.ui.model.workbench;bundle-version="1.2.0.v20160229-1459", - org.eclipse.swtchart.customcharts;bundle-version="0.14.0", - jakarta.inject.jakarta.inject-api;bundle-version="2.0.1" + org.eclipse.swtchart.customcharts;bundle-version="0.14.0" Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-ActivationPolicy: lazy Export-Package: org.eclipse.swtchart.extensions.examples.support +Import-Package: jakarta.inject;version="2.0.1" diff --git a/org.eclipse.swtchart.extensions.test/META-INF/MANIFEST.MF b/org.eclipse.swtchart.extensions.test/META-INF/MANIFEST.MF index b77d11a9..934790d4 100644 --- a/org.eclipse.swtchart.extensions.test/META-INF/MANIFEST.MF +++ b/org.eclipse.swtchart.extensions.test/META-INF/MANIFEST.MF @@ -7,4 +7,5 @@ Bundle-Version: 0.14.0.qualifier Bundle-Vendor: ChemClipse Fragment-Host: org.eclipse.swtchart.extensions;bundle-version="0.14.0" Bundle-RequiredExecutionEnvironment: JavaSE-17 -Require-Bundle: org.junit;bundle-version="4.12.0" +Require-Bundle: org.junit;bundle-version="4.12.0", + org.eclipse.jdt.junit4.runtime;bundle-version="1.3.100" diff --git a/org.eclipse.swtchart.targetplatform/org.eclipse.swtchart.targetplatform.target b/org.eclipse.swtchart.targetplatform/org.eclipse.swtchart.targetplatform.target index e12d881c..ddf1caa4 100644 --- a/org.eclipse.swtchart.targetplatform/org.eclipse.swtchart.targetplatform.target +++ b/org.eclipse.swtchart.targetplatform/org.eclipse.swtchart.targetplatform.target @@ -2,15 +2,22 @@ - - - - - - - - - - + + + + + + + + + + + + + + + + + diff --git a/org.eclipse.swtchart.test/src/org/eclipse/swtchart/AxisTest.java b/org.eclipse.swtchart.test/src/org/eclipse/swtchart/AxisTest.java index ae878996..297c9a9a 100755 --- a/org.eclipse.swtchart.test/src/org/eclipse/swtchart/AxisTest.java +++ b/org.eclipse.swtchart.test/src/org/eclipse/swtchart/AxisTest.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2008, 2023 SWTChart project. + * Copyright (c) 2008, 2024 SWTChart project. * * This program and the accompanying materials are made * available under the terms of the Eclipse Public License 2.0 @@ -494,7 +494,7 @@ public void testAdjustRange() { showChart(); yRange = yAxis.getRange(); assertEquals(0d, yRange.lower, 0.01); - assertEquals(4.42, yRange.upper, 0.01); // was before 4.41 + assertEquals(4.43, yRange.upper, 0.01); barSeries.setYSeries(ySeries4); showChart(); yAxis.adjustRange(); @@ -509,7 +509,7 @@ public void testAdjustRange() { yAxis.adjustRange(); showChart(); yRange = yAxis.getRange(); - assertEquals(-5.14, yRange.lower, 0.01); // was before -5.13 + assertEquals(-5.15, yRange.lower, 0.01); assertEquals(0d, yRange.upper, 0.01); // bar + vertical orientation barSeries.setYSeries(ySeries2); diff --git a/org.eclipse.swtchart.test/src/org/eclipse/swtchart/AxisTickTest.java b/org.eclipse.swtchart.test/src/org/eclipse/swtchart/AxisTickTest.java index 76bc512e..b8df3c5b 100755 --- a/org.eclipse.swtchart.test/src/org/eclipse/swtchart/AxisTickTest.java +++ b/org.eclipse.swtchart.test/src/org/eclipse/swtchart/AxisTickTest.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2008, 2023 SWTChart project. + * Copyright (c) 2008, 2024 SWTChart project. * * This program and the accompanying materials are made * available under the terms of the Eclipse Public License 2.0 @@ -286,7 +286,7 @@ public void testTickLabelValues() { chart.getAxisSet().adjustRange(); showChart(); double[] values = yAxisTick.getTickLabelValues(); - double[] expected = {0.0, 0.2, 0.4, 0.6, 0.8, 1.0}; + double[] expected = {0.0, 0.5, 1.0}; assertEquals(expected.length, values.length); for(int i = 0; i < expected.length; i++) { assertEquals(expected[i], values[i], 0);