diff --git a/.scalafmt.conf b/.scalafmt.conf index 1c493890..f578806d 100644 --- a/.scalafmt.conf +++ b/.scalafmt.conf @@ -1,4 +1,4 @@ -version = 3.7.17 +version = 3.8.3 runner.dialect = scala3 align.preset = more align.multiline = true diff --git a/pom.xml b/pom.xml index 30e785f2..a5c0487c 100644 --- a/pom.xml +++ b/pom.xml @@ -42,15 +42,15 @@ io.vertx - vertx-stack-depchain + vertx-dependencies ${project.version} pom import io.vertx - vertx-docgen - 0.9.4 + vertx-docgen-processor + 0.9.8 org.scala-lang diff --git a/vertx-lang-scala-codegen/pom.xml b/vertx-lang-scala-codegen/pom.xml index ef519bfc..b35fb832 100644 --- a/vertx-lang-scala-codegen/pom.xml +++ b/vertx-lang-scala-codegen/pom.xml @@ -1,7 +1,7 @@ + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 @@ -21,7 +21,7 @@ io.vertx - vertx-docgen + vertx-docgen-processor io.vertx @@ -29,4 +29,4 @@ 4.0.3 - + \ No newline at end of file diff --git a/vertx-lang-scala-codegen/src/main/java/io/vertx/lang/scala/codegen/ScalaDocGenerator.java b/vertx-lang-scala-codegen/src/main/java/io/vertx/lang/scala/codegen/ScalaDocGenerator.java index d1bda88d..6469f81e 100644 --- a/vertx-lang-scala-codegen/src/main/java/io/vertx/lang/scala/codegen/ScalaDocGenerator.java +++ b/vertx-lang-scala-codegen/src/main/java/io/vertx/lang/scala/codegen/ScalaDocGenerator.java @@ -6,7 +6,7 @@ import io.vertx.codegen.processor.type.TypeMirrorFactory; import io.vertx.codetrans.CodeTranslator; import io.vertx.codetrans.lang.scala.ScalaLang; -import io.vertx.docgen.DocGenerator; +import io.vertx.docgen.processor.impl.DocGenerator; import javax.annotation.processing.ProcessingEnvironment; import javax.lang.model.type.ExecutableType; import javax.lang.model.type.TypeMirror; diff --git a/vertx-lang-scala/pom.xml b/vertx-lang-scala/pom.xml index 240f9900..de120007 100644 --- a/vertx-lang-scala/pom.xml +++ b/vertx-lang-scala/pom.xml @@ -376,7 +376,7 @@ io.vertx - vertx-docgen + vertx-docgen-processor provided