Skip to content

Commit

Permalink
bump & sbt +{,macroSub/,structType/}dependencyLockWrite
Browse files Browse the repository at this point in the history
  • Loading branch information
dmivankov committed Nov 20, 2024
1 parent d9e0995 commit 09508a2
Show file tree
Hide file tree
Showing 6 changed files with 46 additions and 20 deletions.
2 changes: 1 addition & 1 deletion build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import sbtassembly.MergeStrategy
import scala.xml.{Node => XmlNode, NodeSeq => XmlNodeSeq, _}
import scala.xml.transform.{RewriteRule, RuleTransformer}

val scala212 = "2.12.9"
val scala212 = "2.12.19"
val scala213 = "2.13.15"
val supportedScalaVersions = List(scala212, scala213)
val sparkVersion = "3.3.4"
Expand Down
10 changes: 5 additions & 5 deletions build.scala-2.13.sbt.lock
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"lockVersion" : 1,
"timestamp" : "2024-11-13T11:30:56.507065520Z",
"timestamp" : "2024-11-20T12:59:46.331288696Z",
"configurations" : [
"compile",
"optional",
Expand Down Expand Up @@ -2569,11 +2569,11 @@
{
"org" : "org.scala-lang",
"name" : "scala-library",
"version" : "2.13.14",
"version" : "2.13.15",
"artifacts" : [
{
"name" : "scala-library.jar",
"hash" : "sha1:f8b4afe89abe48ca670f620c7da89b71f93e6546"
"hash" : "sha1:ed6f1d58968b16c5f9067d5cac032d952552de58"
}
],
"configurations" : [
Expand All @@ -2586,11 +2586,11 @@
{
"org" : "org.scala-lang",
"name" : "scala-reflect",
"version" : "2.13.14",
"version" : "2.13.15",
"artifacts" : [
{
"name" : "scala-reflect.jar",
"hash" : "sha1:8e275fefb2a01e178db2cdfebb2181062a790b82"
"hash" : "sha1:355927b10366563a8f1b56c1f34ff376f2f7c8c5"
}
],
"configurations" : [
Expand Down
25 changes: 19 additions & 6 deletions macro/build.scala-2.13.sbt.lock
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"lockVersion" : 1,
"timestamp" : "2024-11-13T11:31:01.766754723Z",
"timestamp" : "2024-11-20T12:59:52.180435270Z",
"configurations" : [
"compile",
"optional",
Expand Down Expand Up @@ -2083,28 +2083,41 @@
{
"org" : "org.scala-lang",
"name" : "scala-library",
"version" : "2.13.14",
"version" : "2.13.15",
"artifacts" : [
{
"name" : "scala-library.jar",
"hash" : "sha1:f8b4afe89abe48ca670f620c7da89b71f93e6546"
"hash" : "sha1:ed6f1d58968b16c5f9067d5cac032d952552de58"
}
],
"configurations" : [
"compile",
"provided",
"runtime",
"test"
]
},
{
"org" : "org.scala-lang",
"name" : "scala-library",
"version" : "2.13.8",
"artifacts" : [
{
"name" : "scala-library.jar",
"hash" : "sha1:5a865f03a794b27e6491740c4c419a19e4511a3d"
}
],
"configurations" : [
"provided"
]
},
{
"org" : "org.scala-lang",
"name" : "scala-reflect",
"version" : "2.13.14",
"version" : "2.13.8",
"artifacts" : [
{
"name" : "scala-reflect.jar",
"hash" : "sha1:8e275fefb2a01e178db2cdfebb2181062a790b82"
"hash" : "sha1:994b004d041b18724ec298a135c37e7817d369ec"
}
],
"configurations" : [
Expand Down
2 changes: 1 addition & 1 deletion project/build.properties
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sbt.version=1.9.9
sbt.version=1.10.3
2 changes: 1 addition & 1 deletion project/plugins.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@ addSbtPlugin("com.jsuereth" % "sbt-pgp" % "1.1.2-1")
addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.12.0")
addSbtPlugin("au.com.onegeek" %% "sbt-dotenv" % "2.1.233")
addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "2.2.0")
addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.12.1")
addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.13.0")
addSbtPlugin("io.github.davidgregory084" % "sbt-tpolecat" % "0.4.4")
addSbtPlugin("software.purpledragon" % "sbt-dependency-lock" % "1.5.1")
25 changes: 19 additions & 6 deletions struct_type/build.scala-2.13.sbt.lock
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"lockVersion" : 1,
"timestamp" : "2024-07-26T11:57:31.718012971Z",
"timestamp" : "2024-11-20T12:59:55.679916674Z",
"configurations" : [
"compile",
"optional",
Expand Down Expand Up @@ -1795,28 +1795,41 @@
{
"org" : "org.scala-lang",
"name" : "scala-library",
"version" : "2.13.14",
"version" : "2.13.15",
"artifacts" : [
{
"name" : "scala-library.jar",
"hash" : "sha1:f8b4afe89abe48ca670f620c7da89b71f93e6546"
"hash" : "sha1:ed6f1d58968b16c5f9067d5cac032d952552de58"
}
],
"configurations" : [
"compile",
"provided",
"runtime",
"test"
]
},
{
"org" : "org.scala-lang",
"name" : "scala-library",
"version" : "2.13.8",
"artifacts" : [
{
"name" : "scala-library.jar",
"hash" : "sha1:5a865f03a794b27e6491740c4c419a19e4511a3d"
}
],
"configurations" : [
"provided"
]
},
{
"org" : "org.scala-lang",
"name" : "scala-reflect",
"version" : "2.13.14",
"version" : "2.13.8",
"artifacts" : [
{
"name" : "scala-reflect.jar",
"hash" : "sha1:8e275fefb2a01e178db2cdfebb2181062a790b82"
"hash" : "sha1:994b004d041b18724ec298a135c37e7817d369ec"
}
],
"configurations" : [
Expand Down

0 comments on commit 09508a2

Please sign in to comment.