fix DotEnv for Julia 1.6

GenieFramework · Apr 23, 2024 · 76baab5 · 76baab5
1 parent 1bbdd91
commit 76baab5
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 1 deletion.
diff --git a/Project.toml b/Project.toml
@@ -42,7 +42,7 @@ ArgParse = "1"
 Base64 = "1.6"
 Dates = "1.6"
 Distributed = "1.6"
-DotEnv = "1"
+DotEnv = "0.3, 1"
 EzXML = "1"
 FilePathsBase = "0.9"
 HTTP = "1"

diff --git a/src/Loader.jl b/src/Loader.jl
@@ -91,6 +91,11 @@ Loads .env file if present
 """
 function load_dotenv()
   if isfile(Genie.config.env_file)
+        @static if VersionNumber(Genie.Assets.package_version(DotEnv)) >= v"1.0"
+          DotEnv.load!(Genie.config.env_file; override = true)
+        else
+          DotEnv.config(; path = Genie.config.env_file, override = true)
+        end
     DotEnv.load!(Genie.config.env_file; override = true)
   end
 

diff --git a/test/tests_loader.jl b/test/tests_loader.jl
@@ -7,4 +7,5 @@
     @test get(ENV, "FOO", "") == ""
     Genie.Loader.load_dotenv()
     @test get(ENV, "FOO", "") == "bar"
+    delete!(ENV, "FOO")
 end