Fix scripted tests and pass AKKA_REPO_TOKEN to test JVMs

- Make Git and DynamicVersioning helpers detect git repos before
  enabling native git. This allows scripted tests to run in non-git
  directories (temp dirs) while still supporting git worktrees in
  real development environments.

- Pass AKKA_REPO_TOKEN to scripted test JVMs via scriptedLaunchOpts
  system property, and check both sys.props and sys.env in Akka helper.

- Update scripted test build.sbt files to use modern PascalCase
  With.* syntax (BuildInfo, Scala3, Riddl) instead of deprecated
  lowercase versions.

Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>

Author: respencer-ncl

build.sbt

@@ -31,7 +31,9 @@ lazy val `sbt-ossuminc` = project
     scalaVersion := "2.12.19",
     // Scripted == sbt plugin tests
     scriptedLaunchOpts := {
-      scriptedLaunchOpts.value ++ Seq("-Xmx1024M", "-Dplugin.version=" + version.value)
+      scriptedLaunchOpts.value ++
+        Seq("-Xmx1024M", "-Dplugin.version=" + version.value) ++
+        sys.env.get("AKKA_REPO_TOKEN").map(t => s"-Dakka.repo.token=$t").toSeq
     },
     libraryDependencies ++= Seq(
       "org.apache.commons" % "commons-lang3" % "3.20.0",

src/main/scala/com/ossuminc/sbt/helpers/Akka.scala

@@ -23,9 +23,13 @@ object Akka extends AutoPluginHelper {
 
   /** Akka repository URL with embedded token. Akka uses tokenized URLs for authentication - the
     * token is part of the URL path. See https://doc.akka.io/libraries/akka-dependencies/current/
+    *
+    * The token is read from (in order of precedence):
+    *   1. `akka.repo.token` system property (used by scripted tests)
+    *   2. `AKKA_REPO_TOKEN` environment variable (normal usage)
     */
   private def akkaRepoUrl: String = {
-    sys.env.get("AKKA_REPO_TOKEN") match {
+    sys.props.get("akka.repo.token").orElse(sys.env.get("AKKA_REPO_TOKEN")) match {
       case Some(token) => s"https://repo.akka.io/$token/secure"
       case None =>
         System.err.println(

src/main/scala/com/ossuminc/sbt/helpers/DynamicVersioning.scala

@@ -5,8 +5,23 @@ import sbt.*
 import sbtdynver.DynVerPlugin
 import sbtdynver.DynVerPlugin.autoImport.{dynverSeparator, dynverVTagPrefix}
 
+import java.io.File
+
 object DynamicVersioning extends AutoPluginHelper {
 
+  /** Check if we're in a git repository by looking for .git directory or file */
+  private def isGitRepo: Boolean = {
+    def checkDir(dir: File): Boolean = {
+      if (dir == null) false
+      else {
+        val gitDir = new File(dir, ".git")
+        if (gitDir.exists()) true
+        else checkDir(dir.getParentFile)
+      }
+    }
+    checkDir(new File(System.getProperty("user.dir")))
+  }
+
   /** The configuration function to call for this plugin helper
     *
     * @param project
@@ -15,8 +30,8 @@ object DynamicVersioning extends AutoPluginHelper {
     * @return
     *   The same project passed as an argument, post configuration
     */
-  def apply(project: Project): Project =
-    project
+  def apply(project: Project): Project = {
+    val baseProject = project
       .enablePlugins(DynVerPlugin)
       .settings(
         // NEVER  SET  THIS:
@@ -27,12 +42,22 @@ object DynamicVersioning extends AutoPluginHelper {
         ThisBuild / dynverVTagPrefix := false,
 
         // use the minus character to separate version fields
-        ThisBuild / dynverSeparator := "-",
+        ThisBuild / dynverSeparator := "-"
+      )
 
+    // Only use native git if we're actually in a git repository.
+    // This allows scripted tests to run in non-git directories while
+    // still supporting git worktrees in actual development environments.
+    if (isGitRepo) {
+      baseProject.settings(
         // Use native git instead of JGit to support git worktrees.
         // JGit doesn't properly handle worktrees (sees .git file as bare repo).
         // Native git fully supports worktrees and is required for parallel
         // development with multiple Claude workers in separate worktrees.
         useReadableConsoleGit
       )
+    } else {
+      baseProject
+    }
+  }
 }

src/main/scala/com/ossuminc/sbt/helpers/Git.scala

@@ -4,17 +4,40 @@ import com.github.sbt.git.GitPlugin
 import com.github.sbt.git.SbtGit.useReadableConsoleGit
 import sbt._
 
+import java.io.File
+
 object Git extends AutoPluginHelper {
 
+  /** Check if we're in a git repository by looking for .git directory or file */
+  private def isGitRepo: Boolean = {
+    def checkDir(dir: File): Boolean = {
+      if (dir == null) false
+      else {
+        val gitDir = new File(dir, ".git")
+        if (gitDir.exists()) true
+        else checkDir(dir.getParentFile)
+      }
+    }
+    checkDir(new File(System.getProperty("user.dir")))
+  }
+
   def apply(project: Project): Project = {
-    project
-      .enablePlugins(GitPlugin)
-      .settings(
+    val baseSettings = project.enablePlugins(GitPlugin)
+
+    // Only use native git if we're actually in a git repository.
+    // This allows scripted tests to run in non-git directories while
+    // still supporting git worktrees in actual development environments.
+    if (isGitRepo) {
+      baseSettings.settings(
         // Use native git instead of JGit to support git worktrees.
         // JGit doesn't properly handle worktrees (sees .git file as bare repo).
         // Native git fully supports worktrees and is required for parallel
         // development with multiple Claude workers in separate worktrees.
         useReadableConsoleGit
       )
+    } else {
+      // Fall back to JGit for non-git directories (e.g., scripted tests)
+      baseSettings
+    }
   }
 }

src/sbt-test/sbt-ossuminc/basic/build.sbt

@@ -6,7 +6,7 @@ import java.nio.file.{Files,Path}
 enablePlugins(OssumIncPlugin)
 
 lazy val root = Root("basic-test", startYr=2015)
-  .configure(With.basic, With.build_info)
+  .configure(With.basic, With.BuildInfo)
   .settings(
     maxErrors := 50,
     TaskKey[Unit]("check") := {

src/sbt-test/sbt-ossuminc/everything/build.sbt

@@ -15,7 +15,7 @@ lazy val root = Root(
   )
 )
   .configure(With.typical)
-  .configure(With.riddl)
+  .configure(With.Riddl)
   .settings(
     name := "program-test",
     maxErrors := 50,

src/sbt-test/sbt-ossuminc/native/build.sbt

@@ -21,4 +21,4 @@ lazy val root = Root("hello", startYr = 2024)
   )
 
 lazy val hello = Program("hello", "hello", Some("test.hello"))
-  .configure(With.basic, With.build_info, With.scala3, With.Native(buildTarget = "application"))
+  .configure(With.basic, With.BuildInfo, With.Scala3, With.Native(buildTarget = "application"))

src/sbt-test/sbt-ossuminc/packaging/build.sbt

@@ -1,7 +1,7 @@
 enablePlugins(OssumIncPlugin)
 
 lazy val root = Root("basic-test", startYr = 2015)
-  .configure(With.basic, With.build_info)
+  .configure(With.basic, With.BuildInfo)
   .settings(
     maxErrors := 50
   )