Skip to content
This repository has been archived by the owner on Jul 22, 2024. It is now read-only.

Commit

Permalink
some cleanup after JLL merge
Browse files Browse the repository at this point in the history
  • Loading branch information
tknopp committed Nov 28, 2019
1 parent b00658d commit 0f8cd4f
Show file tree
Hide file tree
Showing 5 changed files with 20 additions and 45 deletions.
3 changes: 1 addition & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,14 +40,13 @@ addons:
script:
- if [[ -a .git/shallow ]]; then git fetch --unshallow; fi
- if [[ `uname` = "Linux" ]]; then TESTCMD="xvfb-run julia"; else TESTCMD="julia"; fi
- $TESTCMD -e 'using Pkg; pkg"add https://github.com/staticfloat/Cairo.jl#sf/jll_packages"'
- travis_wait 30 $TESTCMD -e 'using Pkg; Pkg.build(); Pkg.test(coverage=true)'

## uncomment following lines to deploy documentation
jobs:
include:
- stage: Documentation
julia: 1.2
julia: 1.3
os: linux
script:
- julia --project=docs -e 'using Pkg; Pkg.instantiate(); Pkg.add(PackageSpec(path=pwd()))'
Expand Down
23 changes: 19 additions & 4 deletions Project.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name = "Gtk"
uuid = "4c0ca9eb-093a-5379-98c5-f87ac0bbbf44"
version = "0.18.0"
version = "1.0.0"

[deps]
Cairo = "159f3aea-2a34-519c-b102-8c37f9878175"
Expand All @@ -19,6 +19,21 @@ gdk_pixbuf_jll = "da03df04-f53b-5353-a52f-6a8b0620ced0"
hicolor_icon_theme_jll = "059c91fe-1bad-52ad-bddd-f7b78713c282"

[compat]
Cairo = "≥ 0.7"
Graphics = "≥ 0.1.0"
julia = "≥ 1.3"
julia = "1.3"
Cairo = "1.0.0"
Cairo_jll = "1.16.0"
GTK3_jll = "3.24.11"
Glib_jll = "2.59.0"
Graphics = "0.4.0"
Reexport = "0.2"
adwaita_icon_theme_jll = "3.33.92"
gdk_pixbuf_jll = "2.38.2"
hicolor_icon_theme_jll = "0.17.0"

[extras]
Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"

[targets]
test = ["Test"]


1 change: 0 additions & 1 deletion appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@ install:

build_script:
- echo "%JL_BUILD_SCRIPT%"
- C:\julia\bin\julia -e "using Pkg; pkg\"add https://github.com/staticfloat/Cairo.jl#sf/jll_packages\""
- C:\julia\bin\julia -e "%JL_BUILD_SCRIPT%"

test_script:
Expand Down
37 changes: 0 additions & 37 deletions deps/ext.jl

This file was deleted.

1 change: 0 additions & 1 deletion src/Gtk.jl
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@ export GAccessor
include("basic_exports.jl")
include("long_exports.jl")
include("long_leaf_exports.jl")
include(joinpath("..", "deps", "ext.jl"))

global const libgtk_version = VersionNumber(
ccall((:gtk_get_major_version, libgtk), Cint, ()),
Expand Down

2 comments on commit 0f8cd4f

@tknopp
Copy link
Collaborator Author

@tknopp tknopp commented on 0f8cd4f Nov 29, 2019

Choose a reason for hiding this comment

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

@JuliaRegistrator register()

@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 created: JuliaRegistries/General/6007

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 Julia TagBot is installed, or can be done manually through the github interface, or via:

git tag -a v1.0.0 -m "<description of version>" 0f8cd4f33547942349050970f4434908243b8a11
git push origin v1.0.0

Please sign in to comment.