Retrofit for AntRun 1.10.4

liflab · May 7, 2023 · 09e590f · 09e590f
1 parent 6c5e220
commit 09e590f
Show file tree

Hide file tree

Showing 11 changed files with 17 additions and 16 deletions.
diff --git a/Source/Charts/config.xml b/Source/Charts/config.xml
@@ -24,6 +24,10 @@
 
   <!-- The project's name -->
   <name>Programmatic Spreadsheet - Charts</name>
+
+  <targetjdk>8</targetjdk>
+  <version>0.2</version>
+  <package>ca/uqac/lif/spreadsheet/charts/</package>
 
   <!-- The project's author. Currently this only
   shows up in the footer of the Javadoc documentation. -->
@@ -63,7 +67,7 @@
       <name>Petit Poucet Core</name>
       <classname>ca.uqac.lif.petitpoucet.Part</classname>
       <files>
-        <jar>https://github.com/liflab/petitpoucet/releases/download/v2.1-beta3/petitpoucet-core.jar</jar>
+        <jar>https://github.com/liflab/petitpoucet/releases/download/v2.3/petitpoucet-core-2.3.jar</jar>
       </files>
       <bundle>false</bundle>
     </dependency>
@@ -74,7 +78,7 @@
       <name>Petit Poucet Functions</name>
       <classname>ca.uqac.lif.petitpoucet.function.Function</classname>
       <files>
-        <jar>https://github.com/liflab/petitpoucet/releases/download/v2.1-beta3/petitpoucet-functions.jar</jar>
+        <jar>https://github.com/liflab/petitpoucet/releases/download/v2.3/petitpoucet-functions-2.3.jar</jar>
       </files>
       <bundle>false</bundle>
     </dependency>

diff --git a/Source/Core/srctest/ca/uqac/lif/spreadsheet/functions/CellFormulaTest.java b/Source/Core/srctest/ca/uqac/lif/spreadsheet/functions/CellFormulaTest.java
@@ -28,8 +28,6 @@
 import ca.uqac.lif.petitpoucet.function.number.Addition;
 import ca.uqac.lif.spreadsheet.Cell;
 import ca.uqac.lif.spreadsheet.Spreadsheet;
-import ca.uqac.lif.spreadsheet.functions.CellFormula;
-import ca.uqac.lif.spreadsheet.functions.ValueOf;
 
 public class CellFormulaTest
 {

diff --git a/Source/Core/srctest/ca/uqac/lif/spreadsheet/functions/ExpandAsColumnsTest.java b/Source/Core/srctest/ca/uqac/lif/spreadsheet/functions/ExpandAsColumnsTest.java
@@ -28,7 +28,6 @@
 import ca.uqac.lif.petitpoucet.function.NthOutput;
 import ca.uqac.lif.spreadsheet.Cell;
 import ca.uqac.lif.spreadsheet.Spreadsheet;
-import ca.uqac.lif.spreadsheet.functions.ExpandAsColumns;
 import ca.uqac.lif.spreadsheet.functions.SpreadsheetFunction.InputCell;
 
 public class ExpandAsColumnsTest

diff --git a/Source/Core/srctest/ca/uqac/lif/spreadsheet/functions/MergeTest.java b/Source/Core/srctest/ca/uqac/lif/spreadsheet/functions/MergeTest.java
@@ -28,7 +28,6 @@
 import ca.uqac.lif.petitpoucet.function.NthOutput;
 import ca.uqac.lif.spreadsheet.Cell;
 import ca.uqac.lif.spreadsheet.Spreadsheet;
-import ca.uqac.lif.spreadsheet.functions.Merge;
 
 public class MergeTest
 {

diff --git a/Source/Gral/src/ca/uqac/lif/spreadsheet/chart/gral/GralBoxPlot.java b/Source/Gral/src/ca/uqac/lif/spreadsheet/chart/gral/GralBoxPlot.java
@@ -17,9 +17,9 @@
  */
 package ca.uqac.lif.spreadsheet.chart.gral;
 
-import ca.uqac.lif.petitpoucet.NodeFactory;
 import ca.uqac.lif.petitpoucet.Part;
 import ca.uqac.lif.petitpoucet.PartNode;
+import ca.uqac.lif.petitpoucet.function.RelationNodeFactory;
 import ca.uqac.lif.spreadsheet.Spreadsheet;
 import ca.uqac.lif.spreadsheet.chart.BoxPlot;
 import de.erichseifert.gral.data.DataSource;

diff --git a/Source/Gral/src/ca/uqac/lif/spreadsheet/chart/gral/GralPieChart.java b/Source/Gral/src/ca/uqac/lif/spreadsheet/chart/gral/GralPieChart.java
@@ -1,6 +1,6 @@
 /*
     A provenance-aware spreadsheet library
-    Copyright (C) 2021-2022 Sylvain Hallé
+    Copyright (C) 2021-2023 Sylvain Hallé
 
     This program is free software: you can redistribute it and/or modify
     it under the terms of the GNU Lesser General Public License as published by
@@ -17,9 +17,9 @@
  */
 package ca.uqac.lif.spreadsheet.chart.gral;
 
-import ca.uqac.lif.petitpoucet.NodeFactory;
 import ca.uqac.lif.petitpoucet.Part;
 import ca.uqac.lif.petitpoucet.PartNode;
+import ca.uqac.lif.petitpoucet.function.RelationNodeFactory;
 import ca.uqac.lif.spreadsheet.Spreadsheet;
 import ca.uqac.lif.spreadsheet.chart.PieChart;
 import de.erichseifert.gral.graphics.Insets2D;

diff --git a/Source/Gral/src/ca/uqac/lif/spreadsheet/chart/gral/GralPlot.java b/Source/Gral/src/ca/uqac/lif/spreadsheet/chart/gral/GralPlot.java
@@ -21,9 +21,9 @@
 import java.io.IOException;
 import java.io.OutputStream;
 
-import ca.uqac.lif.petitpoucet.NodeFactory;
 import ca.uqac.lif.petitpoucet.Part;
 import ca.uqac.lif.petitpoucet.PartNode;
+import ca.uqac.lif.petitpoucet.function.RelationNodeFactory;
 import ca.uqac.lif.spreadsheet.Spreadsheet;
 import ca.uqac.lif.spreadsheet.chart.Chart;
 import ca.uqac.lif.spreadsheet.chart.ChartFormat;

diff --git a/Source/Gral/src/ca/uqac/lif/spreadsheet/chart/gral/GralScatterplot.java b/Source/Gral/src/ca/uqac/lif/spreadsheet/chart/gral/GralScatterplot.java
@@ -1,6 +1,6 @@
 /*
     A provenance-aware spreadsheet library
-    Copyright (C) 2021-2022 Sylvain Hallé
+    Copyright (C) 2021-2023 Sylvain Hallé
 
     This program is free software: you can redistribute it and/or modify
     it under the terms of the GNU Lesser General Public License as published by
@@ -17,9 +17,9 @@
  */
 package ca.uqac.lif.spreadsheet.chart.gral;
 
-import ca.uqac.lif.petitpoucet.NodeFactory;
 import ca.uqac.lif.petitpoucet.Part;
 import ca.uqac.lif.petitpoucet.PartNode;
+import ca.uqac.lif.petitpoucet.function.RelationNodeFactory;
 import ca.uqac.lif.spreadsheet.Spreadsheet;
 import ca.uqac.lif.spreadsheet.chart.Scatterplot;
 import de.erichseifert.gral.data.DataSeries;

diff --git a/Source/Relations/src/ca/uqac/lif/spreadsheet/relation/Join.java b/Source/Relations/src/ca/uqac/lif/spreadsheet/relation/Join.java
@@ -25,7 +25,6 @@
 import ca.uqac.lif.petitpoucet.function.InvalidArgumentTypeException;
 import ca.uqac.lif.petitpoucet.function.InvalidNumberOfArgumentsException;
 import ca.uqac.lif.spreadsheet.Spreadsheet;
-import ca.uqac.lif.spreadsheet.functions.Merge;
 
 public class Join extends RelationalOperator
 {

diff --git a/Source/Relations/src/ca/uqac/lif/spreadsheet/relation/RelationalOperator.java b/Source/Relations/src/ca/uqac/lif/spreadsheet/relation/RelationalOperator.java
@@ -1,6 +1,6 @@
 /*
     A provenance-aware spreadsheet library
-    Copyright (C) 2021-2022 Sylvain Hallé
+    Copyright (C) 2021-2023 Sylvain Hallé
 
     This program is free software: you can redistribute it and/or modify
     it under the terms of the GNU Lesser General Public License as published by
@@ -28,6 +28,7 @@
 import ca.uqac.lif.petitpoucet.PartNode;
 import ca.uqac.lif.petitpoucet.function.AtomicFunction;
 import ca.uqac.lif.petitpoucet.function.NthOutput;
+import ca.uqac.lif.petitpoucet.function.RelationNodeFactory;
 import ca.uqac.lif.spreadsheet.Cell;
 import ca.uqac.lif.spreadsheet.Spreadsheet;
 

diff --git a/Source/Units/config.xml b/Source/Units/config.xml
@@ -94,7 +94,8 @@
       <name>lif-units</name>
       <bundle>false</bundle>
       <classname>ca.uqac.lif.units.DimensionValue</classname>
-      <files>
-        <jar>https://github.com/liflab/lif-units/releases/download/v1.2/lif-units-1.2.jar
+      <files>        <jar>https://github.com/liflab/lif-units/releases/download/v1.2/lif-units-1.2.jar</jar>
+      </files>
+    </dependency>
   </dependencies>
 </build>