diff --git a/.github/workflows/IntegrationTest.yml b/.github/workflows/IntegrationTest.yml index 8e56e57..e727042 100644 --- a/.github/workflows/IntegrationTest.yml +++ b/.github/workflows/IntegrationTest.yml @@ -21,7 +21,7 @@ jobs: strategy: fail-fast: false matrix: - julia-version: [1] + julia-version: ["1"] os: [ubuntu-latest] package: - { user: JuliaPluto, repo: PlutoDependencyExplorer.jl } @@ -30,7 +30,7 @@ jobs: steps: - uses: actions/checkout@v4 - - uses: julia-actions/setup-julia@v1 + - uses: julia-actions/setup-julia@v2 with: version: ${{ matrix.julia-version }} arch: x64 diff --git a/.github/workflows/Test.yml b/.github/workflows/Test.yml index 4de6ec0..7c31eca 100644 --- a/.github/workflows/Test.yml +++ b/.github/workflows/Test.yml @@ -25,7 +25,7 @@ jobs: # Without setting this, a failing test cancels all others fail-fast: false matrix: - julia-version: ["1.6", "1", "~1.11.0-0", "nightly"] + julia-version: ["1.10", "1", "nightly"] # , "~1.12.0-0"] os: [ubuntu-latest] steps: @@ -33,10 +33,10 @@ jobs: - uses: actions/checkout@v4 # Makes the `julia` command available - - uses: julia-actions/setup-julia@v1 + - uses: julia-actions/setup-julia@v2 with: version: ${{ matrix.julia-version }} - - uses: julia-actions/cache@v1 + - uses: julia-actions/cache@v2 # 🚗 - uses: julia-actions/julia-runtest@v1 diff --git a/Project.toml b/Project.toml index 33c0ccc..2680092 100644 --- a/Project.toml +++ b/Project.toml @@ -2,10 +2,10 @@ name = "ExpressionExplorer" uuid = "21656369-7473-754a-2065-74616d696c43" license = "MIT" authors = ["Paul Berg ", "Fons van der Plas "] -version = "1.0.4" +version = "1.0.5" [compat] -julia = "1.6" +julia = "1.10" [extras] Markdown = "d6f4376e-aef5-505a-96c1-9c027394607a" diff --git a/test/ExpressionExplorer.jl b/test/ExpressionExplorer.jl index e6f0ec2..31e63ec 100644 --- a/test/ExpressionExplorer.jl +++ b/test/ExpressionExplorer.jl @@ -280,13 +280,10 @@ end @test testee(:(try 1 catch e; e finally a end), [:a], [], [], []) @test testee(:(try 1 finally a end), [:a], [], [], []) - # try catch else was introduced in 1.8 - @static if VERSION >= v"1.8.0" - @test testee(Meta.parse("try 1 catch else x = 1; x finally a; end"), [:a], [], [], []) - @test testee(Meta.parse("try 1 catch else x = j; x finally a; end"), [:a, :j], [], [], []) - @test testee(Meta.parse("try x = 2 catch else x finally a; end"), [:a, :x], [], [], []) - @test testee(Meta.parse("try x = 2 catch else x end"), [:x], [], [], []) - end + @test testee(:(try 1 catch else x = 1; x finally a; end), [:a], [], [], []) + @test testee(:(try 1 catch else x = j; x finally a; end), [:a, :j], [], [], []) + @test testee(:(try x = 2 catch else x finally a; end), [:a, :x], [], [], []) + @test testee(:(try x = 2 catch else x end), [:x], [], [], []) end @testset "Comprehensions" begin @test testee(:([sqrt(s) for s in 1:n]), [:n], [], [:sqrt, :(:)], [])