Fix plugin version (#21)

* Fix plugin version in deployed pact-plugin.json file fix #19 * Upgrade JDK to 17
austek · May 30, 2023 · 191a317 · 191a317
1 parent 3c31d07
commit 191a317
Show file tree

Hide file tree

Showing 9 changed files with 66 additions and 50 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -24,34 +24,27 @@ jobs:
       matrix:
         os: [ubuntu-latest]
         scala: [2.13.10]
-        java: [temurin@11, temurin@17, temurin@19]
+        java: [temurin@17, temurin@20]
     runs-on: ${{ matrix.os }}
     steps:
       - name: Checkout current branch (full)
         uses: actions/checkout@v2
         with:
           fetch-depth: 0
 
-      - name: Setup Java (temurin@11)
-        if: matrix.java == 'temurin@11'
-        uses: actions/setup-java@v2
-        with:
-          distribution: temurin
-          java-version: 11
-
       - name: Setup Java (temurin@17)
         if: matrix.java == 'temurin@17'
         uses: actions/setup-java@v2
         with:
           distribution: temurin
           java-version: 17
 
-      - name: Setup Java (temurin@19)
-        if: matrix.java == 'temurin@19'
+      - name: Setup Java (temurin@20)
+        if: matrix.java == 'temurin@20'
         uses: actions/setup-java@v2
         with:
           distribution: temurin
-          java-version: 19
+          java-version: 20
 
       - name: Cache sbt
         uses: actions/cache@v2
@@ -104,34 +97,27 @@ jobs:
       matrix:
         os: [ubuntu-latest]
         scala: [2.13.10]
-        java: [temurin@11]
+        java: [temurin@17]
     runs-on: ${{ matrix.os }}
     steps:
       - name: Checkout current branch (full)
         uses: actions/checkout@v2
         with:
           fetch-depth: 0
 
-      - name: Setup Java (temurin@11)
-        if: matrix.java == 'temurin@11'
-        uses: actions/setup-java@v2
-        with:
-          distribution: temurin
-          java-version: 11
-
       - name: Setup Java (temurin@17)
         if: matrix.java == 'temurin@17'
         uses: actions/setup-java@v2
         with:
           distribution: temurin
           java-version: 17
 
-      - name: Setup Java (temurin@19)
-        if: matrix.java == 'temurin@19'
+      - name: Setup Java (temurin@20)
+        if: matrix.java == 'temurin@20'
         uses: actions/setup-java@v2
         with:
           distribution: temurin
-          java-version: 19
+          java-version: 20
 
       - name: Cache sbt
         uses: actions/cache@v2

diff --git a/github-actions.sbt b/github-actions.sbt
@@ -30,9 +30,8 @@ ThisBuild / githubWorkflowBuild := Seq(
 // Add macos-latest when step to install docker on it is done
 ThisBuild / githubWorkflowOSes := Seq("ubuntu-latest")
 ThisBuild / githubWorkflowJavaVersions := Seq(
-  JavaSpec.temurin("11"),
   JavaSpec.temurin("17"),
-  JavaSpec.temurin("19")
+  JavaSpec.temurin("20")
 )
 ThisBuild / githubWorkflowTargetBranches := Seq("main")
 ThisBuild / githubWorkflowTargetTags := Seq("v*")

diff --git a/modules/plugin/pact-plugin.json b/modules/plugin/pact-plugin.json
diff --git a/project/BuildSettings.scala b/project/BuildSettings.scala
@@ -4,7 +4,7 @@ import sbt._
 import java.util
 
 object BuildSettings {
-  private val javaVersion = 11
+  private val javaVersion = 17
   private val env: util.Map[String, String] = System.getenv()
   val scala213 = "2.13.10"
 

diff --git a/project/Dependencies.scala b/project/Dependencies.scala
@@ -6,9 +6,9 @@ object Dependencies extends DependencyUtils {
   object Versions {
     val avro = "1.11.1"
     val logback = "1.2.11"
-    val pact = "4.5.5"
+    val pact = "4.6.0"
     val pulsar4sVersion = "2.9.0"
-    val scalaTest = "3.2.15"
+    val scalaTest = "3.2.16"
   }
 
   // protobuf Dependencies
@@ -21,15 +21,15 @@ object Dependencies extends DependencyUtils {
     ExclusionRule("io.pact.plugin.driver"),
     ExclusionRule("org.slf4j")
   )
-  val logback: ModuleID = "ch.qos.logback"         % "logback-classic" % "1.4.6"
-  val pactCore: ModuleID = "io.pact.plugin.driver" % "core"            % "0.3.2" excludeAll (
+  val logback: ModuleID = "ch.qos.logback"         % "logback-classic" % "1.4.7"
+  val pactCore: ModuleID = "io.pact.plugin.driver" % "core"            % "0.4.0" excludeAll (
     ExclusionRule("au.com.dius.pact.core"),
     ExclusionRule("org.slf4j")
   )
   val scalaLogging: ModuleID = "com.typesafe.scala-logging" %% "scala-logging"        % "3.9.5" excludeAll ExclusionRule("org.slf4j")
   val scalaPBRuntime = "com.thesamet.scalapb"               %% "scalapb-runtime-grpc" % scalapb.compiler.Version.scalapbVersion
   val slf4jApi: ModuleID = "org.slf4j"                      %% "slf4j-api"            % "2.0.6"
-  val pureConfig: ModuleID = "com.github.pureconfig"        %% "pureconfig"           % "0.17.2"
+  val pureConfig: ModuleID = "com.github.pureconfig"        %% "pureconfig"           % "0.17.4"
 
   // Test dependencies
   val assertJCore: ModuleID = "org.assertj"                     % "assertj-core"      % "3.24.2"

diff --git a/project/PactPluginJson.scala b/project/PactPluginJson.scala
@@ -0,0 +1,41 @@
+import upickle.default
+
+case class PactPluginDependency(name: String, version: String, `type`: String)
+
+object PactPluginDependency {
+  implicit val pactPluginDependencyRW: default.ReadWriter[PactPluginDependency] = upickle.default.macroRW[PactPluginDependency]
+}
+
+case class PactPluginJson(
+  manifestVersion: Int,
+  pluginInterfaceVersion: Int,
+  name: String,
+  version: String,
+  executableType: String,
+  entryPoint: String,
+  entryPoints: Map[String, String],
+  dependencies: List[PactPluginDependency]
+)
+object PactPluginJson {
+  implicit val pactPluginJsonRW: default.ReadWriter[PactPluginJson] = upickle.default.macroRW[PactPluginJson]
+  def json(v: String): String = upickle.default.write(
+    PactPluginJson(
+      manifestVersion = 1,
+      pluginInterfaceVersion = 1,
+      name = "avro",
+      version = v,
+      executableType = "exec",
+      entryPoint = "bin/pact-avro-plugin",
+      entryPoints = Map(
+        "windows" -> "bin/pact-avro-plugin.bat"
+      ),
+      dependencies = List(
+        PactPluginDependency(
+          name = "jvm",
+          version = "11+",
+          `type` = "OSPackage"
+        )
+      )
+    )
+  )
+}
diff --git a/project/PublishSettings.scala b/project/PublishSettings.scala
@@ -12,9 +12,14 @@ object PublishSettings {
       executableScriptName := "pact-avro-plugin",
       Compile / doc / sources := Seq.empty,
       Compile / packageDoc / mappings := Seq.empty,
+      Compile / resourceGenerators += Def.task {
+        val file = (Compile / resourceManaged).value / "pact-plugin.json"
+        IO.write(file, PactPluginJson.json(version.value))
+        Seq(file)
+      },
       Universal / mappings ++= Seq(
         sourceDirectory.value / "main" / "resources" / "logback.xml" -> "conf/logback.xml",
-        baseDirectory.value / "pact-plugin.json" -> "pact-plugin.json"
+        (Compile / resourceManaged).value / "pact-plugin.json" -> "pact-plugin.json"
       ),
       Universal / javaOptions ++= Seq(
         "-Dfile.encoding=UTF-8",

diff --git a/project/builds.sbt b/project/builds.sbt
@@ -0,0 +1,3 @@
+libraryDependencies ++= List(
+  "com.lihaoyi" %% "upickle" % "3.1.0"
+)
diff --git a/project/sbt-grpc.sbt b/project/sbt-grpc.sbt
@@ -1,3 +1,3 @@
 addSbtPlugin("com.thesamet" % "sbt-protoc" % "1.0.6")
 
-libraryDependencies += "com.thesamet.scalapb" %% "compilerplugin" % "0.11.11"
+libraryDependencies += "com.thesamet.scalapb" %% "compilerplugin" % "0.11.13"