diff --git a/Project.toml b/Project.toml index d78249f3ed1..545cbf8a96e 100644 --- a/Project.toml +++ b/Project.toml @@ -83,7 +83,7 @@ LinearAlgebra = "1" LinearMaps = "2.7, 3.0" LoopVectorization = "0.12.151" MPI = "0.20.6" -Makie = "0.19, 0.20" +Makie = "0.21" MuladdMacro = "0.2.2" NLsolve = "4.5.1" Octavian = "0.3.21" @@ -94,10 +94,10 @@ PrecompileTools = "1.1" Preferences = "1.3" Printf = "1" RecipesBase = "1.1" -RecursiveArrayTools = "2.38.10" +RecursiveArrayTools = "3" Reexport = "1.0" Requires = "1.1" -SciMLBase = "1.90, 2" +SciMLBase = "2.67.0" SimpleUnPack = "1.1" SparseArrays = "1" StableRNGs = "1.0.2" @@ -115,7 +115,7 @@ TriplotBase = "0.1" TriplotRecipes = "0.1" TrixiBase = "0.1.3" UUIDs = "1.6" -julia = "1.8" +julia = "1.10" [extras] Convex = "f65535da-76fb-5f13-bab9-19810c17039a" diff --git a/src/auxiliary/precompile.jl b/src/auxiliary/precompile.jl index 5a1de036808..83bdf8e1633 100644 --- a/src/auxiliary/precompile.jl +++ b/src/auxiliary/precompile.jl @@ -387,7 +387,8 @@ function _precompile_manual_() @assert Base.precompile(Tuple{DiscreteCallback{typeof(Trixi.summary_callback), typeof(Trixi.summary_callback), typeof(Trixi.initialize_summary_callback), - typeof(SciMLBase.FINALIZE_DEFAULT)}}) + typeof(SciMLBase.FINALIZE_DEFAULT), + typeof(nothing)}}) @assert Base.precompile(Tuple{typeof(summary_box), Base.TTY, String, Vector{Pair{String, Any}}}) # TODO: AMRCallback, ControllerThreeLevel, indicators @@ -523,7 +524,8 @@ function _precompile_manual_() summary_callback_type = DiscreteCallback{typeof(Trixi.summary_callback), typeof(Trixi.summary_callback), typeof(Trixi.initialize_summary_callback), - typeof(SciMLBase.FINALIZE_DEFAULT)} + typeof(SciMLBase.FINALIZE_DEFAULT), + typeof(nothing)} @assert Base.precompile(Tuple{typeof(show), Base.TTY, summary_callback_type}) @assert Base.precompile(Tuple{typeof(show), IOContext{Base.TTY}, MIME"text/plain", summary_callback_type}) @@ -533,14 +535,16 @@ function _precompile_manual_() alive_callback_type = DiscreteCallback{AliveCallback, AliveCallback, typeof(Trixi.initialize!), - typeof(SciMLBase.FINALIZE_DEFAULT)} + typeof(SciMLBase.FINALIZE_DEFAULT), + typeof(nothing)} @assert Base.precompile(Tuple{typeof(show), Base.TTY, alive_callback_type}) @assert Base.precompile(Tuple{typeof(show), IOContext{Base.TTY}, MIME"text/plain", alive_callback_type}) restart_callback_type = DiscreteCallback{SaveRestartCallback, SaveRestartCallback, typeof(Trixi.initialize!), - typeof(SciMLBase.FINALIZE_DEFAULT)} + typeof(SciMLBase.FINALIZE_DEFAULT), + typeof(nothing)} @assert Base.precompile(Tuple{typeof(show), Base.TTY, restart_callback_type}) @assert Base.precompile(Tuple{typeof(show), IOContext{Base.TTY}, MIME"text/plain", restart_callback_type}) @@ -549,7 +553,8 @@ function _precompile_manual_() save_solution_callback_type = DiscreteCallback{SaveSolutionCallback{typeof(solution_variables)}, SaveSolutionCallback{typeof(solution_variables)}, typeof(Trixi.initialize!), - typeof(SciMLBase.FINALIZE_DEFAULT)} + typeof(SciMLBase.FINALIZE_DEFAULT), + typeof(nothing)} @assert Base.precompile(Tuple{typeof(show), Base.TTY, save_solution_callback_type}) @assert Base.precompile(Tuple{typeof(show), IOContext{Base.TTY}, @@ -561,7 +566,8 @@ function _precompile_manual_() stepsize_callback_type = DiscreteCallback{StepsizeCallback{RealT}, StepsizeCallback{RealT}, typeof(Trixi.initialize!), - typeof(SciMLBase.FINALIZE_DEFAULT)} + typeof(SciMLBase.FINALIZE_DEFAULT), + typeof(nothing)} @assert Base.precompile(Tuple{typeof(show), Base.TTY, stepsize_callback_type}) @assert Base.precompile(Tuple{typeof(show), IOContext{Base.TTY}, MIME"text/plain", stepsize_callback_type}) @@ -569,7 +575,8 @@ function _precompile_manual_() glm_speed_callback_type = DiscreteCallback{GlmSpeedCallback{RealT}, GlmSpeedCallback{RealT}, typeof(Trixi.initialize!), - typeof(SciMLBase.FINALIZE_DEFAULT)} + typeof(SciMLBase.FINALIZE_DEFAULT), + typeof(nothing)} @assert Base.precompile(Tuple{typeof(show), Base.TTY, glm_speed_callback_type}) @assert Base.precompile(Tuple{typeof(show), IOContext{Base.TTY}, MIME"text/plain", glm_speed_callback_type}) @@ -577,7 +584,8 @@ function _precompile_manual_() lbm_collision_callback_type = DiscreteCallback{typeof(Trixi.lbm_collision_callback), typeof(Trixi.lbm_collision_callback), typeof(Trixi.initialize!), - typeof(SciMLBase.FINALIZE_DEFAULT)} + typeof(SciMLBase.FINALIZE_DEFAULT), + typeof(nothing)} @assert Base.precompile(Tuple{typeof(show), Base.TTY, lbm_collision_callback_type}) @assert Base.precompile(Tuple{typeof(show), IOContext{Base.TTY}, MIME"text/plain", lbm_collision_callback_type}) diff --git a/test/Project.toml b/test/Project.toml index f9a6241421b..bac75b6a40c 100644 --- a/test/Project.toml +++ b/test/Project.toml @@ -22,7 +22,7 @@ Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40" [compat] Aqua = "0.8" -CairoMakie = "0.10" +CairoMakie = "0.12" Convex = "0.16" DelimitedFiles = "1" DoubleFloats = "1.4.0"