build: updates libraries and scala versions

vagmcs · Nov 13, 2024 · 33dd590 · 33dd590
1 parent 6c48d8d
commit 33dd590
Show file tree

Hide file tree

Showing 27 changed files with 37 additions and 58 deletions.
diff --git a/.cz.yaml b/.cz.yaml
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -9,9 +9,9 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        scala: [ 2.12.17, 2.13.10, 3.2.2 ]
+        scala: [ 2.12.20, 2.13.15, 3.3.4 ]
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - name: Set up JDK
         uses: actions/setup-java@v2
         with:

diff --git a/.gitignore b/.gitignore
@@ -19,6 +19,12 @@ project/boot/
 lib/
 project/project/
 /.bsp/
+.bloop
+
+### VsCode
+.vscode
+.metals
+metals.sbt
 
 ### Mac OSX
 Icon

diff --git a/core/src/main/scala/optimus/algebra/AlgebraOps.scala b/core/src/main/scala/optimus/algebra/AlgebraOps.scala
@@ -11,7 +11,7 @@
  *          \/////       \///             \/////    \///  \///   \///   \///  \/////////   \//////////
  *
  * The mathematical programming library for Scala.
- *     
+ *
  */
 
 package optimus.algebra

diff --git a/core/src/main/scala/optimus/algebra/Constraint.scala b/core/src/main/scala/optimus/algebra/Constraint.scala
@@ -11,7 +11,7 @@
  *          \/////       \///             \/////    \///  \///   \///   \///  \/////////   \//////////
  *
  * The mathematical programming library for Scala.
- *     
+ *
  */
 
 package optimus.algebra

diff --git a/core/src/main/scala/optimus/algebra/ConstraintRelation.scala b/core/src/main/scala/optimus/algebra/ConstraintRelation.scala
@@ -11,7 +11,7 @@
  *          \/////       \///             \/////    \///  \///   \///   \///  \/////////   \//////////
  *
  * The mathematical programming library for Scala.
- *     
+ *
  */
 
 package optimus.algebra

diff --git a/core/src/main/scala/optimus/algebra/ExpressionType.scala b/core/src/main/scala/optimus/algebra/ExpressionType.scala
@@ -11,7 +11,7 @@
  *          \/////       \///             \/////    \///  \///   \///   \///  \/////////   \//////////
  *
  * The mathematical programming library for Scala.
- *     
+ *
  */
 
 package optimus.algebra

diff --git a/core/src/main/scala/optimus/algebra/package.scala b/core/src/main/scala/optimus/algebra/package.scala
@@ -11,7 +11,7 @@
  *          \/////       \///             \/////    \///  \///   \///   \///  \/////////   \//////////
  *
  * The mathematical programming library for Scala.
- *     
+ *
  */
 
 package optimus

diff --git a/core/src/main/scala/optimus/common/Measure.scala b/core/src/main/scala/optimus/common/Measure.scala
@@ -11,7 +11,7 @@
  *          \/////       \///             \/////    \///  \///   \///   \///  \/////////   \//////////
  *
  * The mathematical programming library for Scala.
- *     
+ *
  */
 
 package optimus.common

diff --git a/core/src/main/scala/optimus/optimization/MPModel.scala b/core/src/main/scala/optimus/optimization/MPModel.scala
@@ -11,7 +11,7 @@
  *          \/////       \///             \/////    \///  \///   \///   \///  \/////////   \//////////
  *
  * The mathematical programming library for Scala.
- *     
+ *
  */
 
 package optimus.optimization

diff --git a/core/src/main/scala/optimus/optimization/MPSolver.scala b/core/src/main/scala/optimus/optimization/MPSolver.scala
@@ -11,7 +11,7 @@
  *          \/////       \///             \/////    \///  \///   \///   \///  \/////////   \//////////
  *
  * The mathematical programming library for Scala.
- *     
+ *
  */
 
 package optimus.optimization

diff --git a/core/src/main/scala/optimus/optimization/SolverFactory.scala b/core/src/main/scala/optimus/optimization/SolverFactory.scala
@@ -11,7 +11,7 @@
  *          \/////       \///             \/////    \///  \///   \///   \///  \/////////   \//////////
  *
  * The mathematical programming library for Scala.
- *     
+ *
  */
 
 package optimus.optimization

diff --git a/core/src/main/scala/optimus/optimization/enums/PreSolve.scala b/core/src/main/scala/optimus/optimization/enums/PreSolve.scala
@@ -11,7 +11,7 @@
  *          \/////       \///             \/////    \///  \///   \///   \///  \/////////   \//////////
  *
  * The mathematical programming library for Scala.
- *     
+ *
  */
 
 package optimus.optimization.enums

diff --git a/core/src/main/scala/optimus/optimization/enums/SolutionStatus.scala b/core/src/main/scala/optimus/optimization/enums/SolutionStatus.scala
@@ -11,7 +11,7 @@
  *          \/////       \///             \/////    \///  \///   \///   \///  \/////////   \//////////
  *
  * The mathematical programming library for Scala.
- *     
+ *
  */
 
 package optimus.optimization.enums

diff --git a/core/src/main/scala/optimus/optimization/enums/SolverLib.scala b/core/src/main/scala/optimus/optimization/enums/SolverLib.scala
@@ -11,7 +11,7 @@
  *          \/////       \///             \/////    \///  \///   \///   \///  \/////////   \//////////
  *
  * The mathematical programming library for Scala.
- *     
+ *
  */
 
 package optimus.optimization.enums

diff --git a/core/src/main/scala/optimus/optimization/model/MPConstraint.scala b/core/src/main/scala/optimus/optimization/model/MPConstraint.scala
@@ -11,7 +11,7 @@
  *          \/////       \///             \/////    \///  \///   \///   \///  \/////////   \//////////
  *
  * The mathematical programming library for Scala.
- *     
+ *
  */
 
 package optimus.optimization.model

diff --git a/core/src/main/scala/optimus/optimization/model/MPVar.scala b/core/src/main/scala/optimus/optimization/model/MPVar.scala
@@ -11,7 +11,7 @@
  *          \/////       \///             \/////    \///  \///   \///   \///  \/////////   \//////////
  *
  * The mathematical programming library for Scala.
- *     
+ *
  */
 
 package optimus.optimization.model

diff --git a/core/src/main/scala/optimus/optimization/model/ModelSpec.scala b/core/src/main/scala/optimus/optimization/model/ModelSpec.scala
@@ -11,7 +11,7 @@
  *          \/////       \///             \/////    \///  \///   \///   \///  \/////////   \//////////
  *
  * The mathematical programming library for Scala.
- *     
+ *
  */
 
 package optimus.optimization.model

diff --git a/core/src/main/scala/optimus/optimization/model/package.scala b/core/src/main/scala/optimus/optimization/model/package.scala
@@ -11,7 +11,7 @@
  *          \/////       \///             \/////    \///  \///   \///   \///  \/////////   \//////////
  *
  * The mathematical programming library for Scala.
- *     
+ *
  */
 
 package optimus.optimization

diff --git a/core/src/main/scala/optimus/optimization/package.scala b/core/src/main/scala/optimus/optimization/package.scala
@@ -11,7 +11,7 @@
  *          \/////       \///             \/////    \///  \///   \///   \///  \/////////   \//////////
  *
  * The mathematical programming library for Scala.
- *     
+ *
  */
 
 package optimus

diff --git a/project/Dependencies.scala b/project/Dependencies.scala
@@ -19,17 +19,17 @@ import sbt._
 object Dependencies {
 
   object v {
-    final val Logback = "1.2.11"
+    final val Logback = "1.5.12"
     final val ScalaLogging = "3.9.5"
 
-    final val ScalaTest = "3.2.15"
-    final val ScalaCheck = "1.17.0"
+    final val ScalaTest = "3.2.19"
+    final val ScalaCheck = "1.18.1"
     final val ScalaTestPlus = "3.2.11.0"
 
     final val LpSolve = "5.5.2.0"
     final val ojAlgorithms = "51.4.0"
     final val Trove = "3.1.0"
-    final val ScalaXML = "2.1.0"
+    final val ScalaXML = "2.3.0"
   }
 
   // Logging using slf4j and logback

diff --git a/project/OptimusBuild.scala b/project/OptimusBuild.scala
@@ -52,7 +52,7 @@ object OptimusBuild extends AutoPlugin {
 
   private lazy val settings: Seq[Setting[_]] = {
     logger.info(s"Loading options for Java $javaVersion.")
-    if (javaVersion < 1.8) sys.error("Java 8 or higher is required for building Optimus.")
+    if (javaVersion < 11) sys.error("Java 11 or higher is required for running Optimus.")
     else commonSettings ++ JavaSettings ++ ScalaSettings
   }
 
@@ -61,8 +61,8 @@ object OptimusBuild extends AutoPlugin {
     description := "Optimus is a mathematical programming library for Scala",
     headerLicense := Some(HeaderLicense.Custom(logo)),
     headerMappings := headerMappings.value + (HeaderFileType.scala -> HeaderCommentStyle.cStyleBlockComment),
-    scalaVersion := "3.2.2",
-    crossScalaVersions := Seq(scalaVersion.value, "2.13.10", "2.12.17"),
+    scalaVersion := "3.3.4",
+    crossScalaVersions := Seq(scalaVersion.value, "2.13.15", "2.12.20"),
     autoScalaLibrary := true,
     managedScalaInstance := true,
     coverageEnabled := false,
@@ -112,11 +112,6 @@ object OptimusBuild extends AutoPlugin {
   )
 
   private lazy val JavaSettings: Seq[Setting[_]] = Seq(
-    // Java compiler options
-    // source is the source code version required to compile.
-    // target is the oldest JRE version Optimus supports.
-    javacOptions ++= Seq("-source", "1.8", "-target", "1.8", "-Xlint:unchecked", "-Xlint:deprecation"),
-
     // Java runtime options
     javaOptions ++= Seq(
       "-XX:+DoEscapeAnalysis",
@@ -135,7 +130,6 @@ object OptimusBuild extends AutoPlugin {
             "-deprecation", // Emit warning and location for usages of deprecated APIs.
             "-unchecked", // Enable additional warnings where generated code depends on assumptions.
             "-feature", // Emit warning and location for usages of features that should be imported explicitly.
-            "-target:jvm-1.8", // Target JVM version 1.8.
             "-Ywarn-dead-code" // Warn when dead code is identified.
           )
         case "3" =>

diff --git a/project/build.properties b/project/build.properties
@@ -1 +1 @@
-sbt.version=1.8.2
+sbt.version=1.9.8
diff --git a/solver-gurobi/src/main/scala/optimus/optimization/Gurobi.scala b/solver-gurobi/src/main/scala/optimus/optimization/Gurobi.scala
@@ -11,7 +11,7 @@
  *          \/////       \///             \/////    \///  \///   \///   \///  \/////////   \//////////
  *
  * The mathematical programming library for Scala.
- *     
+ *
  */
 
 package optimus.optimization

diff --git a/solver-lp/src/main/scala/optimus/optimization/LPSolve.scala b/solver-lp/src/main/scala/optimus/optimization/LPSolve.scala
@@ -11,7 +11,7 @@
  *          \/////       \///             \/////    \///  \///   \///   \///  \/////////   \//////////
  *
  * The mathematical programming library for Scala.
- *     
+ *
  */
 
 package optimus.optimization

diff --git a/solver-mosek/src/main/scala/optimus/optimization/Mosek.scala b/solver-mosek/src/main/scala/optimus/optimization/Mosek.scala
@@ -11,7 +11,7 @@
  *          \/////       \///             \/////    \///  \///   \///   \///  \/////////   \//////////
  *
  * The mathematical programming library for Scala.
- *     
+ *
  */
 
 package optimus.optimization

diff --git a/solver-oj/src/main/scala/optimus/optimization/oJSolver.scala b/solver-oj/src/main/scala/optimus/optimization/oJSolver.scala
@@ -11,7 +11,7 @@
  *          \/////       \///             \/////    \///  \///   \///   \///  \/////////   \//////////
  *
  * The mathematical programming library for Scala.
- *     
+ *
  */
 
 package optimus.optimization
-Original file line number
+Diff line change
@@ Expand Up / @@ -11,7 +11,7 @@ @@
      *          \/////       \///             \/////    \///  \///   \///   \///  \/////////   \//////////
      *
      * The mathematical programming library for Scala.
-     *
+     *
      */
     package optimus.algebra
@@ Expand Down @@