diff --git a/.cz.yaml b/.cz.yaml deleted file mode 100644 index 0922db1..0000000 --- a/.cz.yaml +++ /dev/null @@ -1,21 +0,0 @@ -commitizen: - name: cz_customize - tag_format: v$version - version: 0.1.0 - customize: - change_type_order: ["BREAKING CHANGE", "feat", "build", "fix", "perf", "refactor", "style"] - commit_parser: "^(?Pfeature|feat|bug fix|bug|fix|perf|build|ci|docs|refactor):\\s(?P.*)?" - changelog_pattern: "^(feature|feat|bugfix|bug|fix|perf|build|ci|docs|refactor|perf)?(!)?" - change_type_map: - feat: Features - feature: Features - bug fix: Fixes - bugfix: Fixes - bug: Fixes - fix: Fixes - ci: CI - build: Build - docs: Documentation - refactor: Refactor - perf: Performance - style: Code style \ No newline at end of file diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 4c4d953..1359e04 100644 --- 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 index f1cf65f..6fe9295 100644 --- 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 index ec321f0..f7ce716 100644 --- 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 index 81f590e..795a2a3 100644 --- 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 index 7011caa..7e35652 100644 --- 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 index e62e159..524184e 100644 --- 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 index 1fb642e..96b8c27 100644 --- 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 index 7172d1c..df276e6 100644 --- 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 index 20180d2..e875106 100644 --- 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 index 7452390..4dae9d0 100644 --- 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 index b10a5ff..7692646 100644 --- 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 index 4f797a9..5c6f422 100644 --- 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 index 8293838..9a06d53 100644 --- 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 index 238f4a0..6e18e36 100644 --- 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 index 108367f..60cba14 100644 --- 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 index da77e0b..298b75a 100644 --- 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 index 052244c..cf3d543 100644 --- 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 index 23a1507..b2028eb 100644 --- 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 index 744d53e..e5a4909 100644 --- 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 index 8c4510c..be346c5 100644 --- 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 index ddd564a..7c7e30f 100644 --- 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 index 875272d..8cf07b7 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=1.8.2 \ No newline at end of file +sbt.version=1.9.8 \ No newline at end of file diff --git a/solver-gurobi/src/main/scala/optimus/optimization/Gurobi.scala b/solver-gurobi/src/main/scala/optimus/optimization/Gurobi.scala index 30ce8d0..864b8d4 100644 --- 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 index c709a3b..5ab6247 100644 --- 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 index d630c26..542a5d3 100644 --- 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 index 8eaf7b9..6106d0f 100644 --- 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