Tested with Julia 1.9

ianna · May 10, 2023 · a4be39a · a4be39a
1 parent e59a21b
commit a4be39a
Show file tree

Hide file tree

Showing 8 changed files with 22 additions and 17 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -50,7 +50,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
-      - uses: julia-actions/setup-julia@v1.8
+      - uses: julia-actions/setup-julia@v1
         with:
           version: '1'
       - name: Set up Python

diff --git a/examples/TestEm3/TestEm3.ipynb b/examples/TestEm3/TestEm3.ipynb
@@ -368,15 +368,15 @@
  ],
  "metadata": {
   "kernelspec": {
-   "display_name": "Julia 1.8.5",
+   "display_name": "Julia 1.9.0",
    "language": "julia",
-   "name": "julia-1.8"
+   "name": "julia-1.9"
   },
   "language_info": {
    "file_extension": ".jl",
    "mimetype": "application/julia",
    "name": "julia",
-   "version": "1.8.5"
+   "version": "1.9.0"
   }
  },
  "nbformat": 4,

diff --git a/examples/WaterPhantom/Project.toml b/examples/WaterPhantom/Project.toml
@@ -1,6 +1,6 @@
 [deps]
-CSV = "336ed68f-0bac-5ca0-87d4-7b16caf5d00b"
 BenchmarkTools = "6e4b80f9-dd63-53aa-95a3-0cdb28fa8baf"
+CSV = "336ed68f-0bac-5ca0-87d4-7b16caf5d00b"
 FHist = "68837c9b-b678-4cd5-9925-8a54edc8f695"
 Geant4 = "559df036-b7a0-42fd-85df-7d5dd9d70f44"
 Geant4_julia_jll = "e202cb52-5471-567a-9cb0-0ca301e27810"

diff --git a/examples/WaterPhantom/WaterPhantom.ipynb b/examples/WaterPhantom/WaterPhantom.ipynb
@@ -304,15 +304,15 @@
  ],
  "metadata": {
   "kernelspec": {
-   "display_name": "Julia 1.8.5",
+   "display_name": "Julia 1.9.0",
    "language": "julia",
-   "name": "julia-1.8"
+   "name": "julia-1.9"
   },
   "language_info": {
    "file_extension": ".jl",
    "mimetype": "application/julia",
    "name": "julia",
-   "version": "1.8.5"
+   "version": "1.9.0"
   },
   "orig_nbformat": 4
  },

diff --git a/examples/basic/B1/B1.ipynb b/examples/basic/B1/B1.ipynb
@@ -1,6 +1,7 @@
 {
  "cells": [
   {
+   "attachments": {},
    "cell_type": "markdown",
    "metadata": {},
    "source": [
@@ -19,6 +20,7 @@
    ]
   },
   {
+   "attachments": {},
    "cell_type": "markdown",
    "metadata": {},
    "source": [
@@ -47,6 +49,7 @@
    ]
   },
   {
+   "attachments": {},
    "cell_type": "markdown",
    "metadata": {},
    "source": [
@@ -76,6 +79,7 @@
    ]
   },
   {
+   "attachments": {},
    "cell_type": "markdown",
    "metadata": {},
    "source": [
@@ -101,6 +105,7 @@
    ]
   },
   {
+   "attachments": {},
    "cell_type": "markdown",
    "metadata": {},
    "source": [
@@ -144,15 +149,15 @@
  ],
  "metadata": {
   "kernelspec": {
-   "display_name": "Julia 1.8.5",
+   "display_name": "Julia 1.9.0",
    "language": "julia",
-   "name": "julia-1.8"
+   "name": "julia-1.9"
   },
   "language_info": {
    "file_extension": ".jl",
    "mimetype": "application/julia",
    "name": "julia",
-   "version": "1.8.5"
+   "version": "1.9.0"
   }
  },
  "nbformat": 4,

diff --git a/examples/basic/B2/B2a.ipynb b/examples/basic/B2/B2a.ipynb
@@ -280,15 +280,15 @@
  ],
  "metadata": {
   "kernelspec": {
-   "display_name": "Julia 1.8.5",
+   "display_name": "Julia 1.9.0",
    "language": "julia",
-   "name": "julia-1.8"
+   "name": "julia-1.9"
   },
   "language_info": {
    "file_extension": ".jl",
    "mimetype": "application/julia",
    "name": "julia",
-   "version": "1.8.5"
+   "version": "1.9.0"
   }
  },
  "nbformat": 4,

diff --git a/gen/Geant4.wit b/gen/Geant4.wit
@@ -7,10 +7,10 @@ out_h_fname         = "cpp/jlGeant4.h"
 include_dirs        = [ "/usr/local/opt/llvm/include/c++/v1", 
                         "/usr/local/opt/llvm@13/lib/clang/13.0.1/include", 
                         "./cpp", 
-                        "/Users/mato/.julia/artifacts/9d4b417a98ec8f720b8871baefe87108f864656f/include/Geant4",
+                        "/Users/mato/.julia/artifacts/3ddffb81697f6dd4742c75d8b8d14865fe8a388c/include/Geant4",
                         "/Users/mato/.julia/artifacts/873cac66ad4ed154c44c11514f103918776c832d/include",
                         "/Applications/Julia-1.8.app/Contents/Resources/julia/include/julia",  
-                        "/Users/mato/.julia/artifacts/62eae10c647bb4ea186063b758bc3fc5881a34f1/lib/cmake/JlCxx/../../../include"]
+                        "/Users/mato/.julia/artifacts/6fab6270d8576dd5a20a5e0ed05a971c7673cf21/lib/cmake/JlCxx/../../../include"]
 
 input               = [ "Geant4Wrap.h",
                         "G4RunManager.hh",

diff --git a/src/G4JLInterface.jl b/src/G4JLInterface.jl
@@ -20,7 +20,7 @@ end
 function G4JLActionInitialization(f::Function)
     ff(self::ConstCxxPtr{G4JLActionInitialization}) = f(self[])
     sf = @safe_cfunction($ff, Nothing, (ConstCxxPtr{G4JLActionInitialization},))  # crate a safe c function
-    G4JLActionInitialization(preserve(sf))                                        # call the construction                        
+    G4JLActionInitialization(preserve(sf), preserve(sf))                          # call the construction                        
 end
 
 #---Material friendly functions (keyword arguments)------------------------------------------------