More fixes for schema plugin removal.

lightbend · Jan 19, 2022 · e0a4d0b · e0a4d0b
1 parent f0d9949
commit e0a4d0b
Show file tree

Hide file tree

Showing 11 changed files with 23 additions and 8 deletions.
diff --git a/examples/connected-car-cluster-sharding/build.sbt b/examples/connected-car-cluster-sharding/build.sbt
@@ -30,7 +30,10 @@ lazy val connectedCarExample = (project in file("./akka-connected-car"))
   )
 
 lazy val datamodel = (project in file("./datamodel"))
-  .enablePlugins(CloudflowLibraryPlugin)
+  .settings(
+    Compile / sourceGenerators += (Compile / avroScalaGenerateSpecific).taskValue,
+    libraryDependencies += "org.apache.avro" % "avro" % "1.11.0" 
+  )
 
 lazy val akkaConnectedCar= (project in file("./akka-connected-car-streamlet"))
   .enablePlugins(CloudflowAkkaPlugin)

diff --git a/examples/connected-car-cluster-sharding/project/plugins.sbt b/examples/connected-car-cluster-sharding/project/plugins.sbt
@@ -1,2 +1,3 @@
 addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.2.1")
 addSbtPlugin("com.dwijnand" % "sbt-dynver" % "4.1.1")
+addSbtPlugin("com.julianpeeters" % "sbt-avrohugger" % "2.0.0-RC25")
diff --git a/examples/snippets/modules/ROOT/examples/sensor-data-scala/build.sbt b/examples/snippets/modules/ROOT/examples/sensor-data-scala/build.sbt
@@ -13,6 +13,7 @@ lazy val sensorData =  (project in file("."))
         "com.lightbend.akka"     %% "akka-stream-alpakka-file"  % "1.1.2",
         "com.typesafe.akka"      %% "akka-http-spray-json"      % "10.1.12",
         "ch.qos.logback"         %  "logback-classic"           % "1.2.10",
+        "org.apache.avro"        %  "avro"                      % "1.11.0", 
         "com.typesafe.akka"      %% "akka-http-testkit"         % "10.1.12" % "test",
         "org.scalatest"          %% "scalatest"                 % "3.0.8"  % "test"
       )
@@ -39,6 +40,7 @@ lazy val sensorData =  (project in file("."))
       ),
 
       Compile / console / scalacOptions --= Seq("-Ywarn-unused"),
+      Compile / sourceGenerators += (Compile / avroScalaGenerateSpecific).taskValue,
       Test / console / scalacOptions := (Compile / console / scalacOptions).value
     )
 

diff --git a/examples/snippets/modules/ROOT/examples/sensor-data-scala/project/plugins.sbt b/examples/snippets/modules/ROOT/examples/sensor-data-scala/project/plugins.sbt
@@ -1,2 +1,3 @@
 addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.2.1")
 addSbtPlugin("com.dwijnand" % "sbt-dynver" % "4.1.1")
+addSbtPlugin("com.julianpeeters" % "sbt-avrohugger" % "2.0.0-RC25")
diff --git a/examples/templates/single-backend-java/build.sbt b/examples/templates/single-backend-java/build.sbt
@@ -32,6 +32,7 @@ lazy val templateJavaProject = (project in file("."))
       ),
       runLocalConfigFile := Some("src/main/resources/local.conf"),
       Compile / console / scalacOptions --= Seq("-Ywarn-unused", "-Ywarn-unused-import"),
+      avroStringType := "String",
       Test / console / scalacOptions := (Compile / console / scalacOptions).value
     )
 

diff --git a/examples/templates/single-backend-java/project/plugins.sbt b/examples/templates/single-backend-java/project/plugins.sbt
@@ -1,2 +1,4 @@
 addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.2.1")
 addSbtPlugin("com.dwijnand" % "sbt-dynver" % "4.1.1")
+addSbtPlugin("com.github.sbt" % "sbt-avro" % "3.4.0")
+libraryDependencies += "org.apache.avro" % "avro-compiler" % "1.11.0"
diff --git a/examples/templates/single-backend-java/src/main/java/com/example/app/ConsoleOutput.java b/examples/templates/single-backend-java/src/main/java/com/example/app/ConsoleOutput.java
@@ -49,7 +49,7 @@ public RunnableGraphStreamletLogic createLogic() {
     return new RunnableGraphStreamletLogic(getContext()) {
 
       public String format(Data data) {
-        return data.id() + "-> " +data.value();
+        return data.getId() + "-> " +data.getValue();
       }
       public RunnableGraph<NotUsed> createRunnableGraph() {
         return getPlainSource(inlet)

diff --git a/examples/templates/single-backend-scala/build.sbt b/examples/templates/single-backend-scala/build.sbt
@@ -6,8 +6,9 @@ lazy val templateScala = (project in file("."))
   .settings(
     scalafmtOnCompile := true,
     libraryDependencies ++= Seq(
-          "ch.qos.logback" % "logback-classic" % "1.2.10",
-          "org.scalatest"  %% "scalatest"      % "3.0.8" % "test"
+          "org.apache.avro"%  "avro"            % "1.11.0", 
+          "ch.qos.logback" %  "logback-classic" % "1.2.10",
+          "org.scalatest"  %% "scalatest"       % "3.0.8"   % "test"
         ),
     name := "template-scala",
     organization := "com.lightbend.cloudflow",
@@ -29,6 +30,7 @@ lazy val templateScala = (project in file("."))
         ),
     runLocalConfigFile := Some("src/main/resources/local.conf"),
     Compile / console / scalacOptions --= Seq("-Ywarn-unused", "-Ywarn-unused-import"),
+    Compile / sourceGenerators += (Compile / avroScalaGenerateSpecific).taskValue,
     Test / console / scalacOptions := (Compile / console / scalacOptions).value
   )
 

diff --git a/examples/templates/single-backend-scala/project/plugins.sbt b/examples/templates/single-backend-scala/project/plugins.sbt
@@ -1,2 +1,3 @@
 addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.2.1")
 addSbtPlugin("com.dwijnand" % "sbt-dynver" % "4.1.1")
+addSbtPlugin("com.julianpeeters" % "sbt-avrohugger" % "2.0.0-RC25")
diff --git a/examples/tensorflow-akka/build.sbt b/examples/tensorflow-akka/build.sbt
@@ -10,9 +10,10 @@ lazy val tensorflowAkka =  (project in file("."))
       libraryDependencies ++= Seq(
         "ch.qos.logback"         %  "logback-classic"           % "1.2.10",
         "com.typesafe.akka"      %% "akka-http-testkit"         % "10.1.12" % "test",
-        "org.tensorflow"         % "tensorflow"                 % "1.15.0",
-        "org.tensorflow"         % "proto"                      % "1.15.0",
-        "org.scalatest"          %% "scalatest"                 % "3.0.8"  % "test"
+        "org.tensorflow"         %  "tensorflow"                % "1.15.0",
+        "org.tensorflow"         %  "proto"                     % "1.15.0",
+        "org.scalatest"          %% "scalatest"                 % "3.0.8"  % "test",
+        "org.apache.avro"        %  "avro"                      % "1.11.0" 
 //tag::docs-projectName-example[]
       ),
       name := "tensorflow-akka",
@@ -34,7 +35,7 @@ lazy val tensorflowAkka =  (project in file("."))
         "-language:_",
         "-unchecked"
       ),
-
+      Compile / sourceGenerators += (Compile / avroScalaGenerateSpecific).taskValue,
       runLocalConfigFile := Some("src/main/resources/local.conf"),
       Compile / console / scalacOptions --= Seq("-Ywarn-unused", "-Ywarn-unused-import"),
       Test / console / scalacOptions := (Compile / console / scalacOptions).value,

diff --git a/examples/tensorflow-akka/project/plugins.sbt b/examples/tensorflow-akka/project/plugins.sbt
@@ -1,2 +1,3 @@
 addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.2.1")
 addSbtPlugin("com.dwijnand" % "sbt-dynver" % "4.1.1")
+addSbtPlugin("com.julianpeeters" % "sbt-avrohugger" % "2.0.0-RC25")