Skip to content

Commit

Permalink
Merge pull request #2 from JuliaImGui/1.9-compat
Browse files Browse the repository at this point in the history
Add support for 1.9+
  • Loading branch information
JamesWrigley authored Jun 28, 2024
2 parents 4157e2f + 75934f1 commit 73b511c
Show file tree
Hide file tree
Showing 5 changed files with 23 additions and 12 deletions.
13 changes: 9 additions & 4 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,8 @@ jobs:
fail-fast: false
matrix:
version:
- 'pre'
- '1.9'
- '1'
- 'nightly'
os:
- ubuntu-latest
Expand All @@ -32,12 +33,16 @@ jobs:
arch: ${{ matrix.arch }}
- uses: julia-actions/cache@v2
- uses: julia-actions/julia-buildpkg@v1

- uses: julia-actions/julia-runtest@v1
with:
prefix: xvfb-run -a -s '-screen 0 1024x768x24'
- uses: julia-actions/[email protected]
env:
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}

- uses: julia-actions/julia-processcoverage@v1
- uses: codecov/codecov-action@v4
with:
files: lcov.info
token: ${{ secrets.CODECOV_TOKEN }}

docs:
name: Documentation
Expand Down
4 changes: 3 additions & 1 deletion Project.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ CImGuiPack_jll = "333409e9-af72-5310-9767-d6ad21a76a05"
Compat = "34da2185-b29b-5c13-b0c7-acf172513d20"
CxxWrap = "1f15a43c-97ca-5a2a-ae31-89f07a497df4"
DocStringExtensions = "ffbed154-4ef7-542d-bbb7-c09d3a79fcae"
ScopedValues = "7e506255-f358-4e82-b7e4-beb19740aa63"
Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"

[compat]
Expand All @@ -17,5 +18,6 @@ CImGuiPack_jll = "0.3"
Compat = "4.15.0"
CxxWrap = "0.16.0"
DocStringExtensions = "0.9.3"
ScopedValues = "1.2.1"
Test = "1"
julia = "1.11"
julia = "1.9"
5 changes: 0 additions & 5 deletions docs/src/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,6 @@ Known issues:
- Many functions don't have Julia bindings yet (though adding them is fairly
straightforward).

!!! compat
The package currently requires a minimum of Julia 1.11, but that's mostly
due to laziness. If you really want it for earlier versions, open an issue
and we'll see what we can do.

Here's a quick example:
```julia
# Imports that we'll be using
Expand Down
7 changes: 6 additions & 1 deletion src/ImGuiTestEngine.jl
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,12 @@ include("coroutine.jl")

import Test
import CImGui.lib as libig
import Base.ScopedValues: ScopedValue, @with

if !isdefined(Base, :ScopedValues)
import ScopedValues: ScopedValue, @with
else
import Base.ScopedValues: ScopedValue, @with
end
include("context.jl")

import CImGui as ig
Expand Down
6 changes: 5 additions & 1 deletion test/runtests.jl
Original file line number Diff line number Diff line change
Expand Up @@ -309,6 +309,10 @@ if haskey(ENV, "CI")
# We skip the ambiguity tests because we currently have a bazillion
# ambiguities from the C++ wrappers.
# TODO: fix the ambiguities.
Aqua.test_all(te; ambiguities=false)
Aqua.test_all(te;
ambiguities=false,
# And we ignore ScopedValues because it won't be loaded on
# 1.11+ since it'll be loaded from Base.
stale_deps=(; ignore=[:ScopedValues]))
end
end

2 comments on commit 73b511c

@JamesWrigley
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@JuliaRegistrator
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Registration pull request updated: JuliaRegistries/General/109944

Tip: Release Notes

Did you know you can add release notes too? Just add markdown formatted text underneath the comment after the text
"Release notes:" and it will be added to the registry PR, and if TagBot is installed it will also be added to the
release that TagBot creates. i.e.

@JuliaRegistrator register

Release notes:

## Breaking changes

- blah

To add them here just re-invoke and the PR will be updated.

Tagging

After the above pull request is merged, it is recommended that a tag is created on this repository for the registered package version.

This will be done automatically if the Julia TagBot GitHub Action is installed, or can be done manually through the github interface, or via:

git tag -a v0.1.0 -m "<description of version>" 73b511c9f9a0baff4d0b2fea38da5621d6431e2a
git push origin v0.1.0

Please sign in to comment.