Skip to content

Commit

Permalink
Merge branch 'master' into update/scala-library-2.13.13
Browse files Browse the repository at this point in the history
  • Loading branch information
kciesielski authored Feb 28, 2024
2 parents 6636e54 + 6856981 commit af54fc9
Show file tree
Hide file tree
Showing 5 changed files with 15 additions and 7 deletions.
3 changes: 3 additions & 0 deletions .git-blame-ignore-revs
Original file line number Diff line number Diff line change
@@ -1,2 +1,5 @@
# Scala Steward: Reformat with scalafmt 3.7.17
266a025b23369b5c3ef80bb96bccc87888c3971c

# Scala Steward: Reformat with scalafmt 3.8.0
5b2bb84be0a9e9d3334b7d23c1e56dd47c0acc50
2 changes: 1 addition & 1 deletion .scalafmt.conf
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version = 3.7.17
version = 3.8.0
maxColumn = 140
rewrite.rules = [RedundantBraces, RedundantParens, SortImports]
runner.dialect = scala3
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,12 @@ object ChatChunkRequestResponseData {
* @param functionCall
* The name of the author of this message. May contain a-z, A-Z, 0-9, and underscores, with a maximum length of 64 characters.
*/
case class Delta(role: Option[Role] = None, content: Option[String] = None, toolCalls: Seq[ToolCall] = Nil, functionCall: Option[FunctionCall] = None)
case class Delta(
role: Option[Role] = None,
content: Option[String] = None,
toolCalls: Seq[ToolCall] = Nil,
functionCall: Option[FunctionCall] = None
)

object Delta {
implicit val deltaR: SnakePickle.Reader[Delta] = SnakePickle.macroR[Delta]
Expand All @@ -34,7 +39,7 @@ object ChatChunkRequestResponseData {
created: Int,
model: String,
`object`: String,
systemFingerprint: Option[String] = None,
systemFingerprint: Option[String] = None
)

object ChatChunkResponse {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ object ChatRequestResponseData {
model: String,
`object`: String,
usage: Usage,
systemFingerprint: Option[String] = None,
systemFingerprint: Option[String] = None
)

object ChatResponse {
Expand Down
6 changes: 3 additions & 3 deletions project/Dependencies.scala
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@ import sbt.*
object Dependencies {

object V {
val scalaTest = "3.2.17"
val scalaTest = "3.2.18"
val scalaTestCats = "1.5.0"

val sttpClient = "4.0.0-M8"
val sttpClient = "4.0.0-M9"
val pekkoStreams = "1.0.2"
val akkaStreams = "2.6.20"
val uPickle = "3.1.3"
val uPickle = "3.1.4"
}

object Libraries {
Expand Down

0 comments on commit af54fc9

Please sign in to comment.