diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs new file mode 100644 index 0000000..76de2e2 --- /dev/null +++ b/.git-blame-ignore-revs @@ -0,0 +1,2 @@ +# Scala Steward: Reformat with scalafmt 3.8.5 +96a7524502d07116f62614707b009510b4377462 diff --git a/.scalafmt.conf b/.scalafmt.conf index d878e6b..594f5fb 100644 --- a/.scalafmt.conf +++ b/.scalafmt.conf @@ -1,4 +1,4 @@ -version = "3.8.3" +version = "3.8.5" runner.dialect = scala212 fileOverride { diff --git a/plugin/src/sbt-test/sbt-avro/basic/build.sbt b/plugin/src/sbt-test/sbt-avro/basic/build.sbt index 11d0b02..a47b051 100644 --- a/plugin/src/sbt-test/sbt-avro/basic/build.sbt +++ b/plugin/src/sbt-test/sbt-avro/basic/build.sbt @@ -1,11 +1,24 @@ ThisBuild / scalaVersion := "2.13.11" lazy val files = Seq( - "A", "B", "C", "D", "E", "_A", "_B", "_C", "_D", "_E", "LogicalTypesTest", "LocalDateTimeTest" + "A", + "B", + "C", + "D", + "E", + "_A", + "_B", + "_C", + "_D", + "_E", + "LogicalTypesTest", + "LocalDateTimeTest" ) lazy val testFiles = Seq( - "X", "Y", "Z" + "X", + "Y", + "Z" ) val checkGenerated = TaskKey[Unit]("checkGenerated") @@ -13,30 +26,37 @@ val checkCompiled = TaskKey[Unit]("checkCompiled") def exists(f: File): Unit = assert(f.exists(), s"$f does not exist") -val checkSettings = inConfig(Compile)(Def.settings( - checkGenerated := { - files.foreach { f => - exists(crossTarget.value / "src_managed" / "compiled_avro" / "main" / "com" / "github" / "sbt" / "avro" / "test" / s"$f.java") +val checkSettings = inConfig(Compile)( + Def.settings( + checkGenerated := { + files.foreach { f => + exists( + crossTarget.value / "src_managed" / "compiled_avro" / "main" / "com" / "github" / "sbt" / "avro" / "test" / s"$f.java" + ) + } + }, + checkCompiled := { + files.foreach { f => + exists(classDirectory.value / "com" / "github" / "sbt" / "avro" / "test" / s"$f.class") + } } - }, - checkCompiled := { - files.foreach { f => - exists(classDirectory.value / "com" / "github" / "sbt" / "avro" / "test" / s"$f.class") - } - } -)) ++ inConfig(Test)(Def.settings( - checkGenerated := { - testFiles.foreach { f => - exists(crossTarget.value / "src_managed" / "compiled_avro" / "test" / "com" / "github" / "sbt" / "avro" / "test" / s"$f.java") - } - }, - checkCompiled := { - testFiles.foreach { f => - exists(classDirectory.value / "com" / "github" / "sbt" / "avro" / "test" / s"$f.class") + ) +) ++ inConfig(Test)( + Def.settings( + checkGenerated := { + testFiles.foreach { f => + exists( + crossTarget.value / "src_managed" / "compiled_avro" / "test" / "com" / "github" / "sbt" / "avro" / "test" / s"$f.java" + ) + } + }, + checkCompiled := { + testFiles.foreach { f => + exists(classDirectory.value / "com" / "github" / "sbt" / "avro" / "test" / s"$f.class") + } } - } -)) - + ) +) lazy val `basic` = project .in(file(".")) diff --git a/plugin/src/sbt-test/sbt-avro/local-dependency/build.sbt b/plugin/src/sbt-test/sbt-avro/local-dependency/build.sbt index 75b5a7d..fcacd1c 100644 --- a/plugin/src/sbt-test/sbt-avro/local-dependency/build.sbt +++ b/plugin/src/sbt-test/sbt-avro/local-dependency/build.sbt @@ -17,7 +17,7 @@ lazy val avroOnlySettings = Seq( Compile / packageAvro / publishArtifact := true, Compile / packageBin / publishArtifact := false, Compile / packageSrc / publishArtifact := false, - Compile / packageDoc / publishArtifact := false, + Compile / packageDoc / publishArtifact := false ) lazy val `external`: Project = project @@ -27,7 +27,7 @@ lazy val `external`: Project = project .settings(avroOnlySettings) .settings( name := "external", - version := "0.0.1-SNAPSHOT", + version := "0.0.1-SNAPSHOT" ) lazy val `transitive`: Project = project @@ -55,14 +55,28 @@ lazy val root: Project = project "org.specs2" %% "specs2-core" % "4.20.9" % Test ), Compile / checkUnpacked := { - exists((`transitive` / crossTarget).value / "src_managed" / "avro" / "main" / "external-avro" / "avdl.avdl") - exists((`transitive` / crossTarget).value / "src_managed" / "avro" / "main" / "external-avro" / "avpr.avpr") - exists((`transitive` / crossTarget).value / "src_managed" / "avro" / "main" / "external-avro" / "avsc.avsc") + exists( + (`transitive` / crossTarget).value / "src_managed" / "avro" / "main" / "external-avro" / "avdl.avdl" + ) + exists( + (`transitive` / crossTarget).value / "src_managed" / "avro" / "main" / "external-avro" / "avpr.avpr" + ) + exists( + (`transitive` / crossTarget).value / "src_managed" / "avro" / "main" / "external-avro" / "avsc.avsc" + ) }, Compile / checkGenerated := { - exists(crossTarget.value / "src_managed" / "compiled_avro" / "main" / "com" / "github" / "sbt" / "avro" / "test" / "external" / "Avdl.java") - exists(crossTarget.value / "src_managed" / "compiled_avro" / "main" / "com" / "github" / "sbt" / "avro" / "test" / "external" / "Avpr.java") - exists(crossTarget.value / "src_managed" / "compiled_avro" / "main" / "com" / "github" / "sbt" / "avro" / "test" / "external" / "Avsc.java") - exists(crossTarget.value / "src_managed" / "compiled_avro" / "main" / "com" / "github" / "sbt" / "avro" / "test" / "transitive" / "Avsc.java") + exists( + crossTarget.value / "src_managed" / "compiled_avro" / "main" / "com" / "github" / "sbt" / "avro" / "test" / "external" / "Avdl.java" + ) + exists( + crossTarget.value / "src_managed" / "compiled_avro" / "main" / "com" / "github" / "sbt" / "avro" / "test" / "external" / "Avpr.java" + ) + exists( + crossTarget.value / "src_managed" / "compiled_avro" / "main" / "com" / "github" / "sbt" / "avro" / "test" / "external" / "Avsc.java" + ) + exists( + crossTarget.value / "src_managed" / "compiled_avro" / "main" / "com" / "github" / "sbt" / "avro" / "test" / "transitive" / "Avsc.java" + ) } ) diff --git a/plugin/src/sbt-test/sbt-avro/local-dependency/src/main/scala/com/github/sbt/avro/test/Main.scala b/plugin/src/sbt-test/sbt-avro/local-dependency/src/main/scala/com/github/sbt/avro/test/Main.scala index 52bd9cb..347aa89 100644 --- a/plugin/src/sbt-test/sbt-avro/local-dependency/src/main/scala/com/github/sbt/avro/test/Main.scala +++ b/plugin/src/sbt-test/sbt-avro/local-dependency/src/main/scala/com/github/sbt/avro/test/Main.scala @@ -8,4 +8,4 @@ object Main extends App { transitive.Avsc.newBuilder().setStringField("transitive").build() println("success") -} \ No newline at end of file +} diff --git a/plugin/src/sbt-test/sbt-avro/publishing/build.sbt b/plugin/src/sbt-test/sbt-avro/publishing/build.sbt index 8d78863..60b3be9 100644 --- a/plugin/src/sbt-test/sbt-avro/publishing/build.sbt +++ b/plugin/src/sbt-test/sbt-avro/publishing/build.sbt @@ -17,7 +17,7 @@ lazy val avroOnlySettings = Seq( Compile / packageAvro / publishArtifact := true, Compile / packageBin / publishArtifact := false, Compile / packageSrc / publishArtifact := false, - Compile / packageDoc / publishArtifact := false, + Compile / packageDoc / publishArtifact := false ) lazy val `external`: Project = project @@ -27,7 +27,7 @@ lazy val `external`: Project = project .settings(avroOnlySettings) .settings( name := "external", - version := "0.0.1-SNAPSHOT", + version := "0.0.1-SNAPSHOT" ) lazy val `transitive`: Project = project @@ -45,7 +45,7 @@ lazy val `transitive`: Project = project ), Compile / avroDependencyIncludeFilter := artifactFilter(classifier = "avro"), // create a test jar with a schema as resource - Test / packageBin / publishArtifact := true, + Test / packageBin / publishArtifact := true ) lazy val root: Project = project @@ -56,8 +56,11 @@ lazy val root: Project = project name := "publishing-test", crossScalaVersions := Seq("2.13.15", "2.12.20"), libraryDependencies ++= Seq( - ("com.github.sbt" % "transitive" % "0.0.1-SNAPSHOT" % "avro").classifier("avro"), // external as transitive - ("com.github.sbt" % "transitive" % "0.0.1-SNAPSHOT" % "avro-test").classifier("tests").intransitive(), + ("com.github.sbt" % "transitive" % "0.0.1-SNAPSHOT" % "avro") + .classifier("avro"), // external as transitive + ("com.github.sbt" % "transitive" % "0.0.1-SNAPSHOT" % "avro-test") + .classifier("tests") + .intransitive(), "org.specs2" %% "specs2-core" % "4.20.9" % Test ), // add additional avro source test jar whithout avro classifier @@ -72,15 +75,25 @@ lazy val root: Project = project exists(crossTarget.value / "src_managed" / "avro" / "main" / "transitive-avro" / "avsc.avsc") }, Compile / checkGenerated := { - exists(crossTarget.value / "src_managed" / "compiled_avro" / "main" / "com" / "github" / "sbt" / "avro" / "test" / "external" / "Avdl.java") - exists(crossTarget.value / "src_managed" / "compiled_avro" / "main" / "com" / "github" / "sbt" / "avro" / "test" / "external" / "Avpr.java") - exists(crossTarget.value / "src_managed" / "compiled_avro" / "main" / "com" / "github" / "sbt" / "avro" / "test" / "external" / "Avsc.java") - exists(crossTarget.value / "src_managed" / "compiled_avro" / "main" / "com" / "github" / "sbt" / "avro" / "test" / "transitive" / "Avsc.java") + exists( + crossTarget.value / "src_managed" / "compiled_avro" / "main" / "com" / "github" / "sbt" / "avro" / "test" / "external" / "Avdl.java" + ) + exists( + crossTarget.value / "src_managed" / "compiled_avro" / "main" / "com" / "github" / "sbt" / "avro" / "test" / "external" / "Avpr.java" + ) + exists( + crossTarget.value / "src_managed" / "compiled_avro" / "main" / "com" / "github" / "sbt" / "avro" / "test" / "external" / "Avsc.java" + ) + exists( + crossTarget.value / "src_managed" / "compiled_avro" / "main" / "com" / "github" / "sbt" / "avro" / "test" / "transitive" / "Avsc.java" + ) }, Test / checkUnpacked := { exists(crossTarget.value / "src_managed" / "avro" / "test" / "transitive-tests" / "test.avsc") }, Test / checkGenerated := { - exists(crossTarget.value / "src_managed" / "compiled_avro" / "test" / "com" / "github" / "sbt" / "avro" / "test" / "transitive" / "Test.java") + exists( + crossTarget.value / "src_managed" / "compiled_avro" / "test" / "com" / "github" / "sbt" / "avro" / "test" / "transitive" / "Test.java" + ) } ) diff --git a/plugin/src/sbt-test/sbt-avro/publishing/src/main/scala/com/github/sbt/avro/test/Main.scala b/plugin/src/sbt-test/sbt-avro/publishing/src/main/scala/com/github/sbt/avro/test/Main.scala index 52bd9cb..347aa89 100644 --- a/plugin/src/sbt-test/sbt-avro/publishing/src/main/scala/com/github/sbt/avro/test/Main.scala +++ b/plugin/src/sbt-test/sbt-avro/publishing/src/main/scala/com/github/sbt/avro/test/Main.scala @@ -8,4 +8,4 @@ object Main extends App { transitive.Avsc.newBuilder().setStringField("transitive").build() println("success") -} \ No newline at end of file +} diff --git a/plugin/src/sbt-test/sbt-avro/publishing/src/test/scala/com/github/sbt/avro/test/AvroTest.scala b/plugin/src/sbt-test/sbt-avro/publishing/src/test/scala/com/github/sbt/avro/test/AvroTest.scala index c22c138..540f395 100644 --- a/plugin/src/sbt-test/sbt-avro/publishing/src/test/scala/com/github/sbt/avro/test/AvroTest.scala +++ b/plugin/src/sbt-test/sbt-avro/publishing/src/test/scala/com/github/sbt/avro/test/AvroTest.scala @@ -7,4 +7,4 @@ object AvroTest extends App { Test.newBuilder().setStringField("external").build() println("success") -} \ No newline at end of file +} diff --git a/plugin/src/sbt-test/sbt-avro/settings/build.sbt b/plugin/src/sbt-test/sbt-avro/settings/build.sbt index e26c247..18f5a31 100644 --- a/plugin/src/sbt-test/sbt-avro/settings/build.sbt +++ b/plugin/src/sbt-test/sbt-avro/settings/build.sbt @@ -4,7 +4,9 @@ name := "settings-test" scalaVersion := "2.13.11" libraryDependencies ++= Seq( // depend on test jar to get some generated records in the build - ("org.apache.avro" % "avro" % avroVersion.value % "avro-compiler").classifier("tests").intransitive(), + ("org.apache.avro" % "avro" % avroVersion.value % "avro-compiler") + .classifier("tests") + .intransitive(), "org.specs2" %% "specs2-core" % "4.20.9" % Test ) diff --git a/plugin/src/sbt-test/sbt-avro/settings/src/test/scala/com/github/sbt/avro/test/settings/SettingsSpec.scala b/plugin/src/sbt-test/sbt-avro/settings/src/test/scala/com/github/sbt/avro/test/settings/SettingsSpec.scala index 046db58..fc065b2 100644 --- a/plugin/src/sbt-test/sbt-avro/settings/src/test/scala/com/github/sbt/avro/test/settings/SettingsSpec.scala +++ b/plugin/src/sbt-test/sbt-avro/settings/src/test/scala/com/github/sbt/avro/test/settings/SettingsSpec.scala @@ -43,7 +43,9 @@ class SettingsSpec extends Specification { } "avroFieldVisibility setting should be respected for recompiled record" >> { - !classOf[TestRecordWithLogicalTypes].getDeclaredField("s").isAnnotationPresent(classOf[Deprecated]) + !classOf[TestRecordWithLogicalTypes] + .getDeclaredField("s") + .isAnnotationPresent(classOf[Deprecated]) } // avroCreateSetters @@ -77,7 +79,9 @@ class SettingsSpec extends Specification { } "avroOptionalGetters setting should be respected for recompiled record" >> { - classOf[TestRecordWithLogicalTypes].getDeclaredMethod("getS").getReturnType === classOf[Optional[String]] + classOf[TestRecordWithLogicalTypes] + .getDeclaredMethod("getS") + .getReturnType === classOf[Optional[String]] } // avroEnableDecimalLogicalType