Update to latest clingo

potassco · Oct 20, 2023 · 6b338c8 · 6b338c8
1 parent 4b73ce4
commit 6b338c8
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 15 deletions.
diff --git a/.github/workflows/ci-test.yml b/.github/workflows/ci-test.yml
@@ -14,15 +14,15 @@ jobs:
       - name: Conda install clingo
         shell: bash -l {0}
         run: |
-          conda install -c potassco clingo==5.5.2
+          conda install -c potassco clingo==5.6.2
       - name: Conda install clingo-dl
         shell: bash -l {0}
         run: |
-          conda install -c potassco clingo-dl==1.3.0
+          conda install -c potassco clingo-dl==1.4.0
       - name: Conda install clingcon
         shell: bash -l {0}
         run: |
-          conda install -c potassco clingcon==5.0.0
+          conda install -c potassco clingcon==5.2.0
       - name: Build
         run: |
           export CLINGO_LIBRARY_PATH=/usr/share/miniconda/envs/test/lib
@@ -41,19 +41,19 @@ jobs:
       - uses: conda-incubator/setup-miniconda@v2
         with:
           auto-update-conda: true
-          python-version: ${{ matrix.python-version }}
+          python-version: ${{ 3.9 }}
       - name: Conda install clingo
         shell: bash -l {0}
         run: |
-          conda install -c potassco clingo==5.5.2
+          conda install -c potassco clingo==5.6.2
       - name: Conda install clingo-dl
         shell: bash -l {0}
         run: |
-          conda install -c potassco clingo-dl==1.3.0
+          conda install -c potassco clingo-dl==1.4.0
       - name: Conda install clingcon
         shell: bash -l {0}
         run: |
-          conda install -c potassco clingcon==5.0.0
+          conda install -c potassco clingcon==5.2.0
       - name: Build
         run: |
           export CLINGO_LIBRARY_PATH=/usr/local/miniconda/envs/test/lib

diff --git a/Cargo.toml b/Cargo.toml
@@ -6,9 +6,9 @@ edition = "2018"
 publish = false
 
 [dependencies]
-clingo = "0.7.0"
-clingo-dl-plugin = { git = "https://github.com/potassco/clingo-dl-theory-rs", branch = "master" }
-clingcon-plugin = { git = "https://github.com/potassco/clingcon-theory-rs", branch = "master" }
+clingo = { git = "https://github.com/potassco/clingo-rs.git", branch = "st/wip" }
+clingo-dl-plugin = { git = "https://github.com/potassco/clingo-dl-theory-rs", branch = "st/wip" }
+clingcon-plugin = { git = "https://github.com/potassco/clingcon-theory-rs", branch = "st/wip" }
 rocket = { version = "0.5.0-rc.2", features = ["json"] }
 parking_lot = "0.12"
 thiserror = "1.0"

diff --git a/src/utils.rs b/src/utils.rs
@@ -1,12 +1,12 @@
 use clingcon_plugin::ConTheory;
 use clingo::{
-    ast, control, ClingoError, Configuration, ConfigurationType, Control, Id, Model, Part,
-    ShowType, SolveHandle, SolveHandleWithEventHandler, SolveMode, SolverLiteral, Statistics,
-    StatisticsType, Symbol, SymbolicAtoms, TruthValue,
+    ast, control, ClingoError, Configuration, ConfigurationType, Control, DefaultCtx,
+    GenericSolveHandle, Id, Model, Part, ShowType, SolveHandle, SolveMode, SolverLiteral,
+    Statistics, StatisticsType, Symbol, SymbolicAtoms, TruthValue,
 };
 use clingo_dl_plugin::DLTheory;
-type DLSolveHandle = SolveHandleWithEventHandler<DLEventHandler>;
-type ConSolveHandle = SolveHandleWithEventHandler<ConEventHandler>;
+type DLSolveHandle = GenericSolveHandle<DefaultCtx, DLEventHandler>;
+type ConSolveHandle = GenericSolveHandle<DefaultCtx, ConEventHandler>;
 use clingo::theory::Theory;
 use rocket::response::{self, Responder};
 use rocket::serde::json::Json;