Merge branch 'dev' of https://github.com/byuflowlab/Mex.jl into dev

byuflowlab · Oct 26, 2021 · 2321484 · 2321484
2 parents 84ea72e + f86de1d
commit 2321484
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
@@ -7,7 +7,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        julia-version: ['1.5']
+        julia-version: ['1.1', '1.2', '1.3', '1.4', '1.5']
         julia-arch: [x64]
         os: [ubuntu-latest]
 

diff --git a/Project.toml b/Project.toml
@@ -10,4 +10,5 @@ Reexport = "189a3867-3050-52da-a836-e630ba90ab69"
 
 [compat]
 julia = "1.0, 1.5"
-MATLAB = "0.8.2"
+MATLAB = "0.8"
+Reexport = "1"
diff --git a/README.md b/README.md
@@ -1,5 +1,7 @@
 # Mex.jl
 
+![](https://github.com/byuflowlab/Mex.jl/workflows/Run%20tests/badge.svg)
+
 *Embedding [Julia](http://julialang.org/) in the [MATLAB](http://www.mathworks.com/products/matlab/) process*
 
 **Mex.jl** embeds Julia into the MATLAB process using MATLAB's [C++ Mex interface](https://www.mathworks.com/help/matlab/cpp-mex-file-applications.html).  This allows Julia functions to be called from MATLAB.  This also allows (embedded) Julia to call MATLAB functions.  
@@ -125,4 +127,4 @@ ans =
 
 The first argument to `jl.mex` is the name of the function to be invoked. All remaining arguments are treated as function arguments. 
 
-`jl.mex` expects the functions on which it is invoked to accept a single argument of type `Vector{MATLAB.MxArray}` and to return an iterable collection of values on which `MATLAB.mxarray` may be successfully invoked (_e.g._, a value of type `Vector{MATLAB.MxArray}`).
+`jl.mex` expects the functions on which it is invoked to accept a single argument of type `Vector{MATLAB.MxArray}` and to return an iterable collection of values on which `MATLAB.mxarray` may be successfully invoked (_e.g._, a value of type `Vector{MATLAB.MxArray}`).