From 7498ea8fd05423e6f2db5b3859e3ec994d58a02f Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Sun, 5 Jul 2026 03:59:52 +0000
Subject: [PATCH 1/3] Update sbt to 2.0.1

---
 project/build.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/project/build.properties b/project/build.properties
index bb6892a..dea5d4c 100644
--- a/project/build.properties
+++ b/project/build.properties
@@ -1,2 +1,2 @@
 # suppress inspection "UnusedProperty" for whole file
-sbt.version=1.12.13
+sbt.version=2.0.1

From 6b9359d0d01de1b8e07d51d3b5ec712b73bc941e Mon Sep 17 00:00:00 2001
From: Iraj Hedayati <iraj.hedayati@gmail.com>
Date: Sat, 18 Jul 2026 16:00:55 -0400
Subject: [PATCH 2/3] Update sbt to 2.0.3

---
 build.sbt                | 3 +--
 project/build.properties | 4 ++++
 scripts/test-sbt         | 6 +++++-
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/build.sbt b/build.sbt
index 33c336e..33be37e 100644
--- a/build.sbt
+++ b/build.sbt
@@ -16,8 +16,7 @@ lazy val root = (project in file("."))
     scalaBinaryVersion := "2.13",
     javacOptions ++= Seq("-source", "11", "-target", "11"),
     scalacOptions ++= Seq("-deprecation"),
-    scalafmtOnCompile := true,
-    useCoursier := false
+    scalafmtOnCompile := true
   )
   .settings(
     libraryDependencies ++= Seq(
diff --git a/project/build.properties b/project/build.properties
index dea5d4c..5775426 100644
--- a/project/build.properties
+++ b/project/build.properties
@@ -1,2 +1,6 @@
 # suppress inspection "UnusedProperty" for whole file
+<<<<<<< Updated upstream
 sbt.version=2.0.1
+=======
+sbt.version=2.0.3
+>>>>>>> Stashed changes
diff --git a/scripts/test-sbt b/scripts/test-sbt
index 2ce212b..a65c2ce 100644
--- a/scripts/test-sbt
+++ b/scripts/test-sbt
@@ -3,4 +3,8 @@
 echo "+----------------------------+"
 echo "| Executing tests using sbt  |"
 echo "+----------------------------+"
-sbt ++$TRAVIS_SCALA_VERSION test
\ No newline at end of file
+if [[ -n "${TRAVIS_SCALA_VERSION:-}" ]]; then
+  sbt "++$TRAVIS_SCALA_VERSION ; test"
+else
+  sbt test
+fi

From f665b6044ccc1d826a5ce449b2e7387eb2f85f6a Mon Sep 17 00:00:00 2001
From: Iraj Hedayati <iraj.hedayati@gmail.com>
Date: Sat, 18 Jul 2026 16:11:11 -0400
Subject: [PATCH 3/3] Resolve conflicts

---
 project/build.properties | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/project/build.properties b/project/build.properties
index 5775426..c43fc2c 100644
--- a/project/build.properties
+++ b/project/build.properties
@@ -1,6 +1,2 @@
 # suppress inspection "UnusedProperty" for whole file
-<<<<<<< Updated upstream
-sbt.version=2.0.1
-=======
 sbt.version=2.0.3
->>>>>>> Stashed changes