Skip to content

Commit 150b1eb

Browse files
committed
Fixes for version changes
1 parent 0d1f5f0 commit 150b1eb

File tree

5 files changed

+13
-19
lines changed

5 files changed

+13
-19
lines changed

build.sbt

+5-5
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ val collectionCompatVersion: String = "2.12.0"
4444

4545
val moduloadVersion: String = "1.1.7"
4646

47-
val rapidVersion: String = "0.2.2"
47+
val rapidVersion: String = "0.6.0"
4848

4949
val catsEffectVersion: String = "3.5.7"
5050

@@ -101,7 +101,7 @@ val sourceMapSettings = List(
101101
lazy val root = project.in(file("."))
102102
.aggregate(
103103
core.js, core.jvm, core.native,
104-
rapid.js, rapid.jvm, rapid.native,
104+
rapid.jvm,
105105
// TODO: Re-enable cats.native when cats-effect supports ScalaNative 0.5
106106
cats.js, cats.jvm, //cats.native,
107107
fileModule.jvm, fileModule.native,
@@ -148,14 +148,14 @@ lazy val core = crossProject(JVMPlatform, JSPlatform, NativePlatform)
148148
coverageEnabled := false
149149
)
150150

151-
lazy val rapid = crossProject(JVMPlatform, JSPlatform, NativePlatform)
151+
lazy val rapid = crossProject(JVMPlatform)
152152
.crossType(CrossType.Full)
153153
.settings(
154154
name := "scribe-rapid",
155155
crossScalaVersions := allScalaVersions,
156156
libraryDependencies ++= Seq(
157-
"com.outr" %%% "rapid-core" % rapidVersion,
158-
"org.scalatest" %%% "scalatest" % scalaTestVersion % Test,
157+
"com.outr" %% "rapid-core" % rapidVersion,
158+
"org.scalatest" %% "scalatest" % scalaTestVersion % Test,
159159
),
160160
Test / publishArtifact := false
161161
)

config/src/main/scala/scribe/ScribeConfig.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import moduload.Moduload
55
import profig._
66

77
object ScribeConfig extends Moduload {
8-
implicit def rw: ReaderWriter[ScribeConfig] = ccRW
8+
implicit def rw: RW[ScribeConfig] = RW.gen
99

1010
private var _loaded: Boolean = false
1111
def loaded: Boolean = _loaded

logstash/src/main/scala/scribe/logstash/LogstashWriter.scala

+4-7
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,8 @@
11
package scribe.logstash
22

3-
import cats.effect.IO
4-
import cats.effect.unsafe.implicits.global
5-
import cats.instances.future
6-
import fabric.io.JsonFormatter
73
import fabric.rw._
84
import perfolation._
5+
import rapid.Task
96
import scribe.LogRecord
107
import scribe.mdc.MDC
118
import scribe.output.LogOutput
@@ -23,13 +20,13 @@ case class LogstashWriter(url: URL,
2320
private lazy val client = HttpClient.url(url).post
2421

2522
override def write(record: LogRecord, output: LogOutput, outputFormat: OutputFormat): Unit = {
26-
val io = log(record) // Does nothing
23+
val task = log(record) // Does nothing
2724
if (!asynchronous) {
28-
io.unsafeRunSync()
25+
task.sync()
2926
}
3027
}
3128

32-
def log(record: LogRecord): IO[HttpResponse] = {
29+
def log(record: LogRecord): Task[HttpResponse] = {
3330
val l = record.timeStamp
3431
val timestamp = s"${l.t.F}T${l.t.T}.${l.t.L}${l.t.z}"
3532
val r: LogstashRecord = LogstashRecord(

slack/src/main/scala/scribe/slack/Slack.scala

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package scribe.slack
22

3-
import cats.effect.IO
43
import fabric.Json
54
import fabric.rw._
5+
import rapid.Task
66
import scribe.format._
77
import scribe.handler.LogHandler
88
import scribe.{Level, Logger}
@@ -17,7 +17,7 @@ class Slack(serviceHash: String, botName: String) {
1717
def request(message: String,
1818
markdown: Boolean = true,
1919
attachments: List[Slack.Attachment] = Nil,
20-
emojiIcon: String = ":fire:"): IO[HttpResponse] = {
20+
emojiIcon: String = ":fire:"): Task[HttpResponse] = {
2121
val m = SlackMessage(
2222
text = message,
2323
username = botName,

slack/src/main/scala/scribe/slack/SlackWriter.scala

+1-4
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ import scribe.LogRecord
44
import scribe.output.LogOutput
55
import scribe.output.format.OutputFormat
66
import scribe.writer.Writer
7-
import cats.effect.unsafe.implicits.global
87

98
/**
109
* SlackWriter is
@@ -13,10 +12,8 @@ import cats.effect.unsafe.implicits.global
1312
* @param emojiIcon the emoji to use when sending messages
1413
*/
1514
class SlackWriter(slack: Slack, emojiIcon: String) extends Writer {
16-
1715
override def write(record: LogRecord, output: LogOutput, outputFormat: OutputFormat): Unit = slack.request(
1816
message = output.plainText,
1917
emojiIcon = emojiIcon
20-
).unsafeRunAndForget()
21-
18+
).start()
2219
}

0 commit comments

Comments
 (0)