From 816f537114ae9a5620b689c7595f86817d554951 Mon Sep 17 00:00:00 2001 From: xuwei-k <6b656e6a69@gmail.com> Date: Tue, 2 Mar 2021 08:51:42 +0900 Subject: [PATCH] drop sbt 0.13.x --- .github/workflows/ci.yml | 3 --- build.sbt | 2 +- .../scala-sbt-0.13/sbtprotobuf/Compat.scala | 22 ------------------- .../sbtprotobuf/Compat.scala | 0 4 files changed, 1 insertion(+), 26 deletions(-) delete mode 100644 src/main/scala-sbt-0.13/sbtprotobuf/Compat.scala rename src/main/{scala-sbt-1.0 => scala}/sbtprotobuf/Compat.scala (100%) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 4ea312e..19cb21b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -11,9 +11,6 @@ jobs: fail-fast: false matrix: include: - - java: 8 - sbt_version: "0.13.18" - os: ubuntu-latest - java: 8 sbt_version: "1.2.8" os: ubuntu-latest diff --git a/build.sbt b/build.sbt index 437e617..22254e7 100644 --- a/build.sbt +++ b/build.sbt @@ -36,5 +36,5 @@ lazy val root = (project in file(".")) scriptedLaunchOpts += s"-Dplugin.version=${version.value}" // Don't update to 1.3.0 https://github.com/sbt/sbt/issues/5049 - crossSbtVersions := Seq("0.13.18", "1.2.8") + crossSbtVersions := Seq("1.2.8") }) diff --git a/src/main/scala-sbt-0.13/sbtprotobuf/Compat.scala b/src/main/scala-sbt-0.13/sbtprotobuf/Compat.scala deleted file mode 100644 index 513620a..0000000 --- a/src/main/scala-sbt-0.13/sbtprotobuf/Compat.scala +++ /dev/null @@ -1,22 +0,0 @@ -package sbtprotobuf - -import sbt._ -import Keys._ - -private[sbtprotobuf] trait Compat { self: ScopedProtobufPlugin => - import self.Keys._ - - protected[this] val Process = sbt.Process - - protected[this] val setProtoArtifact = artifact in (ProtobufConfig, protobufPackage) := { - val previous: Artifact = (artifact in (ProtobufConfig, protobufPackage)).value - previous - .copy(configurations = List(ProtobufConfig)) - .copy(classifier = Some(protoClassifier)) - } - - protected[this] val watchSourcesSetting = - watchSources ++= ((sourceDirectory in ProtobufConfig).value ** "*.proto").get - - protected[this] lazy val ProtobufConfig = config("protobuf" + configurationPostfix) -} diff --git a/src/main/scala-sbt-1.0/sbtprotobuf/Compat.scala b/src/main/scala/sbtprotobuf/Compat.scala similarity index 100% rename from src/main/scala-sbt-1.0/sbtprotobuf/Compat.scala rename to src/main/scala/sbtprotobuf/Compat.scala