Update to MOI v1

.github/workflows/GitHubCI.yml

@@ -55,6 +55,13 @@ jobs:
             ${{ runner.os }}-test-${{ env.cache-name }}-
             ${{ runner.os }}-test-
             ${{ runner.os }}-
+      - name: CPE
+        shell: julia --project=@. {0}
+        run: |
+          using Pkg
+          Pkg.add([
+              PackageSpec(name="ConstraintProgrammingExtensions", rev="master"),
+          ])
       - uses: julia-actions/julia-buildpkg@v1
       - uses: julia-actions/julia-runtest@v1
       - uses: julia-actions/julia-processcoverage@v1

Project.toml

@@ -1,7 +1,7 @@
 name = "JaCoP"
 uuid = "02462d8f-a5b3-44fd-8fd4-3169fe7a24c5"
 authors = ["Thibaut Cuvelier <[email protected]>"]
-repo = "https://github.com/dourouc05/JaCoP.jl"
+repo = "https://github.com/JuliaConstraints/JaCoP.jl"
 version = "0.1.0"
 
 [deps]
@@ -12,7 +12,7 @@ Downloads = "f43a241f-c20a-4ad4-852c-f6b1247861c6"
 Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
 
 [compat]
-julia = "^1.6"
-MathOptInterface = "^0.10"
-ConstraintProgrammingExtensions = "^0.6.2, ^0.7"
-JavaCall = "^0.7.4"
+julia = "1.6"
+MathOptInterface = "1"
+ConstraintProgrammingExtensions = "0.7"
+JavaCall = "0.8"

src/java_wrapper.jl

@@ -6,29 +6,23 @@
 # These correspond to Java types (which are directly returned by the functions
 # in this binder). In particular, the inheritance defined in Java is not brought
 # back to Julia.
-const Store = JavaObject{Symbol("org.jacop.core.Store")}
+const Store = @jimport org.jacop.core.Store
 
-const BooleanVar = JavaObject{Symbol("org.jacop.core.BooleanVar")}
-const IntVar = JavaObject{Symbol("org.jacop.core.IntVar")}
-const SetVar = JavaObject{Symbol("org.jacop.set.core.SetVar")}
-const FloatVar = JavaObject{Symbol("org.jacop.floats.core.FloatVar")}
-const CircuitVar = JavaObject{Symbol("org.jacop.constraints.CircuitVar")}
+const BooleanVar = @jimport org.jacop.core.BooleanVar
+const IntVar = @jimport org.jacop.core.IntVar
+const SetVar = @jimport org.jacop.set.core.SetVar
+const FloatVar = @jimport org.jacop.floats.core.FloatVar
+const CircuitVar = @jimport org.jacop.constraints.CircuitVar
 
-const Constraint = JavaObject{Symbol("org.jacop.constraints.Constraint")}
-const LinearInt = JavaObject{Symbol("org.jacop.constraints.LinearInt")}
-const Alldifferent = JavaObject{Symbol("org.jacop.constraints.Alldifferent")}
-const In = JavaObject{Symbol("org.jacop.constraints.In")}
-const XeqC = JavaObject{Symbol("org.jacop.constraints.XeqC")}
+const Constraint = @jimport org.jacop.constraints.Constraint
+const LinearInt = @jimport org.jacop.constraints.LinearInt
+const Alldifferent = @jimport org.jacop.constraints.Alldifferent
+const In = @jimport org.jacop.constraints.In
+const XeqC = @jimport org.jacop.constraints.XeqC
 
 # Unions of types to model Java type hierarchy.
 
-const Variable = Union{
-    BooleanVar,
-    IntVar,
-    SetVar,
-    FloatVar,
-    CircuitVar,
-}
+const Variable = Union{BooleanVar, IntVar, SetVar, FloatVar, CircuitVar}
 
 # Add a constraint to a store.