Merge pull request #109 from julianpeeters/2.11.3

julianpeeters · web-flow · commit 011d0ee7746e · 2025-02-11T00:14:42.000-08:00
Release version 2.11.3
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -11,16 +11,19 @@ jobs:
     name: Build and Test
     strategy:
       matrix:
-        os: [macos-latest, ubuntu-latest, windows-latest]
+        os: [macos-latest, ubuntu-latest]
         scala: [2.12.20]
-        java: [zulu@1.11, zulu@1.17]
+        java: ['17', '21']
     runs-on: ${{ matrix.os }}
     steps:
-      - uses: actions/checkout@v3.0.2
-      - name: Set up Java
-        uses: olafurpg/setup-scala@v13
+      - uses: actions/checkout@v4
+      - name: Setup JDK
+        uses: actions/setup-java@v4
         with:
+          distribution: temurin
           java-version: ${{ matrix.java }}
+          cache: sbt
+      - uses: sbt/setup-sbt@v1
       - name: Run tests
         run: sbt ++${{ matrix.scala }} test
       - name: Run scripted tests
diff --git a/README.md b/README.md
@@ -9,7 +9,7 @@ Install the plugin (compatible with sbt 1.3+)
 Add the following lines to the file ``myproject/project/plugins.sbt`` in your
 project directory:
 
-    addSbtPlugin("com.julianpeeters" % "sbt-avrohugger" % "2.11.2")
+    addSbtPlugin("com.julianpeeters" % "sbt-avrohugger" % "2.11.3")
     
 
 
diff --git a/build.sbt b/build.sbt
@@ -1,6 +1,6 @@
 ThisBuild / organization := "com.julianpeeters"
 ThisBuild / description := "Sbt plugin for compiling Avro to Scala"
-ThisBuild / version := "2.11.2"
+ThisBuild / version := "2.11.3"
 ThisBuild / versionScheme := Some("semver-spec")
 
 enablePlugins(SbtPlugin)
@@ -14,8 +14,8 @@ ThisBuild / crossSbtVersions := Seq(sbtVersion.value)
 ThisBuild / scalacOptions ++= Seq("-unchecked", "-deprecation", "-feature", "-Ywarn-value-discard")
 
 ThisBuild / libraryDependencies ++= Seq(
-  "com.julianpeeters" %% "avrohugger-core" % "2.11.2",
-  "com.julianpeeters" %% "avrohugger-filesorter" % "2.11.2",
+  "com.julianpeeters" %% "avrohugger-core" % "2.11.3",
+  "com.julianpeeters" %% "avrohugger-filesorter" % "2.11.3",
   "io.spray" %% "spray-json" % "1.3.6",
   "org.specs2" %% "specs2-core" % "4.20.2" % "test")
 
diff --git a/src/sbt-test/avrohugger/GenericADTSerializationTests/project/plugins.sbt b/src/sbt-test/avrohugger/GenericADTSerializationTests/project/plugins.sbt
@@ -1,4 +1,4 @@
-addSbtPlugin("com.julianpeeters" % "sbt-avrohugger" % "2.11.2")
+addSbtPlugin("com.julianpeeters" % "sbt-avrohugger" % "2.11.3")
 
 resolvers += Resolver.file("Local Ivy Repository", file(Path.userHome.absolutePath + "/.ivy2/local/"))(Resolver.ivyStylePatterns)
 
diff --git a/src/sbt-test/avrohugger/GenericCaseObjectEnumSerializationTests/project/plugins.sbt b/src/sbt-test/avrohugger/GenericCaseObjectEnumSerializationTests/project/plugins.sbt
@@ -1,4 +1,4 @@
-addSbtPlugin("com.julianpeeters" % "sbt-avrohugger" % "2.11.2")
+addSbtPlugin("com.julianpeeters" % "sbt-avrohugger" % "2.11.3")
 
 resolvers += Resolver.file("Local Ivy Repository", file(Path.userHome.absolutePath + "/.ivy2/local/"))(Resolver.ivyStylePatterns)
 
diff --git a/src/sbt-test/avrohugger/GenericDecimalTaggedSerializationTests/project/plugins.sbt b/src/sbt-test/avrohugger/GenericDecimalTaggedSerializationTests/project/plugins.sbt
@@ -1,4 +1,4 @@
-addSbtPlugin("com.julianpeeters" % "sbt-avrohugger" % "2.11.2")
+addSbtPlugin("com.julianpeeters" % "sbt-avrohugger" % "2.11.3")
 
 resolvers += Resolver.file("Local Ivy Repository", file(Path.userHome.absolutePath + "/.ivy2/local/"))(Resolver.ivyStylePatterns)
 
diff --git a/src/sbt-test/avrohugger/GenericJavaEnumSerializationTests/project/plugins.sbt b/src/sbt-test/avrohugger/GenericJavaEnumSerializationTests/project/plugins.sbt
@@ -1,4 +1,4 @@
-addSbtPlugin("com.julianpeeters" % "sbt-avrohugger" % "2.11.2")
+addSbtPlugin("com.julianpeeters" % "sbt-avrohugger" % "2.11.3")
 
 resolvers += Resolver.file("Local Ivy Repository", file(Path.userHome.absolutePath + "/.ivy2/local/"))(Resolver.ivyStylePatterns)
 
diff --git a/src/sbt-test/avrohugger/GenericOptionShapelessUnionsSerializationTests/project/plugins.sbt b/src/sbt-test/avrohugger/GenericOptionShapelessUnionsSerializationTests/project/plugins.sbt
@@ -1,4 +1,4 @@
-addSbtPlugin("com.julianpeeters" % "sbt-avrohugger" % "2.11.2")
+addSbtPlugin("com.julianpeeters" % "sbt-avrohugger" % "2.11.3")
 
 resolvers += Resolver.file("Local Ivy Repository", file(Path.userHome.absolutePath + "/.ivy2/local/"))(Resolver.ivyStylePatterns)
 
diff --git a/src/sbt-test/avrohugger/GenericOptionalShapelessUnionsSerializationTests/project/plugins.sbt b/src/sbt-test/avrohugger/GenericOptionalShapelessUnionsSerializationTests/project/plugins.sbt
@@ -1,4 +1,4 @@
-addSbtPlugin("com.julianpeeters" % "sbt-avrohugger" % "2.11.2")
+addSbtPlugin("com.julianpeeters" % "sbt-avrohugger" % "2.11.3")
 
 resolvers += Resolver.file("Local Ivy Repository", file(Path.userHome.absolutePath + "/.ivy2/local/"))(Resolver.ivyStylePatterns)
 
diff --git a/src/sbt-test/avrohugger/GenericSerializationTests/project/plugins.sbt b/src/sbt-test/avrohugger/GenericSerializationTests/project/plugins.sbt
@@ -1,4 +1,4 @@
-addSbtPlugin("com.julianpeeters" % "sbt-avrohugger" % "2.11.2")
+addSbtPlugin("com.julianpeeters" % "sbt-avrohugger" % "2.11.3")
 
 resolvers += Resolver.file("Local Ivy Repository", file(Path.userHome.absolutePath + "/.ivy2/local/"))(Resolver.ivyStylePatterns)
 
diff --git a/src/sbt-test/avrohugger/GenericStringEnumSerializationTests/project/plugins.sbt b/src/sbt-test/avrohugger/GenericStringEnumSerializationTests/project/plugins.sbt
@@ -1,4 +1,4 @@
-addSbtPlugin("com.julianpeeters" % "sbt-avrohugger" % "2.11.2")
+addSbtPlugin("com.julianpeeters" % "sbt-avrohugger" % "2.11.3")
 
 resolvers += Resolver.file("Local Ivy Repository", file(Path.userHome.absolutePath + "/.ivy2/local/"))(Resolver.ivyStylePatterns)
 
diff --git a/src/sbt-test/avrohugger/OverrideSettings/project/plugins.sbt b/src/sbt-test/avrohugger/OverrideSettings/project/plugins.sbt
@@ -1,3 +1,3 @@
-addSbtPlugin("com.julianpeeters" % "sbt-avrohugger" % "2.11.2")
+addSbtPlugin("com.julianpeeters" % "sbt-avrohugger" % "2.11.3")
 
 resolvers += Resolver.file("Local Ivy Repository", file("~/.ivy2/local/"))(Resolver.ivyStylePatterns)
diff --git a/src/sbt-test/avrohugger/SpecificADTSerializationTests/project/plugins.sbt b/src/sbt-test/avrohugger/SpecificADTSerializationTests/project/plugins.sbt
@@ -1,4 +1,4 @@
-addSbtPlugin("com.julianpeeters" % "sbt-avrohugger" % "2.11.2")
+addSbtPlugin("com.julianpeeters" % "sbt-avrohugger" % "2.11.3")
 
 resolvers += Resolver.file("Local Ivy Repository", file(Path.userHome.absolutePath + "/.ivy2/local/"))(Resolver.ivyStylePatterns)
 
diff --git a/src/sbt-test/avrohugger/SpecificOptionScala3UnionTypeSerializationTests/project/plugins.sbt b/src/sbt-test/avrohugger/SpecificOptionScala3UnionTypeSerializationTests/project/plugins.sbt
@@ -1,4 +1,4 @@
-addSbtPlugin("com.julianpeeters" % "sbt-avrohugger" % "2.11.2")
+addSbtPlugin("com.julianpeeters" % "sbt-avrohugger" % "2.11.3")
 
 resolvers += Resolver.file("Local Ivy Repository", file(Path.userHome.absolutePath + "/.ivy2/local/"))(Resolver.ivyStylePatterns)
 
diff --git a/src/sbt-test/avrohugger/SpecificSerializationTests/project/plugins.sbt b/src/sbt-test/avrohugger/SpecificSerializationTests/project/plugins.sbt
@@ -1,4 +1,4 @@
-addSbtPlugin("com.julianpeeters" % "sbt-avrohugger" % "2.11.2")
+addSbtPlugin("com.julianpeeters" % "sbt-avrohugger" % "2.11.3")
 
 resolvers += Resolver.file("Local Ivy Repository", file(Path.userHome.absolutePath + "/.ivy2/local/"))(Resolver.ivyStylePatterns)
 
diff --git a/src/sbt-test/avrohugger/SpecificSerializationTests/src/main/avro/fieldref.avsc b/src/sbt-test/avrohugger/SpecificSerializationTests/src/main/avro/fieldref.avsc
@@ -0,0 +1 @@
+{ "type": "record", "namespace": "com.a.b.c.model", "name": "Level1", "doc": "sample level1.", "fields": [ { "name": "level2", "type": { "type": "record", "name": "Level2", "fields": [ { "name": "level2Element1", "type": [ "null", { "type": "array", "items": { "type": "record", "name": "Level2Element1Point", "fields": [ { "name": "unit", "type": { "name": "ATypeToBeReferenced", "type": "record", "fields": [ { "name": "first", "type": { "name": "ABC", "type": "enum", "symbols": [ "a", "b", "c", "UNKNOWN" ], "default": "UNKNOWN" } }, { "name": "second", "type": { "name": "DEF", "type": "enum", "symbols": [ "d", "e", "f", "UNKNOWN" ], "default": "UNKNOWN" } } ] }, "doc": "whatever 1" } ] } } ], "doc": "level 1 data", "default": null }, { "name": "level2Element2", "type": [ "null", { "type": "array", "items": { "type": "record", "name": "Level2Element2Point", "fields": [ { "name": "internalPoint", "type": [ "null", { "type": "array", "items": { "type": "record", "name": "InternalPointType", "fields": [ { "name": "value", "type": "double", "doc": "a value" }, { "name": "reference", "type": "ATypeToBeReferenced", "doc": "the type of reference" } ] } } ] } ] } } ], "doc": "level 1 element 2 data", "default": null } ] }, "doc": "just a sameple" } ] }
diff --git a/src/sbt-test/avrohugger/SpecificStringEnumSerializationTests/project/plugins.sbt b/src/sbt-test/avrohugger/SpecificStringEnumSerializationTests/project/plugins.sbt
@@ -1,4 +1,4 @@
-addSbtPlugin("com.julianpeeters" % "sbt-avrohugger" % "2.11.2")
+addSbtPlugin("com.julianpeeters" % "sbt-avrohugger" % "2.11.3")
 
 resolvers += Resolver.file("Local Ivy Repository", file(Path.userHome.absolutePath + "/.ivy2/local/"))(Resolver.ivyStylePatterns)
 
diff --git a/src/sbt-test/avrohugger/SpecificVectorSerializationTests/project/plugins.sbt b/src/sbt-test/avrohugger/SpecificVectorSerializationTests/project/plugins.sbt
@@ -1,4 +1,4 @@
-addSbtPlugin("com.julianpeeters" % "sbt-avrohugger" % "2.11.2")
+addSbtPlugin("com.julianpeeters" % "sbt-avrohugger" % "2.11.3")
 
 resolvers += Resolver.file("Local Ivy Repository", file(Path.userHome.absolutePath + "/.ivy2/local/"))(Resolver.ivyStylePatterns)
 
diff --git a/src/sbt-test/avrohugger/filesorter/project/plugins.sbt b/src/sbt-test/avrohugger/filesorter/project/plugins.sbt
@@ -1 +1 @@
-addSbtPlugin("com.julianpeeters" % "sbt-avrohugger" % "2.11.2")
+addSbtPlugin("com.julianpeeters" % "sbt-avrohugger" % "2.11.3")
diff --git a/src/sbt-test/sbt-avrohugger/overridesettings/project/plugins.sbt b/src/sbt-test/sbt-avrohugger/overridesettings/project/plugins.sbt
@@ -1 +1 @@
-addSbtPlugin("com.julianpeeters" % "sbt-avrohugger" % "2.11.2")
+addSbtPlugin("com.julianpeeters" % "sbt-avrohugger" % "2.11.3")

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-addSbtPlugin("com.julianpeeters" % "sbt-avrohugger" % "2.11.2")`
	`1`	`+addSbtPlugin("com.julianpeeters" % "sbt-avrohugger" % "2.11.3")`
`2`	`2`
`3`	`3`	`resolvers += Resolver.file("Local Ivy Repository", file(Path.userHome.absolutePath + "/.ivy2/local/"))(Resolver.ivyStylePatterns)`
`4`	`4`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,3 @@`
`1`		`-addSbtPlugin("com.julianpeeters" % "sbt-avrohugger" % "2.11.2")`
	`1`	`+addSbtPlugin("com.julianpeeters" % "sbt-avrohugger" % "2.11.3")`
`2`	`2`
`3`	`3`	`resolvers += Resolver.file("Local Ivy Repository", file("~/.ivy2/local/"))(Resolver.ivyStylePatterns)`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	+{ "type": "record", "namespace": "com.a.b.c.model", "name": "Level1", "doc": "sample level1.", "fields": [ { "name": "level2", "type": { "type": "record", "name": "Level2", "fields": [ { "name": "level2Element1", "type": [ "null", { "type": "array", "items": { "type": "record", "name": "Level2Element1Point", "fields": [ { "name": "unit", "type": { "name": "ATypeToBeReferenced", "type": "record", "fields": [ { "name": "first", "type": { "name": "ABC", "type": "enum", "symbols": [ "a", "b", "c", "UNKNOWN" ], "default": "UNKNOWN" } }, { "name": "second", "type": { "name": "DEF", "type": "enum", "symbols": [ "d", "e", "f", "UNKNOWN" ], "default": "UNKNOWN" } } ] }, "doc": "whatever 1" } ] } } ], "doc": "level 1 data", "default": null }, { "name": "level2Element2", "type": [ "null", { "type": "array", "items": { "type": "record", "name": "Level2Element2Point", "fields": [ { "name": "internalPoint", "type": [ "null", { "type": "array", "items": { "type": "record", "name": "InternalPointType", "fields": [ { "name": "value", "type": "double", "doc": "a value" }, { "name": "reference", "type": "ATypeToBeReferenced", "doc": "the type of reference" } ] } } ] } ] } } ], "doc": "level 1 element 2 data", "default": null } ] }, "doc": "just a sameple" } ] }
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-addSbtPlugin("com.julianpeeters" % "sbt-avrohugger" % "2.11.2")`
	`1`	`+addSbtPlugin("com.julianpeeters" % "sbt-avrohugger" % "2.11.3")`