drop GRPreferences via include instead

jheinen · Sep 23, 2022 · 3693598 · 3693598
1 parent e4e9d06
commit 3693598
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 15 deletions.
diff --git a/GRPreferences/Project.toml b/GRPreferences/Project.toml
diff --git a/Project.toml b/Project.toml
@@ -6,12 +6,13 @@ version = "0.68.0"
 [deps]
 Base64 = "2a0f44e3-6c83-55bd-87e4-b1978d98bd5f"
 DelimitedFiles = "8bb1440f-4735-579b-a4ab-409b98df4dab"
-GRPreferences = "4263741e-4124-4656-8b93-99c97da2f5ef"
+GR_jll = "d2c73de3-f751-5644-a686-071e5b155ba9"
 HTTP = "cd3eb016-35fb-5094-929b-558a96fad6f3"
 JSON = "682c06a0-de6a-54ab-a142-c8b1cf79cde6"
 Libdl = "8f399da3-3557-5675-b5ff-fb832c97cbdb"
 LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
 Pkg = "44cfe95a-1eb2-52ea-b672-e2afdf69b78f"
+Preferences = "21216c6a-2e73-6563-6e65-726566657250"
 Printf = "de0858da-6303-5e67-8744-51eddeeeb8d7"
 Random = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c"
 RelocatableFolders = "05181044-ff0b-4ac5-8273-598c1e38db00"
@@ -21,7 +22,7 @@ Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
 UUIDs = "cf7118a7-6976-5b1a-9a39-7adc72f591a4"
 
 [compat]
-GRPreferences = "0.1"
+Preferences = "1"
 HTTP = "0.8, 0.9, 1"
 JSON = "0.20, 0.21, 1"
 RelocatableFolders = "0.1, 0.3, 1"

diff --git a/src/GR.jl b/src/GR.jl
@@ -24,7 +24,6 @@ module GR
     Base.Experimental.@optlevel 1
 end
 
-import GRPreferences
 import Base64
 import Libdl
 
@@ -259,6 +258,8 @@ isatom() = isdefined(Main, :Atom) && Main.Atom isa Module && Main.Atom.isconnect
 ispluto() = isdefined(Main, :PlutoRunner) && Main.PlutoRunner isa Module
 isvscode() = isdefined(Main, :VSCodeServer) && Main.VSCodeServer isa Module && (isdefined(Main.VSCodeServer, :PLOT_PANE_ENABLED) ? Main.VSCodeServer.PLOT_PANE_ENABLED[] : true)
 
+include("preferences.jl")
+
 # Load function pointer caching mechanism
 include("funcptrs.jl")
 

diff --git a/GRPreferences/src/GRPreferences.jl → src/preferences.jl b/GRPreferences/src/GRPreferences.jl → src/preferences.jl