diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index e5c785e55..d3d76f4aa 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -1,8 +1,7 @@
 name: CI
 
 env:
-  JDK_JAVA_OPTIONS: -XX:+PrintCommandLineFlags -Xmx6G -Xss4M -XX:+UseG1GC # JDK_JAVA_OPTIONS is _the_ env. variable to use for modern Java
-  JVM_OPTS: -XX:+PrintCommandLineFlags -Xmx6G -Xss4M -XX:+UseG1GC # for Java 8 only (sadly, it is not modern enough for JDK_JAVA_OPTIONS)
+  JDK_JAVA_OPTIONS: -XX:+PrintCommandLineFlags -Xmx6G -Xss4M -XX:+UseG1GC
   NODE_OPTIONS: --max_old_space_size=6144
 
 on:
@@ -38,16 +37,16 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        java: ['adopt@1.11', 'openjdk@1.17']
+        java: ['temurin:17', 'temurin:21']
         scala: ['2.12.18', '2.13.12', '3.3.1']
         platform: ['JVM', 'Native', 'JS']
     steps:
     - uses: actions/checkout@v3.0.0
       with:
         fetch-depth: 0
-    - uses: olafurpg/setup-scala@v13
+    - uses: coursier/setup-action@v1
       with:
-        java-version: ${{ matrix.java }}
+        jvm: ${{ matrix.java }}
     - name: Cache scala dependencies
       uses: coursier/cache-action@v6
     - name: Install libuv
@@ -56,6 +55,12 @@ jobs:
     - name: Run tests
       run: sbt ++${{ matrix.scala }}! test${{ matrix.platform }}
 
+  ci:
+    runs-on: ubuntu-20.04
+    needs: [build,lint]
+    steps:
+      - run: echo "All checks passed"
+
   publish:
     runs-on: ubuntu-20.04
     timeout-minutes: 45
diff --git a/build.sbt b/build.sbt
index 8d7831f37..7c77d3458 100644
--- a/build.sbt
+++ b/build.sbt
@@ -2,6 +2,8 @@ import sbtcrossproject.CrossPlugin.autoImport._
 import BuildHelper.{ crossProjectSettings, _ }
 import org.scalajs.sbtplugin.ScalaJSPlugin.autoImport._
 
+Global / onChangedBuildSource := ReloadOnSourceChanges
+
 inThisBuild(
   List(
     name := "zio-schema",
@@ -127,13 +129,13 @@ lazy val zioSchemaMacros = crossProject(JSPlatform, JVMPlatform, NativePlatform)
   .nativeSettings(Test / fork := false)
   .nativeSettings(
     libraryDependencies ++= Seq(
-      "io.github.cquiroz" %%% "scala-java-time" % "2.5.0"
+      "io.github.cquiroz" %%% "scala-java-time" % scalaJavaTimeVersion
     )
   )
   .jsSettings(
     libraryDependencies ++= Seq(
-      "io.github.cquiroz" %%% "scala-java-time"      % "2.5.0",
-      "io.github.cquiroz" %%% "scala-java-time-tzdb" % "2.5.0"
+      "io.github.cquiroz" %%% "scala-java-time"      % scalaJavaTimeVersion,
+      "io.github.cquiroz" %%% "scala-java-time-tzdb" % scalaJavaTimeVersion
     )
   )
   .settings(testDeps)
@@ -157,13 +159,13 @@ lazy val zioSchema = crossProject(JSPlatform, JVMPlatform, NativePlatform)
   .nativeSettings(Test / fork := false)
   .nativeSettings(
     libraryDependencies ++= Seq(
-      "io.github.cquiroz" %%% "scala-java-time" % "2.5.0"
+      "io.github.cquiroz" %%% "scala-java-time" % scalaJavaTimeVersion
     )
   )
   .jsSettings(
     libraryDependencies ++= Seq(
-      "io.github.cquiroz" %%% "scala-java-time"      % "2.5.0",
-      "io.github.cquiroz" %%% "scala-java-time-tzdb" % "2.5.0"
+      "io.github.cquiroz" %%% "scala-java-time"      % scalaJavaTimeVersion,
+      "io.github.cquiroz" %%% "scala-java-time-tzdb" % scalaJavaTimeVersion
     )
   )
   .settings(testDeps)
@@ -212,13 +214,13 @@ lazy val zioSchemaDerivation = crossProject(JSPlatform, JVMPlatform, NativePlatf
   .nativeSettings(Test / fork := false)
   .nativeSettings(
     libraryDependencies ++= Seq(
-      "io.github.cquiroz" %%% "scala-java-time" % "2.5.0"
+      "io.github.cquiroz" %%% "scala-java-time" % scalaJavaTimeVersion
     )
   )
   .jsSettings(
     libraryDependencies ++= Seq(
-      "io.github.cquiroz" %%% "scala-java-time"      % "2.5.0",
-      "io.github.cquiroz" %%% "scala-java-time-tzdb" % "2.5.0"
+      "io.github.cquiroz" %%% "scala-java-time"      % scalaJavaTimeVersion,
+      "io.github.cquiroz" %%% "scala-java-time-tzdb" % scalaJavaTimeVersion
     )
   )
   .settings(testDeps)
@@ -241,13 +243,13 @@ lazy val zioSchemaJson = crossProject(JSPlatform, JVMPlatform, NativePlatform)
   .nativeSettings(Test / fork := false)
   .nativeSettings(
     libraryDependencies ++= Seq(
-      "io.github.cquiroz" %%% "scala-java-time" % "2.5.0"
+      "io.github.cquiroz" %%% "scala-java-time" % scalaJavaTimeVersion
     )
   )
   .jsSettings(
     libraryDependencies ++= Seq(
-      "io.github.cquiroz" %%% "scala-java-time"      % "2.5.0",
-      "io.github.cquiroz" %%% "scala-java-time-tzdb" % "2.5.0"
+      "io.github.cquiroz" %%% "scala-java-time"      % scalaJavaTimeVersion,
+      "io.github.cquiroz" %%% "scala-java-time-tzdb" % scalaJavaTimeVersion
     )
   )
   .jsSettings(scalaJSLinkerConfig ~= { _.withOptimizer(false) })
@@ -268,13 +270,13 @@ lazy val zioSchemaProtobuf = crossProject(JSPlatform, JVMPlatform, NativePlatfor
   .nativeSettings(Test / fork := false)
   .nativeSettings(
     libraryDependencies ++= Seq(
-      "io.github.cquiroz" %%% "scala-java-time" % "2.5.0"
+      "io.github.cquiroz" %%% "scala-java-time" % scalaJavaTimeVersion
     )
   )
   .jsSettings(
     libraryDependencies ++= Seq(
-      "io.github.cquiroz" %%% "scala-java-time"      % "2.5.0",
-      "io.github.cquiroz" %%% "scala-java-time-tzdb" % "2.5.0"
+      "io.github.cquiroz" %%% "scala-java-time"      % scalaJavaTimeVersion,
+      "io.github.cquiroz" %%% "scala-java-time-tzdb" % scalaJavaTimeVersion
     )
   )
   .settings(testDeps)
@@ -292,8 +294,8 @@ lazy val zioSchemaThrift = project
   .settings(buildInfoSettings("zio.schema.thrift"))
   .settings(
     libraryDependencies ++= Seq(
-      "org.apache.thrift" % "libthrift"            % thriftVersion,
-      "javax.annotation"  % "javax.annotation-api" % javaxAnnotationApiVersion
+      "org.apache.thrift"  % "libthrift"              % thriftVersion,
+      "jakarta.annotation" % "jakarta.annotation-api" % javaxAnnotationApiVersion
     )
   )
   .settings(testDeps)
@@ -359,13 +361,13 @@ lazy val zioSchemaOptics = crossProject(JSPlatform, JVMPlatform, NativePlatform)
   .nativeSettings(Test / fork := false)
   .nativeSettings(
     libraryDependencies ++= Seq(
-      "io.github.cquiroz" %%% "scala-java-time" % "2.5.0"
+      "io.github.cquiroz" %%% "scala-java-time" % scalaJavaTimeVersion
     )
   )
   .jsSettings(
     libraryDependencies ++= Seq(
-      "io.github.cquiroz" %%% "scala-java-time"      % "2.5.0",
-      "io.github.cquiroz" %%% "scala-java-time-tzdb" % "2.5.0"
+      "io.github.cquiroz" %%% "scala-java-time"      % scalaJavaTimeVersion,
+      "io.github.cquiroz" %%% "scala-java-time-tzdb" % scalaJavaTimeVersion
     )
   )
   .settings(testDeps)
@@ -389,13 +391,13 @@ lazy val zioSchemaExamples = crossProject(JSPlatform, JVMPlatform, NativePlatfor
   .nativeSettings(Test / fork := false)
   .nativeSettings(
     libraryDependencies ++= Seq(
-      "io.github.cquiroz" %%% "scala-java-time" % "2.5.0"
+      "io.github.cquiroz" %%% "scala-java-time" % scalaJavaTimeVersion
     )
   )
   .jsSettings(
     libraryDependencies ++= Seq(
-      "io.github.cquiroz" %%% "scala-java-time"      % "2.5.0",
-      "io.github.cquiroz" %%% "scala-java-time-tzdb" % "2.5.0"
+      "io.github.cquiroz" %%% "scala-java-time"      % scalaJavaTimeVersion,
+      "io.github.cquiroz" %%% "scala-java-time-tzdb" % scalaJavaTimeVersion
     )
   )
   .settings(testDeps)
diff --git a/project/BuildHelper.scala b/project/BuildHelper.scala
index 5f3e8b6c1..d7ff860ab 100644
--- a/project/BuildHelper.scala
+++ b/project/BuildHelper.scala
@@ -1,12 +1,13 @@
-import sbt._
-import Keys._
-
-import sbtcrossproject.CrossPlugin.autoImport._
-import sbtbuildinfo._
-import BuildInfoKeys._
-import scalafix.sbt.ScalafixPlugin.autoImport._
+import sbt.*
+import Keys.*
+import sbtcrossproject.CrossPlugin.autoImport.*
+import sbtbuildinfo.*
+import BuildInfoKeys.*
+import scalafix.sbt.ScalafixPlugin.autoImport.*
 import scalanativecrossproject.NativePlatform
 
+import scala.scalanative.sbtplugin.ScalaNativePlugin.autoImport.nativeConfig
+
 object BuildHelper {
 
   private val versions: Map[String, String] = {
@@ -26,20 +27,20 @@ object BuildHelper {
   val Scala213: String = versions("2.13")
   val Scala3: String   = versions("3.3")
 
-  val zioVersion                   = "2.0.19"
-  val zioJsonVersion               = "0.6.2"
-  val zioPreludeVersion            = "1.0.0-RC21"
-  val zioOpticsVersion             = "0.2.1"
-  val zioBsonVersion               = "1.0.5"
-  val silencerVersion              = "1.7.14"
+  val zioVersion                   = "2.1.7"
+  val zioJsonVersion               = "0.7.2"
+  val zioPreludeVersion            = "1.0.0-RC28"
+  val zioOpticsVersion             = "0.2.2"
+  val zioBsonVersion               = "1.0.6"
   val avroVersion                  = "1.11.3"
-  val bsonVersion                  = "4.11.1"
-  val zioConstraintlessVersion     = "0.3.2"
-  val scalaCollectionCompatVersion = "2.10.0"
-  val msgpackVersion               = "0.9.6"
-  val jacksonScalaVersion          = "2.15.2"
-  val thriftVersion                = "0.16.0"
-  val javaxAnnotationApiVersion    = "1.3.2"
+  val bsonVersion                  = "4.11.3"
+  val zioConstraintlessVersion     = "0.3.3"
+  val scalaCollectionCompatVersion = "2.12.0"
+  val msgpackVersion               = "0.9.8"
+  val jacksonScalaVersion          = "2.17.2"
+  val thriftVersion                = "0.20.0"
+  val javaxAnnotationApiVersion    = "1.3.5"
+  val scalaJavaTimeVersion         = "2.6.0"
 
   def macroDefinitionSettings = Seq(
     scalacOptions += "-language:experimental.macros",
diff --git a/project/plugins.sbt b/project/plugins.sbt
index a16d7d128..c55a5cc1f 100644
--- a/project/plugins.sbt
+++ b/project/plugins.sbt
@@ -1,12 +1,12 @@
 addSbtPlugin("org.scalameta"      % "sbt-scalafmt"                  % "2.4.5")
 addSbtPlugin("ch.epfl.scala"      % "sbt-scalafix"                  % "0.11.1")
 addSbtPlugin("com.github.cb372"   % "sbt-explicit-dependencies"     % "0.3.1")
-addSbtPlugin("org.scala-js"       % "sbt-scalajs"                   % "1.15.0")
+addSbtPlugin("org.scala-js"       % "sbt-scalajs"                   % "1.16.0")
 addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject"      % "1.3.2")
 addSbtPlugin("com.eed3si9n"       % "sbt-buildinfo"                 % "0.11.0")
 addSbtPlugin("com.github.sbt"     % "sbt-ci-release"                % "1.5.12")
 addSbtPlugin("org.portable-scala" % "sbt-scala-native-crossproject" % "1.3.2")
-addSbtPlugin("org.scala-native"   % "sbt-scala-native"              % "0.4.16")
+addSbtPlugin("org.scala-native"   % "sbt-scala-native"              % "0.5.3")
 addSbtPlugin("pl.project13.scala" % "sbt-jmh"                       % "0.4.6")
 addSbtPlugin("dev.zio"            % "zio-sbt-website"               % "0.4.0-alpha.22")
 
diff --git a/zio-schema-thrift/src/test/scala/zio/schema/codec/generated/BasicDouble.java b/zio-schema-thrift/src/test/scala/zio/schema/codec/generated/BasicDouble.java
index fcf810231..21d88c17a 100644
--- a/zio-schema-thrift/src/test/scala/zio/schema/codec/generated/BasicDouble.java
+++ b/zio-schema-thrift/src/test/scala/zio/schema/codec/generated/BasicDouble.java
@@ -7,7 +7,7 @@
 package zio.schema.codec.generated;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@jakarta.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
 public class BasicDouble implements org.apache.thrift.TBase<BasicDouble, BasicDouble._Fields>, java.io.Serializable, Cloneable, Comparable<BasicDouble> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("BasicDouble");
 
@@ -84,7 +84,7 @@ public java.lang.String getFieldName() {
   public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
   static {
     java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
-    tmpMap.put(_Fields.VALUE, new org.apache.thrift.meta_data.FieldMetaData("value", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+    tmpMap.put(_Fields.VALUE, new org.apache.thrift.meta_data.FieldMetaData("value", org.apache.thrift.TFieldRequirementType.DEFAULT,
         new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.DOUBLE)));
     metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
     org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(BasicDouble.class, metaDataMap);
@@ -295,7 +295,7 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, BasicDouble struct)
       while (true)
       {
         schemeField = iprot.readFieldBegin();
-        if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
+        if (schemeField.type == org.apache.thrift.protocol.TType.STOP) {
           break;
         }
         switch (schemeField.id) {
@@ -303,7 +303,7 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, BasicDouble struct)
             if (schemeField.type == org.apache.thrift.protocol.TType.DOUBLE) {
               struct.value = iprot.readDouble();
               struct.setValueIsSet(true);
-            } else { 
+            } else {
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
             }
             break;
diff --git a/zio-schema-thrift/src/test/scala/zio/schema/codec/generated/BasicInt.java b/zio-schema-thrift/src/test/scala/zio/schema/codec/generated/BasicInt.java
index 6864e91e7..bd403c412 100644
--- a/zio-schema-thrift/src/test/scala/zio/schema/codec/generated/BasicInt.java
+++ b/zio-schema-thrift/src/test/scala/zio/schema/codec/generated/BasicInt.java
@@ -7,7 +7,7 @@
 package zio.schema.codec.generated;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@jakarta.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
 public class BasicInt implements org.apache.thrift.TBase<BasicInt, BasicInt._Fields>, java.io.Serializable, Cloneable, Comparable<BasicInt> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("BasicInt");
 
@@ -84,7 +84,7 @@ public java.lang.String getFieldName() {
   public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
   static {
     java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
-    tmpMap.put(_Fields.VALUE, new org.apache.thrift.meta_data.FieldMetaData("value", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+    tmpMap.put(_Fields.VALUE, new org.apache.thrift.meta_data.FieldMetaData("value", org.apache.thrift.TFieldRequirementType.DEFAULT,
         new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32)));
     metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
     org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(BasicInt.class, metaDataMap);
@@ -295,7 +295,7 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, BasicInt struct) th
       while (true)
       {
         schemeField = iprot.readFieldBegin();
-        if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
+        if (schemeField.type == org.apache.thrift.protocol.TType.STOP) {
           break;
         }
         switch (schemeField.id) {
@@ -303,7 +303,7 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, BasicInt struct) th
             if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
               struct.value = iprot.readI32();
               struct.setValueIsSet(true);
-            } else { 
+            } else {
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
             }
             break;
diff --git a/zio-schema-thrift/src/test/scala/zio/schema/codec/generated/BasicString.java b/zio-schema-thrift/src/test/scala/zio/schema/codec/generated/BasicString.java
index 3727f5dae..86d3e57e4 100644
--- a/zio-schema-thrift/src/test/scala/zio/schema/codec/generated/BasicString.java
+++ b/zio-schema-thrift/src/test/scala/zio/schema/codec/generated/BasicString.java
@@ -7,7 +7,7 @@
 package zio.schema.codec.generated;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@jakarta.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
 public class BasicString implements org.apache.thrift.TBase<BasicString, BasicString._Fields>, java.io.Serializable, Cloneable, Comparable<BasicString> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("BasicString");
 
@@ -82,7 +82,7 @@ public java.lang.String getFieldName() {
   public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
   static {
     java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
-    tmpMap.put(_Fields.VALUE, new org.apache.thrift.meta_data.FieldMetaData("value", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+    tmpMap.put(_Fields.VALUE, new org.apache.thrift.meta_data.FieldMetaData("value", org.apache.thrift.TFieldRequirementType.DEFAULT,
         new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
     metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
     org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(BasicString.class, metaDataMap);
@@ -298,7 +298,7 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, BasicString struct)
       while (true)
       {
         schemeField = iprot.readFieldBegin();
-        if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
+        if (schemeField.type == org.apache.thrift.protocol.TType.STOP) {
           break;
         }
         switch (schemeField.id) {
@@ -306,7 +306,7 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, BasicString struct)
             if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
               struct.value = iprot.readString();
               struct.setValueIsSet(true);
-            } else { 
+            } else {
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
             }
             break;
diff --git a/zio-schema-thrift/src/test/scala/zio/schema/codec/generated/BoolValue.java b/zio-schema-thrift/src/test/scala/zio/schema/codec/generated/BoolValue.java
index ab08cfaf7..5e486be70 100644
--- a/zio-schema-thrift/src/test/scala/zio/schema/codec/generated/BoolValue.java
+++ b/zio-schema-thrift/src/test/scala/zio/schema/codec/generated/BoolValue.java
@@ -7,7 +7,7 @@
 package zio.schema.codec.generated;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@jakarta.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
 public class BoolValue implements org.apache.thrift.TBase<BoolValue, BoolValue._Fields>, java.io.Serializable, Cloneable, Comparable<BoolValue> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("BoolValue");
 
@@ -84,7 +84,7 @@ public java.lang.String getFieldName() {
   public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
   static {
     java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
-    tmpMap.put(_Fields.VALUE, new org.apache.thrift.meta_data.FieldMetaData("value", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+    tmpMap.put(_Fields.VALUE, new org.apache.thrift.meta_data.FieldMetaData("value", org.apache.thrift.TFieldRequirementType.DEFAULT,
         new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.BOOL)));
     metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
     org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(BoolValue.class, metaDataMap);
@@ -295,7 +295,7 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, BoolValue struct) t
       while (true)
       {
         schemeField = iprot.readFieldBegin();
-        if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
+        if (schemeField.type == org.apache.thrift.protocol.TType.STOP) {
           break;
         }
         switch (schemeField.id) {
@@ -303,7 +303,7 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, BoolValue struct) t
             if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
               struct.value = iprot.readBool();
               struct.setValueIsSet(true);
-            } else { 
+            } else {
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
             }
             break;
diff --git a/zio-schema-thrift/src/test/scala/zio/schema/codec/generated/Color.java b/zio-schema-thrift/src/test/scala/zio/schema/codec/generated/Color.java
index 7ec4b4d92..b0ed65f20 100644
--- a/zio-schema-thrift/src/test/scala/zio/schema/codec/generated/Color.java
+++ b/zio-schema-thrift/src/test/scala/zio/schema/codec/generated/Color.java
@@ -7,7 +7,7 @@
 package zio.schema.codec.generated;
 
 
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@jakarta.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
 public enum Color implements org.apache.thrift.TEnum {
   RED(0),
   GREEN(1),
@@ -31,7 +31,7 @@ public int getValue() {
    * @return null if the value is not found.
    */
   @org.apache.thrift.annotation.Nullable
-  public static Color findByValue(int value) { 
+  public static Color findByValue(int value) {
     switch (value) {
       case 0:
         return RED;
diff --git a/zio-schema-thrift/src/test/scala/zio/schema/codec/generated/Embedded.java b/zio-schema-thrift/src/test/scala/zio/schema/codec/generated/Embedded.java
index 6dabbc682..939881975 100644
--- a/zio-schema-thrift/src/test/scala/zio/schema/codec/generated/Embedded.java
+++ b/zio-schema-thrift/src/test/scala/zio/schema/codec/generated/Embedded.java
@@ -7,7 +7,7 @@
 package zio.schema.codec.generated;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@jakarta.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
 public class Embedded implements org.apache.thrift.TBase<Embedded, Embedded._Fields>, java.io.Serializable, Cloneable, Comparable<Embedded> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("Embedded");
 
@@ -82,7 +82,7 @@ public java.lang.String getFieldName() {
   public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
   static {
     java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
-    tmpMap.put(_Fields.EMBEDDED, new org.apache.thrift.meta_data.FieldMetaData("embedded", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+    tmpMap.put(_Fields.EMBEDDED, new org.apache.thrift.meta_data.FieldMetaData("embedded", org.apache.thrift.TFieldRequirementType.DEFAULT,
         new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, BasicInt.class)));
     metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
     org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(Embedded.class, metaDataMap);
@@ -301,7 +301,7 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, Embedded struct) th
       while (true)
       {
         schemeField = iprot.readFieldBegin();
-        if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
+        if (schemeField.type == org.apache.thrift.protocol.TType.STOP) {
           break;
         }
         switch (schemeField.id) {
@@ -310,7 +310,7 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, Embedded struct) th
               struct.embedded = new BasicInt();
               struct.embedded.read(iprot);
               struct.setEmbeddedIsSet(true);
-            } else { 
+            } else {
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
             }
             break;
diff --git a/zio-schema-thrift/src/test/scala/zio/schema/codec/generated/EnumValue.java b/zio-schema-thrift/src/test/scala/zio/schema/codec/generated/EnumValue.java
index 6c0d5dec9..e6eb67fb2 100644
--- a/zio-schema-thrift/src/test/scala/zio/schema/codec/generated/EnumValue.java
+++ b/zio-schema-thrift/src/test/scala/zio/schema/codec/generated/EnumValue.java
@@ -7,7 +7,7 @@
 package zio.schema.codec.generated;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@jakarta.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
 public class EnumValue implements org.apache.thrift.TBase<EnumValue, EnumValue._Fields>, java.io.Serializable, Cloneable, Comparable<EnumValue> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("EnumValue");
 
@@ -17,7 +17,7 @@ public class EnumValue implements org.apache.thrift.TBase<EnumValue, EnumValue._
   private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new EnumValueTupleSchemeFactory();
 
   /**
-   * 
+   *
    * @see Color
    */
   public @org.apache.thrift.annotation.Nullable Color value; // required
@@ -25,7 +25,7 @@ public class EnumValue implements org.apache.thrift.TBase<EnumValue, EnumValue._
   /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
   public enum _Fields implements org.apache.thrift.TFieldIdEnum {
     /**
-     * 
+     *
      * @see Color
      */
     VALUE((short)1, "value");
@@ -90,7 +90,7 @@ public java.lang.String getFieldName() {
   public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
   static {
     java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
-    tmpMap.put(_Fields.VALUE, new org.apache.thrift.meta_data.FieldMetaData("value", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+    tmpMap.put(_Fields.VALUE, new org.apache.thrift.meta_data.FieldMetaData("value", org.apache.thrift.TFieldRequirementType.DEFAULT,
         new org.apache.thrift.meta_data.EnumMetaData(org.apache.thrift.protocol.TType.ENUM, Color.class)));
     metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
     org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(EnumValue.class, metaDataMap);
@@ -125,7 +125,7 @@ public void clear() {
   }
 
   /**
-   * 
+   *
    * @see Color
    */
   @org.apache.thrift.annotation.Nullable
@@ -134,7 +134,7 @@ public Color getValue() {
   }
 
   /**
-   * 
+   *
    * @see Color
    */
   public EnumValue setValue(@org.apache.thrift.annotation.Nullable Color value) {
@@ -314,7 +314,7 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, EnumValue struct) t
       while (true)
       {
         schemeField = iprot.readFieldBegin();
-        if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
+        if (schemeField.type == org.apache.thrift.protocol.TType.STOP) {
           break;
         }
         switch (schemeField.id) {
@@ -322,7 +322,7 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, EnumValue struct) t
             if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
               struct.value = zio.schema.codec.generated.Color.findByValue(iprot.readI32());
               struct.setValueIsSet(true);
-            } else { 
+            } else {
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
             }
             break;
diff --git a/zio-schema-thrift/src/test/scala/zio/schema/codec/generated/Enumeration.java b/zio-schema-thrift/src/test/scala/zio/schema/codec/generated/Enumeration.java
index 96f4031a5..8427c7301 100644
--- a/zio-schema-thrift/src/test/scala/zio/schema/codec/generated/Enumeration.java
+++ b/zio-schema-thrift/src/test/scala/zio/schema/codec/generated/Enumeration.java
@@ -7,7 +7,7 @@
 package zio.schema.codec.generated;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@jakarta.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
 public class Enumeration implements org.apache.thrift.TBase<Enumeration, Enumeration._Fields>, java.io.Serializable, Cloneable, Comparable<Enumeration> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("Enumeration");
 
@@ -82,7 +82,7 @@ public java.lang.String getFieldName() {
   public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
   static {
     java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
-    tmpMap.put(_Fields.VALUE, new org.apache.thrift.meta_data.FieldMetaData("value", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+    tmpMap.put(_Fields.VALUE, new org.apache.thrift.meta_data.FieldMetaData("value", org.apache.thrift.TFieldRequirementType.DEFAULT,
         new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, OneOf.class)));
     metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
     org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(Enumeration.class, metaDataMap);
@@ -298,7 +298,7 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, Enumeration struct)
       while (true)
       {
         schemeField = iprot.readFieldBegin();
-        if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
+        if (schemeField.type == org.apache.thrift.protocol.TType.STOP) {
           break;
         }
         switch (schemeField.id) {
@@ -307,7 +307,7 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, Enumeration struct)
               struct.value = new OneOf();
               struct.value.read(iprot);
               struct.setValueIsSet(true);
-            } else { 
+            } else {
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
             }
             break;
diff --git a/zio-schema-thrift/src/test/scala/zio/schema/codec/generated/HighArity.java b/zio-schema-thrift/src/test/scala/zio/schema/codec/generated/HighArity.java
index 162de0773..c155a03a0 100644
--- a/zio-schema-thrift/src/test/scala/zio/schema/codec/generated/HighArity.java
+++ b/zio-schema-thrift/src/test/scala/zio/schema/codec/generated/HighArity.java
@@ -7,7 +7,7 @@
 package zio.schema.codec.generated;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@jakarta.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
 public class HighArity implements org.apache.thrift.TBase<HighArity, HighArity._Fields>, java.io.Serializable, Cloneable, Comparable<HighArity> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("HighArity");
 
@@ -222,53 +222,53 @@ public java.lang.String getFieldName() {
   public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
   static {
     java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
-    tmpMap.put(_Fields.F1, new org.apache.thrift.meta_data.FieldMetaData("f1", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+    tmpMap.put(_Fields.F1, new org.apache.thrift.meta_data.FieldMetaData("f1", org.apache.thrift.TFieldRequirementType.DEFAULT,
         new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32)));
-    tmpMap.put(_Fields.F2, new org.apache.thrift.meta_data.FieldMetaData("f2", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+    tmpMap.put(_Fields.F2, new org.apache.thrift.meta_data.FieldMetaData("f2", org.apache.thrift.TFieldRequirementType.DEFAULT,
         new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32)));
-    tmpMap.put(_Fields.F3, new org.apache.thrift.meta_data.FieldMetaData("f3", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+    tmpMap.put(_Fields.F3, new org.apache.thrift.meta_data.FieldMetaData("f3", org.apache.thrift.TFieldRequirementType.DEFAULT,
         new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32)));
-    tmpMap.put(_Fields.F4, new org.apache.thrift.meta_data.FieldMetaData("f4", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+    tmpMap.put(_Fields.F4, new org.apache.thrift.meta_data.FieldMetaData("f4", org.apache.thrift.TFieldRequirementType.DEFAULT,
         new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32)));
-    tmpMap.put(_Fields.F5, new org.apache.thrift.meta_data.FieldMetaData("f5", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+    tmpMap.put(_Fields.F5, new org.apache.thrift.meta_data.FieldMetaData("f5", org.apache.thrift.TFieldRequirementType.DEFAULT,
         new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32)));
-    tmpMap.put(_Fields.F6, new org.apache.thrift.meta_data.FieldMetaData("f6", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+    tmpMap.put(_Fields.F6, new org.apache.thrift.meta_data.FieldMetaData("f6", org.apache.thrift.TFieldRequirementType.DEFAULT,
         new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32)));
-    tmpMap.put(_Fields.F7, new org.apache.thrift.meta_data.FieldMetaData("f7", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+    tmpMap.put(_Fields.F7, new org.apache.thrift.meta_data.FieldMetaData("f7", org.apache.thrift.TFieldRequirementType.DEFAULT,
         new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32)));
-    tmpMap.put(_Fields.F8, new org.apache.thrift.meta_data.FieldMetaData("f8", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+    tmpMap.put(_Fields.F8, new org.apache.thrift.meta_data.FieldMetaData("f8", org.apache.thrift.TFieldRequirementType.DEFAULT,
         new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32)));
-    tmpMap.put(_Fields.F9, new org.apache.thrift.meta_data.FieldMetaData("f9", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+    tmpMap.put(_Fields.F9, new org.apache.thrift.meta_data.FieldMetaData("f9", org.apache.thrift.TFieldRequirementType.DEFAULT,
         new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32)));
-    tmpMap.put(_Fields.F10, new org.apache.thrift.meta_data.FieldMetaData("f10", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+    tmpMap.put(_Fields.F10, new org.apache.thrift.meta_data.FieldMetaData("f10", org.apache.thrift.TFieldRequirementType.DEFAULT,
         new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32)));
-    tmpMap.put(_Fields.F11, new org.apache.thrift.meta_data.FieldMetaData("f11", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+    tmpMap.put(_Fields.F11, new org.apache.thrift.meta_data.FieldMetaData("f11", org.apache.thrift.TFieldRequirementType.DEFAULT,
         new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32)));
-    tmpMap.put(_Fields.F12, new org.apache.thrift.meta_data.FieldMetaData("f12", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+    tmpMap.put(_Fields.F12, new org.apache.thrift.meta_data.FieldMetaData("f12", org.apache.thrift.TFieldRequirementType.DEFAULT,
         new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32)));
-    tmpMap.put(_Fields.F13, new org.apache.thrift.meta_data.FieldMetaData("f13", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+    tmpMap.put(_Fields.F13, new org.apache.thrift.meta_data.FieldMetaData("f13", org.apache.thrift.TFieldRequirementType.DEFAULT,
         new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32)));
-    tmpMap.put(_Fields.F14, new org.apache.thrift.meta_data.FieldMetaData("f14", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+    tmpMap.put(_Fields.F14, new org.apache.thrift.meta_data.FieldMetaData("f14", org.apache.thrift.TFieldRequirementType.DEFAULT,
         new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32)));
-    tmpMap.put(_Fields.F15, new org.apache.thrift.meta_data.FieldMetaData("f15", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+    tmpMap.put(_Fields.F15, new org.apache.thrift.meta_data.FieldMetaData("f15", org.apache.thrift.TFieldRequirementType.DEFAULT,
         new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32)));
-    tmpMap.put(_Fields.F16, new org.apache.thrift.meta_data.FieldMetaData("f16", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+    tmpMap.put(_Fields.F16, new org.apache.thrift.meta_data.FieldMetaData("f16", org.apache.thrift.TFieldRequirementType.DEFAULT,
         new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32)));
-    tmpMap.put(_Fields.F17, new org.apache.thrift.meta_data.FieldMetaData("f17", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+    tmpMap.put(_Fields.F17, new org.apache.thrift.meta_data.FieldMetaData("f17", org.apache.thrift.TFieldRequirementType.DEFAULT,
         new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32)));
-    tmpMap.put(_Fields.F18, new org.apache.thrift.meta_data.FieldMetaData("f18", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+    tmpMap.put(_Fields.F18, new org.apache.thrift.meta_data.FieldMetaData("f18", org.apache.thrift.TFieldRequirementType.DEFAULT,
         new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32)));
-    tmpMap.put(_Fields.F19, new org.apache.thrift.meta_data.FieldMetaData("f19", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+    tmpMap.put(_Fields.F19, new org.apache.thrift.meta_data.FieldMetaData("f19", org.apache.thrift.TFieldRequirementType.DEFAULT,
         new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32)));
-    tmpMap.put(_Fields.F20, new org.apache.thrift.meta_data.FieldMetaData("f20", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+    tmpMap.put(_Fields.F20, new org.apache.thrift.meta_data.FieldMetaData("f20", org.apache.thrift.TFieldRequirementType.DEFAULT,
         new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32)));
-    tmpMap.put(_Fields.F21, new org.apache.thrift.meta_data.FieldMetaData("f21", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+    tmpMap.put(_Fields.F21, new org.apache.thrift.meta_data.FieldMetaData("f21", org.apache.thrift.TFieldRequirementType.DEFAULT,
         new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32)));
-    tmpMap.put(_Fields.F22, new org.apache.thrift.meta_data.FieldMetaData("f22", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+    tmpMap.put(_Fields.F22, new org.apache.thrift.meta_data.FieldMetaData("f22", org.apache.thrift.TFieldRequirementType.DEFAULT,
         new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32)));
-    tmpMap.put(_Fields.F23, new org.apache.thrift.meta_data.FieldMetaData("f23", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+    tmpMap.put(_Fields.F23, new org.apache.thrift.meta_data.FieldMetaData("f23", org.apache.thrift.TFieldRequirementType.DEFAULT,
         new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32)));
-    tmpMap.put(_Fields.F24, new org.apache.thrift.meta_data.FieldMetaData("f24", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+    tmpMap.put(_Fields.F24, new org.apache.thrift.meta_data.FieldMetaData("f24", org.apache.thrift.TFieldRequirementType.DEFAULT,
         new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32)));
     metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
     org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(HighArity.class, metaDataMap);
@@ -2020,7 +2020,7 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, HighArity struct) t
       while (true)
       {
         schemeField = iprot.readFieldBegin();
-        if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
+        if (schemeField.type == org.apache.thrift.protocol.TType.STOP) {
           break;
         }
         switch (schemeField.id) {
@@ -2028,7 +2028,7 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, HighArity struct) t
             if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
               struct.f1 = iprot.readI32();
               struct.setF1IsSet(true);
-            } else { 
+            } else {
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
             }
             break;
@@ -2036,7 +2036,7 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, HighArity struct) t
             if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
               struct.f2 = iprot.readI32();
               struct.setF2IsSet(true);
-            } else { 
+            } else {
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
             }
             break;
@@ -2044,7 +2044,7 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, HighArity struct) t
             if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
               struct.f3 = iprot.readI32();
               struct.setF3IsSet(true);
-            } else { 
+            } else {
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
             }
             break;
@@ -2052,7 +2052,7 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, HighArity struct) t
             if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
               struct.f4 = iprot.readI32();
               struct.setF4IsSet(true);
-            } else { 
+            } else {
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
             }
             break;
@@ -2060,7 +2060,7 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, HighArity struct) t
             if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
               struct.f5 = iprot.readI32();
               struct.setF5IsSet(true);
-            } else { 
+            } else {
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
             }
             break;
@@ -2068,7 +2068,7 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, HighArity struct) t
             if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
               struct.f6 = iprot.readI32();
               struct.setF6IsSet(true);
-            } else { 
+            } else {
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
             }
             break;
@@ -2076,7 +2076,7 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, HighArity struct) t
             if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
               struct.f7 = iprot.readI32();
               struct.setF7IsSet(true);
-            } else { 
+            } else {
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
             }
             break;
@@ -2084,7 +2084,7 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, HighArity struct) t
             if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
               struct.f8 = iprot.readI32();
               struct.setF8IsSet(true);
-            } else { 
+            } else {
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
             }
             break;
@@ -2092,7 +2092,7 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, HighArity struct) t
             if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
               struct.f9 = iprot.readI32();
               struct.setF9IsSet(true);
-            } else { 
+            } else {
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
             }
             break;
@@ -2100,7 +2100,7 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, HighArity struct) t
             if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
               struct.f10 = iprot.readI32();
               struct.setF10IsSet(true);
-            } else { 
+            } else {
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
             }
             break;
@@ -2108,7 +2108,7 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, HighArity struct) t
             if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
               struct.f11 = iprot.readI32();
               struct.setF11IsSet(true);
-            } else { 
+            } else {
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
             }
             break;
@@ -2116,7 +2116,7 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, HighArity struct) t
             if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
               struct.f12 = iprot.readI32();
               struct.setF12IsSet(true);
-            } else { 
+            } else {
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
             }
             break;
@@ -2124,7 +2124,7 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, HighArity struct) t
             if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
               struct.f13 = iprot.readI32();
               struct.setF13IsSet(true);
-            } else { 
+            } else {
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
             }
             break;
@@ -2132,7 +2132,7 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, HighArity struct) t
             if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
               struct.f14 = iprot.readI32();
               struct.setF14IsSet(true);
-            } else { 
+            } else {
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
             }
             break;
@@ -2140,7 +2140,7 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, HighArity struct) t
             if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
               struct.f15 = iprot.readI32();
               struct.setF15IsSet(true);
-            } else { 
+            } else {
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
             }
             break;
@@ -2148,7 +2148,7 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, HighArity struct) t
             if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
               struct.f16 = iprot.readI32();
               struct.setF16IsSet(true);
-            } else { 
+            } else {
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
             }
             break;
@@ -2156,7 +2156,7 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, HighArity struct) t
             if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
               struct.f17 = iprot.readI32();
               struct.setF17IsSet(true);
-            } else { 
+            } else {
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
             }
             break;
@@ -2164,7 +2164,7 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, HighArity struct) t
             if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
               struct.f18 = iprot.readI32();
               struct.setF18IsSet(true);
-            } else { 
+            } else {
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
             }
             break;
@@ -2172,7 +2172,7 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, HighArity struct) t
             if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
               struct.f19 = iprot.readI32();
               struct.setF19IsSet(true);
-            } else { 
+            } else {
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
             }
             break;
@@ -2180,7 +2180,7 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, HighArity struct) t
             if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
               struct.f20 = iprot.readI32();
               struct.setF20IsSet(true);
-            } else { 
+            } else {
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
             }
             break;
@@ -2188,7 +2188,7 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, HighArity struct) t
             if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
               struct.f21 = iprot.readI32();
               struct.setF21IsSet(true);
-            } else { 
+            } else {
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
             }
             break;
@@ -2196,7 +2196,7 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, HighArity struct) t
             if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
               struct.f22 = iprot.readI32();
               struct.setF22IsSet(true);
-            } else { 
+            } else {
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
             }
             break;
@@ -2204,7 +2204,7 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, HighArity struct) t
             if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
               struct.f23 = iprot.readI32();
               struct.setF23IsSet(true);
-            } else { 
+            } else {
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
             }
             break;
@@ -2212,7 +2212,7 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, HighArity struct) t
             if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
               struct.f24 = iprot.readI32();
               struct.setF24IsSet(true);
-            } else { 
+            } else {
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
             }
             break;
diff --git a/zio-schema-thrift/src/test/scala/zio/schema/codec/generated/IntList.java b/zio-schema-thrift/src/test/scala/zio/schema/codec/generated/IntList.java
index 88db2cfba..5d4167ad6 100644
--- a/zio-schema-thrift/src/test/scala/zio/schema/codec/generated/IntList.java
+++ b/zio-schema-thrift/src/test/scala/zio/schema/codec/generated/IntList.java
@@ -7,7 +7,7 @@
 package zio.schema.codec.generated;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@jakarta.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
 public class IntList implements org.apache.thrift.TBase<IntList, IntList._Fields>, java.io.Serializable, Cloneable, Comparable<IntList> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("IntList");
 
@@ -82,8 +82,8 @@ public java.lang.String getFieldName() {
   public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
   static {
     java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
-    tmpMap.put(_Fields.ITEMS, new org.apache.thrift.meta_data.FieldMetaData("items", org.apache.thrift.TFieldRequirementType.DEFAULT, 
-        new org.apache.thrift.meta_data.ListMetaData(org.apache.thrift.protocol.TType.LIST, 
+    tmpMap.put(_Fields.ITEMS, new org.apache.thrift.meta_data.FieldMetaData("items", org.apache.thrift.TFieldRequirementType.DEFAULT,
+        new org.apache.thrift.meta_data.ListMetaData(org.apache.thrift.protocol.TType.LIST,
             new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32))));
     metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
     org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(IntList.class, metaDataMap);
@@ -316,7 +316,7 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, IntList struct) thr
       while (true)
       {
         schemeField = iprot.readFieldBegin();
-        if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
+        if (schemeField.type == org.apache.thrift.protocol.TType.STOP) {
           break;
         }
         switch (schemeField.id) {
@@ -334,7 +334,7 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, IntList struct) thr
                 iprot.readListEnd();
               }
               struct.setItemsIsSet(true);
-            } else { 
+            } else {
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
             }
             break;
diff --git a/zio-schema-thrift/src/test/scala/zio/schema/codec/generated/IntValue.java b/zio-schema-thrift/src/test/scala/zio/schema/codec/generated/IntValue.java
index 8f7e8b123..5eaee0b78 100644
--- a/zio-schema-thrift/src/test/scala/zio/schema/codec/generated/IntValue.java
+++ b/zio-schema-thrift/src/test/scala/zio/schema/codec/generated/IntValue.java
@@ -7,7 +7,7 @@
 package zio.schema.codec.generated;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@jakarta.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
 public class IntValue implements org.apache.thrift.TBase<IntValue, IntValue._Fields>, java.io.Serializable, Cloneable, Comparable<IntValue> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("IntValue");
 
@@ -84,7 +84,7 @@ public java.lang.String getFieldName() {
   public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
   static {
     java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
-    tmpMap.put(_Fields.VALUE, new org.apache.thrift.meta_data.FieldMetaData("value", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+    tmpMap.put(_Fields.VALUE, new org.apache.thrift.meta_data.FieldMetaData("value", org.apache.thrift.TFieldRequirementType.DEFAULT,
         new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32)));
     metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
     org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(IntValue.class, metaDataMap);
@@ -295,7 +295,7 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, IntValue struct) th
       while (true)
       {
         schemeField = iprot.readFieldBegin();
-        if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
+        if (schemeField.type == org.apache.thrift.protocol.TType.STOP) {
           break;
         }
         switch (schemeField.id) {
@@ -303,7 +303,7 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, IntValue struct) th
             if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
               struct.value = iprot.readI32();
               struct.setValueIsSet(true);
-            } else { 
+            } else {
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
             }
             break;
diff --git a/zio-schema-thrift/src/test/scala/zio/schema/codec/generated/MapValue.java b/zio-schema-thrift/src/test/scala/zio/schema/codec/generated/MapValue.java
index 632126e0a..4a93c197c 100644
--- a/zio-schema-thrift/src/test/scala/zio/schema/codec/generated/MapValue.java
+++ b/zio-schema-thrift/src/test/scala/zio/schema/codec/generated/MapValue.java
@@ -7,7 +7,7 @@
 package zio.schema.codec.generated;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@jakarta.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
 public class MapValue implements org.apache.thrift.TBase<MapValue, MapValue._Fields>, java.io.Serializable, Cloneable, Comparable<MapValue> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("MapValue");
 
@@ -82,9 +82,9 @@ public java.lang.String getFieldName() {
   public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
   static {
     java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
-    tmpMap.put(_Fields.VALUE, new org.apache.thrift.meta_data.FieldMetaData("value", org.apache.thrift.TFieldRequirementType.DEFAULT, 
-        new org.apache.thrift.meta_data.MapMetaData(org.apache.thrift.protocol.TType.MAP, 
-            new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING), 
+    tmpMap.put(_Fields.VALUE, new org.apache.thrift.meta_data.FieldMetaData("value", org.apache.thrift.TFieldRequirementType.DEFAULT,
+        new org.apache.thrift.meta_data.MapMetaData(org.apache.thrift.protocol.TType.MAP,
+            new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING),
             new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, Record.class))));
     metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
     org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(MapValue.class, metaDataMap);
@@ -323,7 +323,7 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, MapValue struct) th
       while (true)
       {
         schemeField = iprot.readFieldBegin();
-        if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
+        if (schemeField.type == org.apache.thrift.protocol.TType.STOP) {
           break;
         }
         switch (schemeField.id) {
@@ -344,7 +344,7 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, MapValue struct) th
                 iprot.readMapEnd();
               }
               struct.setValueIsSet(true);
-            } else { 
+            } else {
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
             }
             break;
@@ -416,7 +416,7 @@ public void read(org.apache.thrift.protocol.TProtocol prot, MapValue struct) thr
       java.util.BitSet incoming = iprot.readBitSet(1);
       if (incoming.get(0)) {
         {
-          org.apache.thrift.protocol.TMap _map30 = iprot.readMapBegin(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRUCT); 
+          org.apache.thrift.protocol.TMap _map30 = iprot.readMapBegin(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRUCT);
           struct.value = new java.util.HashMap<java.lang.String,Record>(2*_map30.size);
           @org.apache.thrift.annotation.Nullable java.lang.String _key31;
           @org.apache.thrift.annotation.Nullable Record _val32;
diff --git a/zio-schema-thrift/src/test/scala/zio/schema/codec/generated/OneOf.java b/zio-schema-thrift/src/test/scala/zio/schema/codec/generated/OneOf.java
index cea98e237..63d1c0815 100644
--- a/zio-schema-thrift/src/test/scala/zio/schema/codec/generated/OneOf.java
+++ b/zio-schema-thrift/src/test/scala/zio/schema/codec/generated/OneOf.java
@@ -7,7 +7,7 @@
 package zio.schema.codec.generated;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@jakarta.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
 public class OneOf extends org.apache.thrift.TUnion<OneOf, OneOf._Fields> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("OneOf");
   private static final org.apache.thrift.protocol.TField STRING_VALUE_FIELD_DESC = new org.apache.thrift.protocol.TField("stringValue", org.apache.thrift.protocol.TType.STRUCT, (short)1);
@@ -83,11 +83,11 @@ public java.lang.String getFieldName() {
   public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
   static {
     java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
-    tmpMap.put(_Fields.STRING_VALUE, new org.apache.thrift.meta_data.FieldMetaData("stringValue", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
+    tmpMap.put(_Fields.STRING_VALUE, new org.apache.thrift.meta_data.FieldMetaData("stringValue", org.apache.thrift.TFieldRequirementType.OPTIONAL,
         new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, StringValue.class)));
-    tmpMap.put(_Fields.INT_VALUE, new org.apache.thrift.meta_data.FieldMetaData("intValue", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
+    tmpMap.put(_Fields.INT_VALUE, new org.apache.thrift.meta_data.FieldMetaData("intValue", org.apache.thrift.TFieldRequirementType.OPTIONAL,
         new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, IntValue.class)));
-    tmpMap.put(_Fields.BOOL_VALUE, new org.apache.thrift.meta_data.FieldMetaData("boolValue", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
+    tmpMap.put(_Fields.BOOL_VALUE, new org.apache.thrift.meta_data.FieldMetaData("boolValue", org.apache.thrift.TFieldRequirementType.OPTIONAL,
         new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, BoolValue.class)));
     metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
     org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(OneOf.class, metaDataMap);
diff --git a/zio-schema-thrift/src/test/scala/zio/schema/codec/generated/Record.java b/zio-schema-thrift/src/test/scala/zio/schema/codec/generated/Record.java
index 6ece4a164..13f224c81 100644
--- a/zio-schema-thrift/src/test/scala/zio/schema/codec/generated/Record.java
+++ b/zio-schema-thrift/src/test/scala/zio/schema/codec/generated/Record.java
@@ -7,7 +7,7 @@
 package zio.schema.codec.generated;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@jakarta.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
 public class Record implements org.apache.thrift.TBase<Record, Record._Fields>, java.io.Serializable, Cloneable, Comparable<Record> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("Record");
 
@@ -89,9 +89,9 @@ public java.lang.String getFieldName() {
   public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
   static {
     java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
-    tmpMap.put(_Fields.NAME, new org.apache.thrift.meta_data.FieldMetaData("name", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+    tmpMap.put(_Fields.NAME, new org.apache.thrift.meta_data.FieldMetaData("name", org.apache.thrift.TFieldRequirementType.DEFAULT,
         new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
-    tmpMap.put(_Fields.VALUE, new org.apache.thrift.meta_data.FieldMetaData("value", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+    tmpMap.put(_Fields.VALUE, new org.apache.thrift.meta_data.FieldMetaData("value", org.apache.thrift.TFieldRequirementType.DEFAULT,
         new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32)));
     metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
     org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(Record.class, metaDataMap);
@@ -377,7 +377,7 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, Record struct) thro
       while (true)
       {
         schemeField = iprot.readFieldBegin();
-        if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
+        if (schemeField.type == org.apache.thrift.protocol.TType.STOP) {
           break;
         }
         switch (schemeField.id) {
@@ -385,7 +385,7 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, Record struct) thro
             if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
               struct.name = iprot.readString();
               struct.setNameIsSet(true);
-            } else { 
+            } else {
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
             }
             break;
@@ -393,7 +393,7 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, Record struct) thro
             if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
               struct.value = iprot.readI32();
               struct.setValueIsSet(true);
-            } else { 
+            } else {
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
             }
             break;
diff --git a/zio-schema-thrift/src/test/scala/zio/schema/codec/generated/SetValue.java b/zio-schema-thrift/src/test/scala/zio/schema/codec/generated/SetValue.java
index 7bae51e0f..bae30c4fb 100644
--- a/zio-schema-thrift/src/test/scala/zio/schema/codec/generated/SetValue.java
+++ b/zio-schema-thrift/src/test/scala/zio/schema/codec/generated/SetValue.java
@@ -7,7 +7,7 @@
 package zio.schema.codec.generated;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@jakarta.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
 public class SetValue implements org.apache.thrift.TBase<SetValue, SetValue._Fields>, java.io.Serializable, Cloneable, Comparable<SetValue> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("SetValue");
 
@@ -82,8 +82,8 @@ public java.lang.String getFieldName() {
   public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
   static {
     java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
-    tmpMap.put(_Fields.VALUE, new org.apache.thrift.meta_data.FieldMetaData("value", org.apache.thrift.TFieldRequirementType.DEFAULT, 
-        new org.apache.thrift.meta_data.SetMetaData(org.apache.thrift.protocol.TType.SET, 
+    tmpMap.put(_Fields.VALUE, new org.apache.thrift.meta_data.FieldMetaData("value", org.apache.thrift.TFieldRequirementType.DEFAULT,
+        new org.apache.thrift.meta_data.SetMetaData(org.apache.thrift.protocol.TType.SET,
             new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, Record.class))));
     metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
     org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(SetValue.class, metaDataMap);
@@ -319,7 +319,7 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, SetValue struct) th
       while (true)
       {
         schemeField = iprot.readFieldBegin();
-        if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
+        if (schemeField.type == org.apache.thrift.protocol.TType.STOP) {
           break;
         }
         switch (schemeField.id) {
@@ -338,7 +338,7 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, SetValue struct) th
                 iprot.readSetEnd();
               }
               struct.setValueIsSet(true);
-            } else { 
+            } else {
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
             }
             break;
diff --git a/zio-schema-thrift/src/test/scala/zio/schema/codec/generated/StringList.java b/zio-schema-thrift/src/test/scala/zio/schema/codec/generated/StringList.java
index 964f5d919..93f89e55f 100644
--- a/zio-schema-thrift/src/test/scala/zio/schema/codec/generated/StringList.java
+++ b/zio-schema-thrift/src/test/scala/zio/schema/codec/generated/StringList.java
@@ -7,7 +7,7 @@
 package zio.schema.codec.generated;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@jakarta.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
 public class StringList implements org.apache.thrift.TBase<StringList, StringList._Fields>, java.io.Serializable, Cloneable, Comparable<StringList> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("StringList");
 
@@ -82,8 +82,8 @@ public java.lang.String getFieldName() {
   public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
   static {
     java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
-    tmpMap.put(_Fields.ITEMS, new org.apache.thrift.meta_data.FieldMetaData("items", org.apache.thrift.TFieldRequirementType.DEFAULT, 
-        new org.apache.thrift.meta_data.ListMetaData(org.apache.thrift.protocol.TType.LIST, 
+    tmpMap.put(_Fields.ITEMS, new org.apache.thrift.meta_data.FieldMetaData("items", org.apache.thrift.TFieldRequirementType.DEFAULT,
+        new org.apache.thrift.meta_data.ListMetaData(org.apache.thrift.protocol.TType.LIST,
             new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))));
     metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
     org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(StringList.class, metaDataMap);
@@ -316,7 +316,7 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, StringList struct)
       while (true)
       {
         schemeField = iprot.readFieldBegin();
-        if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
+        if (schemeField.type == org.apache.thrift.protocol.TType.STOP) {
           break;
         }
         switch (schemeField.id) {
@@ -334,7 +334,7 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, StringList struct)
                 iprot.readListEnd();
               }
               struct.setItemsIsSet(true);
-            } else { 
+            } else {
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
             }
             break;
diff --git a/zio-schema-thrift/src/test/scala/zio/schema/codec/generated/StringValue.java b/zio-schema-thrift/src/test/scala/zio/schema/codec/generated/StringValue.java
index 2170de5c1..7010a61b5 100644
--- a/zio-schema-thrift/src/test/scala/zio/schema/codec/generated/StringValue.java
+++ b/zio-schema-thrift/src/test/scala/zio/schema/codec/generated/StringValue.java
@@ -7,7 +7,7 @@
 package zio.schema.codec.generated;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
+@jakarta.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)")
 public class StringValue implements org.apache.thrift.TBase<StringValue, StringValue._Fields>, java.io.Serializable, Cloneable, Comparable<StringValue> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("StringValue");
 
@@ -82,7 +82,7 @@ public java.lang.String getFieldName() {
   public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
   static {
     java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
-    tmpMap.put(_Fields.VALUE, new org.apache.thrift.meta_data.FieldMetaData("value", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+    tmpMap.put(_Fields.VALUE, new org.apache.thrift.meta_data.FieldMetaData("value", org.apache.thrift.TFieldRequirementType.DEFAULT,
         new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
     metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
     org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(StringValue.class, metaDataMap);
@@ -298,7 +298,7 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, StringValue struct)
       while (true)
       {
         schemeField = iprot.readFieldBegin();
-        if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
+        if (schemeField.type == org.apache.thrift.protocol.TType.STOP) {
           break;
         }
         switch (schemeField.id) {
@@ -306,7 +306,7 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, StringValue struct)
             if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
               struct.value = iprot.readString();
               struct.setValueIsSet(true);
-            } else { 
+            } else {
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
             }
             break;