From ad497163f76741275a7031494cdd6c63856c7ee4 Mon Sep 17 00:00:00 2001 From: Lee Tibbert Date: Sat, 17 May 2025 07:38:29 -0400 Subject: [PATCH 1/3] Sync local copy with central repository --- project/build.properties | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/project/build.properties b/project/build.properties index 1b248df..3049b4c 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1,5 @@ +<<<<<<< HEAD sbt.version = 1.11.3 +======= +sbt.version = 1.10.11 +>>>>>>> e8a1d1c (Update Scala Native, Scala, & sbt to current versions) From 4279f7a2a4178e1940521f08e222be29ed44aed1 Mon Sep 17 00:00:00 2001 From: Lee Tibbert Date: Wed, 16 Jul 2025 18:10:37 -0400 Subject: [PATCH 2/3] Consolidate PRs 97 & 100 then run both through current CI --- .scalafmt.conf | 2 +- project/giter8.sbt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.scalafmt.conf b/.scalafmt.conf index 3b9e943..b90f669 100644 --- a/.scalafmt.conf +++ b/.scalafmt.conf @@ -1,2 +1,2 @@ -version = "3.8.2" +version = "3.9.8" runner.dialect = scala3 diff --git a/project/giter8.sbt b/project/giter8.sbt index 604e619..bb0b979 100644 --- a/project/giter8.sbt +++ b/project/giter8.sbt @@ -1,4 +1,4 @@ -addSbtPlugin("org.foundweekends.giter8" %% "sbt-giter8" % "0.16.2") +addSbtPlugin("org.foundweekends.giter8" %% "sbt-giter8" % "0.17.0") libraryDependencies += { "org.scala-sbt" %% "scripted-plugin" % sbtVersion.value } From 15d7e6f7aa3f703bb9809cccdcd0aee784e06bc5 Mon Sep 17 00:00:00 2001 From: Lee Tibbert Date: Thu, 17 Jul 2025 06:48:10 -0400 Subject: [PATCH 3/3] fix bungled re-base --- project/build.properties | 4 ---- 1 file changed, 4 deletions(-) diff --git a/project/build.properties b/project/build.properties index 3049b4c..1b248df 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1,5 +1 @@ -<<<<<<< HEAD sbt.version = 1.11.3 -======= -sbt.version = 1.10.11 ->>>>>>> e8a1d1c (Update Scala Native, Scala, & sbt to current versions)