From 76baab535142e13244609fb0dd26386343c6bb88 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Helmut=20H=C3=A4nsel?= <helmut.haensel@gmx.de>
Date: Tue, 23 Apr 2024 13:58:23 +0200
Subject: [PATCH] fix DotEnv for Julia 1.6

---
 Project.toml         | 2 +-
 src/Loader.jl        | 5 +++++
 test/tests_loader.jl | 1 +
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/Project.toml b/Project.toml
index 657654754..a86c90ff8 100644
--- 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
index 2dfda3f92..486380a6e 100644
--- 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
index 8fafab298..7da2f5a30 100644
--- 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
\ No newline at end of file