Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update finagle-thrift, util-core to 22.4.0 #46

Merged
merged 3 commits into from
Apr 20, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ inThisBuild(List(

lazy val CatsEffect2V = "2.5.4"
lazy val CatsEffect3V = "3.3.11"
lazy val TwitterUtilsLatestV = "22.3.0"
lazy val TwitterUtilsLatestV = "22.4.0"
lazy val CatsTaglessV = "0.14.0"
lazy val libthriftV = "0.10.0"

Expand Down Expand Up @@ -251,6 +251,7 @@ lazy val `scalafix-input` = (project in file("scalafix/input"))
scalacOptions ~= { _.filterNot(_ == "-Xfatal-warnings") },
semanticdbEnabled := true,
semanticdbVersion := scalafixSemanticdb.revision,
Compile / unmanagedSourceDirectories += baseDirectory.value / "src_managed" / "main" / "scala",
)
.dependsOn(`scalafix-input-dependency`)
.disablePlugins(ScalafixPlugin)
Expand All @@ -268,6 +269,7 @@ lazy val `scalafix-output` = (project in file("scalafix/output"))
),
scalacOptions += "-nowarn",
scalacOptions ~= { _.filterNot(_ == "-Xfatal-warnings") },
Compile / unmanagedSourceDirectories += baseDirectory.value / "src_managed" / "main" / "scala",
)
.dependsOn(`scalafix-output-dependency`)
.disablePlugins(ScalafixPlugin)
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
/*rule = AddCatsTaglessInstances*/
/**
* Generated by Scrooge
* version: 22.3.0
* rev: 2f6ae2f0908271965ba99fd3643c2d35b1e69a10
* built at: 20220329-191327
* version: 22.4.0
* rev: d1de8299d70540617bc183010bb06ef82acb88df
* built at: 20220419-215016
*/
package example.thrift

Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
/*rule = AddCatsTaglessInstances*/
/**
* Generated by Scrooge
* version: 22.3.0
* rev: 2f6ae2f0908271965ba99fd3643c2d35b1e69a10
* built at: 20220329-191327
* version: 22.4.0
* rev: d1de8299d70540617bc183010bb06ef82acb88df
* built at: 20220419-215016
*/
package example.thrift

Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
/*rule = AddCatsTaglessInstances*/
/**
* Generated by Scrooge
* version: 22.3.0
* rev: 2f6ae2f0908271965ba99fd3643c2d35b1e69a10
* built at: 20220329-191327
* version: 22.4.0
* rev: d1de8299d70540617bc183010bb06ef82acb88df
* built at: 20220419-215016
*/
package example.thrift

Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
/*rule = AddCatsTaglessInstances*/
/**
* Generated by Scrooge
* version: 22.3.0
* rev: 2f6ae2f0908271965ba99fd3643c2d35b1e69a10
* built at: 20220329-191327
* version: 22.4.0
* rev: d1de8299d70540617bc183010bb06ef82acb88df
* built at: 20220419-215016
*/
package example.thrift

Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
/*rule = AddCatsTaglessInstances*/
/**
* Generated by Scrooge
* version: 22.3.0
* rev: 2f6ae2f0908271965ba99fd3643c2d35b1e69a10
* built at: 20220329-191327
* version: 22.4.0
* rev: d1de8299d70540617bc183010bb06ef82acb88df
* built at: 20220419-215016
*/
package example.thrift

Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
/**
* Generated by Scrooge
* version: 22.3.0
* rev: 2f6ae2f0908271965ba99fd3643c2d35b1e69a10
* built at: 20220329-191327
* version: 22.4.0
* rev: d1de8299d70540617bc183010bb06ef82acb88df
* built at: 20220419-215016
*/
package example.thrift

Expand Down Expand Up @@ -433,4 +433,3 @@ private[thrift] class SimpleRequestStructBuilder(instance: _root_.scala.Option[S
}
}
}

Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
/**
* Generated by Scrooge
* version: 22.3.0
* rev: 2f6ae2f0908271965ba99fd3643c2d35b1e69a10
* built at: 20220329-191327
* version: 22.4.0
* rev: d1de8299d70540617bc183010bb06ef82acb88df
* built at: 20220419-215016
*/
package example.thrift

Expand Down Expand Up @@ -433,4 +433,3 @@ private[thrift] class SimpleResponseStructBuilder(instance: _root_.scala.Option[
}
}
}

Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
/**
* Generated by Scrooge
* version: 22.3.0
* rev: 2f6ae2f0908271965ba99fd3643c2d35b1e69a10
* built at: 20220329-191327
* version: 22.4.0
* rev: d1de8299d70540617bc183010bb06ef82acb88df
* built at: 20220419-215016
*/
package example.thrift

Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
/**
* Generated by Scrooge
* version: 22.3.0
* rev: 2f6ae2f0908271965ba99fd3643c2d35b1e69a10
* built at: 20220329-191327
* version: 22.4.0
* rev: d1de8299d70540617bc183010bb06ef82acb88df
* built at: 20220419-215016
*/
package example.thrift

Expand Down Expand Up @@ -97,4 +97,4 @@ class SimpleService$FinagleService(

filters.makeRequest.andThen(methodService)
})
}
}
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
/**
* Generated by Scrooge
* version: 22.3.0
* rev: 2f6ae2f0908271965ba99fd3643c2d35b1e69a10
* built at: 20220329-191327
* version: 22.4.0
* rev: d1de8299d70540617bc183010bb06ef82acb88df
* built at: 20220419-215016
*/
package example.thrift

Expand Down
10 changes: 6 additions & 4 deletions scalafix/regenerate-inputs.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,14 @@
set -o errexit -o nounset -o pipefail
IFS=$'\n\t'

GENERATED_SOURCES="src/main/scala/example/thrift"
GENERATED_SOURCES="src_managed/main/scala/example/thrift"

set -x

SCROOGE_VERSION=$1

mkdir -p {input,output}/${GENERATED_SOURCES}

cd input
find "${GENERATED_SOURCES}" -name "*.scala" -delete
mkdir -p project
Expand All @@ -17,7 +19,7 @@ addSbtPlugin("com.twitter" % "scrooge-sbt-plugin" % "${SCROOGE_VERSION}")
__EOF__

cat << __EOF__ > build.sbt
scalaVersion := "2.13.6"
scalaVersion := "2.13.8"
libraryDependencies ++= {
val finagleV = "${SCROOGE_VERSION}"

Expand All @@ -28,13 +30,13 @@ libraryDependencies ++= {
)
}
(Compile / scroogeBuildOptions) += com.twitter.scrooge.backend.WithFinagle
(Compile / scroogeThriftOutputFolder) := file("src/main/scala")
(Compile / scroogeThriftOutputFolder) := file("src_managed/main/scala")
__EOF__

sbt scroogeGen
find "../output/${GENERATED_SOURCES}" -name "*.scala" -delete
cp "${GENERATED_SOURCES}"/* "../output/${GENERATED_SOURCES}/"
find src/main/scala -name "*.scala" -print0 | \
find src_managed/main/scala -name "*.scala" -print0 | \
xargs -0 -n1 \
sed -i '' -e '1 i\
/*rule = AddCatsTaglessInstances*/
Expand Down