From 8502cca37db870fcefb1b7ac4e0cb499dc8b7453 Mon Sep 17 00:00:00 2001
From: Devon Stewart <dstewart@tubi.tv>
Date: Sun, 10 Oct 2021 08:34:10 -0700
Subject: [PATCH] Upgrade to new package structure

---
 modules/core/build.sbt                                       | 1 +
 modules/core/src/main/scala/AbstractCodegenPlugin.scala      | 2 +-
 modules/core/src/main/scala/Keys.scala                       | 2 +-
 src/main/scala/dev/guardrail/swagger/sbt/CodegenPlugin.scala | 2 ++
 4 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/modules/core/build.sbt b/modules/core/build.sbt
index f3062e3..0b7376b 100644
--- a/modules/core/build.sbt
+++ b/modules/core/build.sbt
@@ -8,6 +8,7 @@ addCompilerPlugin("org.typelevel" %% "kind-projector" % "0.10.3")
 
 // Dependencies
 libraryDependencies += "dev.guardrail" %% "guardrail" % "0.65.4"
+libraryDependencies += "dev.guardrail" %% "guardrail-cli" % "0.65.1" // Temporary, until guardrailRunner gets moved into core
 
 buildInfoKeys := Seq[BuildInfoKey](organization, version)
 buildInfoPackage := "dev.guardrail.sbt"
diff --git a/modules/core/src/main/scala/AbstractCodegenPlugin.scala b/modules/core/src/main/scala/AbstractCodegenPlugin.scala
index 78b0c06..b6d3d8e 100644
--- a/modules/core/src/main/scala/AbstractCodegenPlugin.scala
+++ b/modules/core/src/main/scala/AbstractCodegenPlugin.scala
@@ -3,7 +3,7 @@ package sbt
 
 import _root_.sbt.{Keys => SbtKeys, _}
 import _root_.sbt.plugins.JvmPlugin
-import dev.guardrail.protocol.terms.protocol.PropertyRequirement
+import dev.guardrail.terms.protocol.PropertyRequirement
 import dev.guardrail.{
   Args => ArgsImpl,
   CodegenTarget => CodegenTargetImpl,
diff --git a/modules/core/src/main/scala/Keys.scala b/modules/core/src/main/scala/Keys.scala
index 9ac9980..97b515a 100644
--- a/modules/core/src/main/scala/Keys.scala
+++ b/modules/core/src/main/scala/Keys.scala
@@ -6,7 +6,7 @@ import java.io.File
 import _root_.sbt.{ SettingKey, TaskKey }
 import scala.language.implicitConversions
 
-import dev.guardrail.protocol.terms.protocol.PropertyRequirement
+import dev.guardrail.terms.protocol.PropertyRequirement
 
 sealed trait CodingConfig {
   def toOptionalRequirement: PropertyRequirement.OptionalRequirement = this match {
diff --git a/src/main/scala/dev/guardrail/swagger/sbt/CodegenPlugin.scala b/src/main/scala/dev/guardrail/swagger/sbt/CodegenPlugin.scala
index 4e3df92..41df443 100644
--- a/src/main/scala/dev/guardrail/swagger/sbt/CodegenPlugin.scala
+++ b/src/main/scala/dev/guardrail/swagger/sbt/CodegenPlugin.scala
@@ -1,6 +1,8 @@
 package dev.guardrail
 package sbt
 
+import dev.guardrail.cli.CLI
+
 import _root_.sbt.AutoPlugin
 
 object GuardrailPlugin extends AutoPlugin with AbstractGuardrailPlugin {