Merge branch 'master' into grpc-log

xerial · web-flow · commit 453815bce284 · 2021-01-21T11:12:19.000-08:00
diff --git a/build.sbt b/build.sbt
@@ -930,7 +930,7 @@ lazy val sbtAirframe =
       // This setting might be unnecessary?
       //crossSbtVersions := Vector("1.3.13"),
       libraryDependencies ++= Seq(
-        "io.get-coursier"   %% "coursier"         % "2.0.8",
+        "io.get-coursier"   %% "coursier"         % "2.0.9",
         "org.apache.commons" % "commons-compress" % "1.20"
       ),
       scriptedLaunchOpts := {
diff --git a/docs/airframe-rpc.md b/docs/airframe-rpc.md
@@ -205,12 +205,12 @@ val buildSettings = Seq(
 lazy
 val api =
   crossProject(JSPlatform, JVMPlatform)
-          .crossType(CrossType.Pure)
-          .in(file("myapp-api"))
-          .setttings(
-            buildSettings,
-            "org.wvlet.airframe" %%% "airframe-http" % AIRFRAME_VERSION
-          )
+    .crossType(CrossType.Pure)
+    .in(file("myapp-api"))
+    .settings(
+       buildSettings,
+       libraryDependencies += "org.wvlet.airframe" %%% "airframe-http" % AIRFRAME_VERSION
+     )
 
 lazy val apiJVM = api.jvm
 lazy val apiJS = api.js
@@ -219,51 +219,51 @@ lazy val apiJS = api.js
 lazy
 val server =
   project
-          .in(file("myapp-server"))
-          .settings(
-            buildSettings,
-            libraryDependencies ++= Seq(
-              "org.wvlet.airframe" %% "airframe-http-finagle" % AIRFRAME_VERSION
-// Add this for using gRPC
-"org.wvlet.airframe" %% "airframe-http-grpc" % AIRFRAME_VERSION
-)
-)
-.dependsOn(apiJVM)
+    .in(file("myapp-server"))
+    .settings(
+      buildSettings,
+      libraryDependencies ++= Seq(
+        "org.wvlet.airframe" %% "airframe-http-finagle" % AIRFRAME_VERSION,
+        // Add this for using gRPC
+        "org.wvlet.airframe" %% "airframe-http-grpc" % AIRFRAME_VERSION
+      )
+    )
+    .dependsOn(apiJVM)
 
 // RPC client project
 lazy
 val client =
   project
-          .in(file("myapp-client"))
-          .enablePlugins(AiframeHttpPlugin)
-          .settings(
-            buildSettings,
-            // Generates both ServiceSyncClient and ServiceClient (async)
-            airframeHttpClients := Seq("myapp.app.v1:sync", "myapp.app.v1:async"),
-            // Enable debug logging of sbt-airframe
-            airframeHttpGeneratorOption := "-l debug",
-            libraryDependencies ++= Seq(
-              "org.wvlet.airframe" %% "airframe-http-finagle" % AIRFRAME_VERSION
-// Add this for using gRPC
-"org.wvlet.airframe" %% "airframe-http-grpc" % AIRFRAME_VERSION
-)
-)
-.dependsOn(apiJVM)
+    .in(file("myapp-client"))
+    .enablePlugins(AirframeHttpPlugin)
+    .settings(
+      buildSettings,
+      // Generates both ServiceSyncClient and ServiceClient (async)
+      airframeHttpClients := Seq("myapp.app.v1:sync", "myapp.app.v1:async"),
+      // Enable debug logging of sbt-airframe
+      airframeHttpGeneratorOption := "-l debug",
+      libraryDependencies ++= Seq(
+        "org.wvlet.airframe" %% "airframe-http-finagle" % AIRFRAME_VERSION
+        // Add this for using gRPC
+        "org.wvlet.airframe" %% "airframe-http-grpc" % AIRFRAME_VERSION
+      )
+    )
+    .dependsOn(apiJVM)
 
 // Scala.js UI using RPC
 lazy
 val ui =
   project
-          .in(file("myapp-ui"))
-          .enablePlugins(ScalaJSPlugin, AirframeHttpPlugin)
-          .settings(
-            buildSettings
-                    // sbt-airframe generates Scala.js HTTP client: ServiceJSClient with this setting:
-                    airframeHttpClients := Seq ("myapp.app.v1:scalajs"),
-            // Enable debug logging of sbt-airframe
-            airframeHttpGeneratorOption := "-l debug"
-          )
-          .dependsOn(apiJS)
+    .in(file("myapp-ui"))
+    .enablePlugins(ScalaJSPlugin, AirframeHttpPlugin)
+    .settings(
+      buildSettings,
+      // sbt-airframe generates Scala.js HTTP client: ServiceJSClient with this setting:
+      airframeHttpClients := Seq("myapp.app.v1:scalajs"),
+      // Enable debug logging of sbt-airframe
+      airframeHttpGeneratorOption := "-l debug"
+    )
+    .dependsOn(apiJS)
 ```
 
 ### sbt-airframe plugin
@@ -289,7 +289,7 @@ is `<RPC package name>:<client type>(:<target package name>)?`. For example:
 __build.sbt__
 
 ```scala
-enablePlugins(AiframeHttpPlugin)
+enablePlugins(AirframeHttpPlugin)
 
 airframeHttpClients := Seq("hello.api.v1:sync")
 ```
diff --git a/project/plugin.sbt b/project/plugin.sbt
@@ -21,7 +21,7 @@ libraryDependencies ++= (
 addSbtPlugin("com.dwijnand" % "sbt-dynver" % "4.1.1")
 
 // Documentation
-addSbtPlugin("org.scalameta" % "sbt-mdoc" % "2.2.14")
+addSbtPlugin("org.scalameta" % "sbt-mdoc" % "2.2.16")
 
 // For generating Lexer/Parser from ANTLR4 grammar (.g4)
 addSbtPlugin("com.simplytyped" % "sbt-antlr4" % "0.8.3")
