Fix publish on CI (#81)

* Upgrade to zio 1.0.4-2 * Add 'help' to docs * Fix CI publish * Upgrade Silencer * Reformat
zio · Mar 16, 2021 · f53ce1f · f53ce1f
1 parent 020de4c
commit f53ce1f
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 23 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -2,10 +2,11 @@ name: CI
 
 on:
   pull_request:
-    branches: ['*']
   push:
     branches: ['master']
-    tags: ['v*']
+  release:
+    types:
+      - published
 
 jobs:
   build:
@@ -14,7 +15,7 @@ jobs:
       fail-fast: false
       matrix:
         java: ['[email protected]', '[email protected]']
-        scala: ['2.12.10', '2.13.1']
+        scala: ['2.12.12', '2.13.3']
     steps:
     - uses: actions/[email protected]
     - uses: olafurpg/setup-scala@v10

diff --git a/docs/essentials/dropwizard.md b/docs/essentials/dropwizard.md
@@ -54,7 +54,7 @@ methods. We'll start using environmental effects until the `Helper` methods are
 ```scala mdoc:silent
   val testRegistry: RIO[Registry, (MetricRegistry, Counter)] = for {
     dwr <- RIO.environment[Registry]
-    dwc <- dwr.get.registerCounter(ZLabel("DropwizardTests", Array("test", "counter")))
+    dwc <- dwr.get.registerCounter(ZLabel("DropwizardTests", Array("test", "counter"), "Just a counter for your consideration"))
     c   <- Task(new Counter(dwc))
     r   <- dwr.get.getCurrent()
   } yield (r, c)

diff --git a/docs/essentials/prometheus.md b/docs/essentials/prometheus.md
@@ -55,7 +55,7 @@ methods. We'll start using environmental effects until the `Helper` methods are
 ```scala mdoc:silent
   val testRegistry: RIO[Registry, CollectorRegistry] = for {
     pr <- RIO.environment[Registry]
-    _  <- pr.get.registerCounter(ZLabel("simple_counter", Array("method")))
+    _  <- pr.get.registerCounter(ZLabel("simple_counter", Array("method"), "Just a simple counter for your consideration"))
     r  <- pr.get.getCurrent()
   } yield r
 ```

diff --git a/dropwizard/src/main/scala/zio/metrics/Server.scala b/dropwizard/src/main/scala/zio/metrics/Server.scala
@@ -4,26 +4,25 @@ import scala.util.Properties.envOrNone
 
 import cats.data.Kleisli
 import cats.instances.list._
-
-import org.http4s.server.blaze._
-import org.http4s.{ Request, Response }
+import com.codahale.metrics.MetricRegistry
+import io.circe.Json
+import org.http4s.HttpRoutes
+import org.http4s.Request
+import org.http4s.Response
 import org.http4s.circe._
 import org.http4s.dsl.impl.Root
 import org.http4s.dsl.io._
-import org.http4s.{ HttpRoutes, Response }
-
-import zio.{ RIO, ZIO }
-import zio.system.System
+import org.http4s.server.blaze._
+import zio.RIO
+import zio.ZIO
+import zio.blocking.Blocking
 import zio.clock.Clock
 import zio.console.Console
-import zio.random.Random
-import zio.blocking.Blocking
 import zio.interop.catz._
-import io.circe.Json
-import zio.RIO
-import zio.metrics.dropwizard.typeclasses._
 import zio.metrics.dropwizard.DropwizardExtractor._
-import com.codahale.metrics.MetricRegistry
+import zio.metrics.dropwizard.typeclasses._
+import zio.random.Random
+import zio.system.System
 
 object Server {
   val port: Int = envOrNone("HTTP_PORT").fold(9090)(_.toInt)

diff --git a/dropwizard/src/main/scala/zio/metrics/dropwizard/reporters/package.scala b/dropwizard/src/main/scala/zio/metrics/dropwizard/reporters/package.scala
@@ -1,8 +1,6 @@
 package zio.metrics.dropwizard
 
 import zio.{ Has, Layer, Task, ZLayer }
-import java.util.concurrent.TimeUnit
-import java.io.File
 import java.util.Locale
 import java.net.InetSocketAddress
 import java.util.concurrent.TimeUnit

diff --git a/project/Build.scala b/project/Build.scala
@@ -21,9 +21,9 @@ object Build {
   val ZioCoreVersion = "1.0.0-RC17"
   val ZioInteropJava = "1.1.0.0-RC6"
 
-  private val SilencerVersion = "1.4.4"
-  private val Scala212        = "2.12.10"
-  private val Scala213        = "2.13.1"
+  private val SilencerVersion = "1.7.1"
+  private val Scala212        = "2.12.12"
+  private val Scala213        = "2.13.3"
 
   private val stdOptions = Seq(
     "-encoding",