diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 8a5d4b1..a1607c9 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -21,4 +21,4 @@ jobs: java-version: ${{ matrix.java }} - uses: sbt/setup-sbt@v1 - name: Run tests - run: sbt "+ update" test + run: sbt "+ test" diff --git a/src/main/scala-2/io/github/gitbucket/sbt/GitBucketPluginCompat.scala b/src/main/scala-2/io/github/gitbucket/sbt/GitBucketPluginCompat.scala new file mode 100644 index 0000000..8713511 --- /dev/null +++ b/src/main/scala-2/io/github/gitbucket/sbt/GitBucketPluginCompat.scala @@ -0,0 +1,7 @@ +package io.github.gitbucket.sbt + +import java.io.File + +private[sbt] object GitBucketPluginCompat { + def toFile(f: File): File = f +} diff --git a/src/main/scala-3/io/github/gitbucket/sbt/GitBucketPluginCompat.scala b/src/main/scala-3/io/github/gitbucket/sbt/GitBucketPluginCompat.scala new file mode 100644 index 0000000..a055ef2 --- /dev/null +++ b/src/main/scala-3/io/github/gitbucket/sbt/GitBucketPluginCompat.scala @@ -0,0 +1,8 @@ +package io.github.gitbucket.sbt + +import java.io.File + +private[sbt] object GitBucketPluginCompat { + inline def toFile(f: xsbti.HashedVirtualFileRef): File = + sbt.Keys.fileConverter.value.toPath(f).toFile +} diff --git a/src/main/scala/io/github/gitbucket/sbt/GitBucketPluginKeys.scala b/src/main/scala/io/github/gitbucket/sbt/GitBucketPluginKeys.scala index ff8ae41..daf589c 100644 --- a/src/main/scala/io/github/gitbucket/sbt/GitBucketPluginKeys.scala +++ b/src/main/scala/io/github/gitbucket/sbt/GitBucketPluginKeys.scala @@ -4,5 +4,6 @@ import sbt._ trait GitBucketPluginKeys { lazy val gitbucketVersion = settingKey[String]("GitBucket version") + @transient lazy val install = taskKey[Unit]("Install the plugin to a local GitBucket instance.") } diff --git a/src/main/scala/io/github/gitbucket/sbt/GitBucketPluginTasks.scala b/src/main/scala/io/github/gitbucket/sbt/GitBucketPluginTasks.scala index 63c0616..f5b01e8 100644 --- a/src/main/scala/io/github/gitbucket/sbt/GitBucketPluginTasks.scala +++ b/src/main/scala/io/github/gitbucket/sbt/GitBucketPluginTasks.scala @@ -7,7 +7,7 @@ import sbtassembly.AssemblyKeys.assembly object GitBucketPluginTasks { def installTask(key: TaskKey[Unit]): Initialize[Task[Unit]] = Def.task { - val file = assembly.value + val file = GitBucketPluginCompat.toFile(assembly.value) val GitBucketHome = (System.getProperty("gitbucket.home") match { // -Dgitbucket.home=