Julia v1.10 (#11)

Update to be compatible with Julia v1.10 and CxxWrap v0.14.

.github/workflows/dev-nobuild.yml

@@ -15,6 +15,7 @@ jobs:
         version:
           - '1.8'
           - '1.9'
+          - '1.10'
         os:
           - ubuntu-latest
         arch:

.github/workflows/dev.yml

@@ -2,8 +2,7 @@ name: Dev
 on:
   pull_request:
   push:
-    branches:
-      - main
+    branches: '*'
     tags: '*'
 jobs:
   test:
@@ -15,6 +14,7 @@ jobs:
         version:
           - {name: '1.8', version: '1.8'}
           - {name: '1.9', version: '1.9'}
+          - {name: '1.10', version: '1.10'}
         os:
           - ubuntu-latest
         arch:

.github/workflows/stable.yml

@@ -15,6 +15,7 @@ jobs:
         version:
           - '1.8'
           - '1.9'
+          - '1.10'
         os:
           - ubuntu-latest
         arch:

Project.toml

@@ -11,10 +11,10 @@ Unitful = "1986cc42-f94f-5a68-af5c-568840ba703d"
 casacorecxx_jll = "689e2960-4160-5310-ae7f-2d2095288874"
 
 [compat]
-casacorecxx_jll = "0.2.1"
-CEnum = "0.4"
-CxxWrap = "0.12"
-julia = "1.8, 1.9"
+casacorecxx_jll = "0.3.0"
+CEnum = "0.5"
+CxxWrap = "0.14"
+julia = "1.8, 1.9, 1.10"
 Unitful = "1"
 
 [extras]

build_tarballs.jl

@@ -3,7 +3,7 @@
 using BinaryBuilder, Pkg
 
 name = "casacorecxx"
-version = v"0.2.1"
+version = v"0.3.0"
 
 # Collection of sources required to complete build
 sources = [DirectorySource("casacorecxx")]
@@ -32,11 +32,11 @@ platforms = expand_cxxstring_abis(platforms)
 products = Product[LibraryProduct("libcasacorecxx", :libcasacorecxx),]
 
 # Dependencies that must be installed before this package can be built
-dependencies = [Dependency("libcxxwrap_julia_jll"),
-                Dependency("casacore_jll"),
+dependencies = [Dependency("libcxxwrap_julia_jll", compat="0.11.2"),
+                Dependency("casacore_jll", compat="3.5.1"),
                 BuildDependency("libjulia_jll")]
 
 # Build the tarballs, and possibly a `build.jl` as well.
 build_tarballs(ARGS, name, version, sources, script, platforms, products, dependencies;
                julia_compat="1.8",
-               preferred_gcc_version=v"12") # We need C++17 for CxxWrap
+               preferred_gcc_version=v"7") # We need C++17 for CxxWrap

casacorecxx/src/casacorecxx.cpp

@@ -34,11 +34,11 @@ class JuliaState: public AppState {
 public:
     JuliaState(std::string measuresDir) : _measuresDir(measuresDir) {}
 
-    std::string measuresDir() const {
+    std::string measuresDir() const override {
         return _measuresDir;
     }
 
-    bool initialized() const {
+    bool initialized() const override {
         return true;
     }
 
@@ -135,7 +135,9 @@ JLCXX_MODULE define_julia_module(jlcxx::Module &mod) {
         .constructor<std::string>();
 
     mod.add_type<AppStateSource>("AppStateSource")
-        .method("initialize", &AppStateSource::initialize);
+        .method("initialize", [](AppState& appstate) {
+            AppStateSource::initialize(&appstate);
+        });
 
     /*
      * UTILITIES
@@ -644,4 +646,4 @@ JLCXX_MODULE define_julia_module(jlcxx::Module &mod) {
 
     mod.method("Observatories", &casacore::MeasTable::Observatories);
     mod.method("Observatory", &casacore::MeasTable::Observatory);
-}
+}

src/LibCasacore.jl

@@ -4,15 +4,15 @@ using casacorecxx_jll
 using CxxWrap
 using Pkg.Artifacts
 
-@wrapmodule(libcasacorecxx)
+@wrapmodule(casacorecxx_jll.get_libcasacorecxx_path)
 
 function __init__()
     @initcxx
 
     # Configure Casacore data paths.
     # Set juliastate as global since casacore holds the pointer and expects the object to remain alive.
     global juliastate = JuliaState(artifact"measures")
-    initialize(CxxPtr(juliastate))
+    initialize(juliastate)
 end
 
 # Vector: implements iteration, indexing
@@ -144,4 +144,4 @@ function Slicer(is::Vararg{Union{Int, OrdinalRange}, N}) where N
     )
 end
 
-end
+end