diff --git a/.gitignore b/.gitignore index 6e4a87982..11a41d5d2 100644 --- a/.gitignore +++ b/.gitignore @@ -14,6 +14,7 @@ project/boot/ project/plugins/project/ sbt-launch.jar target/ +.bsp/ # Scrooge specific .classpath.txt diff --git a/build.sbt b/build.sbt index 9f4899529..26813c227 100644 --- a/build.sbt +++ b/build.sbt @@ -12,7 +12,7 @@ val releaseVersion = "24.2.0-SNAPSHOT" lazy val versions = new { val slf4j = "1.7.30" - val libthrift = "0.10.0" + val libthrift = "0.19.0" } def util(which: String) = "com.twitter" %% ("util-" + which) % releaseVersion diff --git a/demos/scrooge-maven-demo/pom.xml b/demos/scrooge-maven-demo/pom.xml index c4a4dc84b..c57b62d66 100644 --- a/demos/scrooge-maven-demo/pom.xml +++ b/demos/scrooge-maven-demo/pom.xml @@ -19,7 +19,7 @@ org.apache.thrift libthrift - 0.10.0 + 0.19.0 com.twitter diff --git a/doc/src/sphinx/CodeGenDep.rst b/doc/src/sphinx/CodeGenDep.rst index 64c91cb0b..1e1e69892 100644 --- a/doc/src/sphinx/CodeGenDep.rst +++ b/doc/src/sphinx/CodeGenDep.rst @@ -1,7 +1,7 @@ Dependencies of the generated code ================================== -The plain code generated by Scrooge depends on apache libthrift (version 0.10.0) and scrooge-core. +The plain code generated by Scrooge depends on apache libthrift (version 0.19.0) and scrooge-core. You'll need to add the following dependencies to your project, if you use maven (other build systems are similar) @@ -18,7 +18,7 @@ build systems are similar) .. note:: - We recommend using Apache Thrift 0.10.0 to ensure compatibility with Scrooge generated code. + We recommend using Apache Thrift 0.19.0 to ensure compatibility with Scrooge generated code. If you specify --finagle option, you need to have the following additional dependencies diff --git a/doc/src/sphinx/SBTPlugin.rst b/doc/src/sphinx/SBTPlugin.rst index 127ba8995..8510d01fc 100644 --- a/doc/src/sphinx/SBTPlugin.rst +++ b/doc/src/sphinx/SBTPlugin.rst @@ -40,7 +40,7 @@ An example using a `build.sbt` file. .settings( name := "Scrooge Demo", libraryDependencies ++= Seq( - "org.apache.thrift" % "libthrift" % "0.10.0", + "org.apache.thrift" % "libthrift" % "0.19.0", "com.twitter" %% "scrooge-core" % "23.11.0", "com.twitter" %% "finagle-thrift" % "23.11.0", scalaTest % Test @@ -100,7 +100,7 @@ have Scrooge generate Java code. scroogeBuildOptions in Compile := Seq(), scroogeLanguages in Compile := Seq("java"), libraryDependencies ++= Seq( - "org.apache.thrift" % "libthrift" % "0.10.0", + "org.apache.thrift" % "libthrift" % "0.19.0", "com.twitter" %% "scrooge-core" % "23.11.0", "com.twitter" %% "finagle-thrift" % "23.11.0", scalaTest % Test diff --git a/scrooge-maven-plugin/src/test/resources/unit/project-idl-deps/local-repository/com/twitter/hello-java/0.0.1/ivy-0.0.1.xml b/scrooge-maven-plugin/src/test/resources/unit/project-idl-deps/local-repository/com/twitter/hello-java/0.0.1/ivy-0.0.1.xml index 349f5a2ea..ce4a5e1a0 100644 --- a/scrooge-maven-plugin/src/test/resources/unit/project-idl-deps/local-repository/com/twitter/hello-java/0.0.1/ivy-0.0.1.xml +++ b/scrooge-maven-plugin/src/test/resources/unit/project-idl-deps/local-repository/com/twitter/hello-java/0.0.1/ivy-0.0.1.xml @@ -33,7 +33,7 @@ Licensed under the Apache License, Version 2.0 (see LICENSE). - + diff --git a/scrooge-maven-plugin/src/test/resources/unit/project-idl-deps/local-repository/com/twitter/person-java/0.0.1/ivy-0.0.1.xml b/scrooge-maven-plugin/src/test/resources/unit/project-idl-deps/local-repository/com/twitter/person-java/0.0.1/ivy-0.0.1.xml index ea9a840c8..c80c52541 100644 --- a/scrooge-maven-plugin/src/test/resources/unit/project-idl-deps/local-repository/com/twitter/person-java/0.0.1/ivy-0.0.1.xml +++ b/scrooge-maven-plugin/src/test/resources/unit/project-idl-deps/local-repository/com/twitter/person-java/0.0.1/ivy-0.0.1.xml @@ -31,7 +31,7 @@ Licensed under the Apache License, Version 2.0 (see LICENSE). - +