release 0.20 version for older projects

http4s · May 25, 2020 · fc323c3 · fc323c3
1 parent cadebc5
commit fc323c3
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 12 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -28,7 +28,7 @@ jobs:
         mkdir -p .gnupg
         echo $GPG_SEC | base64 --decode > .gnupg/secring.asc
         echo $GPG_PUB | base64 --decode > .gnupg/pubring.asc
-        sbt +releaseEarly
+        sbt 'set http4sVersion:="0.20.23";++ "2.12.10"; releaseEarly"
       env:
         GPG_SEC: ${{ secrets.GPG_SEC }}
         GPG_PUB: ${{ secrets.GPG_PUB }}

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -25,7 +25,5 @@ jobs:
       uses: actions/setup-java@v1
       with:
         java-version: 1.8
-    - name: "2.13 Test"
-      run: sbt "++ 2.13.1 test"
     - name: "2.12 Test"
-      run: sbt "++ 2.12.10 test"
+      run: sbt 'set http4sVersion:="0.20.23";++ "2.12.10"; test'
diff --git a/build.sbt b/build.sbt
@@ -26,25 +26,27 @@ inScope(Scope.GlobalScope)(
     /* TODO: Everything compile in dotty, BUT runtime error
      java.lang.NoSuchMethodError: org.http4s.dsl.io$.GET()Lorg/http4s/Method$PermitsBody;
      */
-    scalaVersion := scala213
+    resolvers += Resolver.sonatypeRepo("snapshots"),
+    scalaVersion := dotty
   )
 )
 
-val Http4sVersion = "0.21.4"
+val http4sVersion = settingKey[String]("Http4sVersion")
 val FinagleVersion = "20.4.1"
-
+http4sVersion := "0.21.4"
 lazy val root = (project in file("."))
   .settings(
     name := "Http4s Finagle",
     crossScalaVersions := supportedScalaVersions,
     scalacOptions ++= Seq("-language:implicitConversions"),
     libraryDependencies ++= Seq(
-      ("org.http4s"  %% "http4s-core" % Http4sVersion).withDottyCompat(scalaVersion.value),
-      ("org.http4s"  %% "http4s-client" % Http4sVersion).withDottyCompat(scalaVersion.value),
-      ("com.twitter" %% "finagle-http" % FinagleVersion).withDottyCompat(scalaVersion.value),
+      "org.http4s"  %% "http4s-core" % http4sVersion.value,
+      "org.http4s"  %% "http4s-client" % http4sVersion.value,
+      "org.http4s"  %% "http4s-dsl" % http4sVersion.value % Test,
+      "com.twitter" %% "finagle-http" % FinagleVersion,
+    ).map(_.withDottyCompat(scalaVersion.value)) ++ Seq(
       "org.scalameta" %% "munit" % "0.7.6" % Test,
       "org.scalameta" %% "munit-scalacheck" % "0.7.6" % Test,
-      ("org.http4s"  %% "http4s-dsl" % Http4sVersion % Test).withDottyCompat(scalaVersion.value),
     ),
     testFrameworks += new TestFramework("munit.Framework"),
   )
diff --git a/src/test/scala/org/http4s/finagle/FinagleSpec.scala b/src/test/scala/org/http4s/finagle/FinagleSpec.scala
@@ -37,7 +37,7 @@ class FinagleSpec extends munit.FunSuite with munit.ScalaCheckSuite {
   var client: (Client[IO], IO[Unit]) = null
   var server: com.twitter.finagle.ListeningServer = null
   override def beforeAll(): Unit = {
-    client = Finagle.mkClient[IO]("localhost:8080").allocated[IO, Client[IO]].unsafeRunSync
+    client = Finagle.mkClient[IO]("localhost:8080").allocated.unsafeRunSync
     server = com.twitter.finagle.Http.serve(":8080", service)
     ()
   }