Fix all warnings for jvmJar/jvmCommonJar

pdvrieze · Jun 13, 2024 · 8695d9d · 8695d9d
1 parent e1f1077
commit 8695d9d
Show file tree

Hide file tree

Showing 32 changed files with 205 additions and 78 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -52,8 +52,8 @@ plugins.withType<NodeJsRootPlugin> {
     extensions.configure<NodeJsRootExtension> {
 //        nodeVersion = "21.2.0"
         // This version is needed to be able to use/test/run the latest wasm opcodes
-        nodeVersion = "21.0.0-v8-canary202309143a48826a08"
-        nodeDownloadBaseUrl = "https://nodejs.org/download/v8-canary"
+//        version = "21.0.0-v8-canary202309143a48826a08"
+//        downloadBaseUrl = "https://nodejs.org/download/v8-canary"
     }
 }
 

diff --git a/core/base/api/core.api b/core/base/api/core.api
@@ -708,6 +708,7 @@ public final class nl/adaptivity/xmlutil/XmlStreamingKt {
 
 public final class nl/adaptivity/xmlutil/XmlStreaming_jvmKt {
 	public static final fun getXmlStreaming ()Lnl/adaptivity/xmlutil/IXmlStreaming;
+	public static final fun newReader (Lnl/adaptivity/xmlutil/IXmlStreaming;Lorg/w3c/dom/Node;)Lnl/adaptivity/xmlutil/XmlReader;
 	public static final fun newWriter (Lnl/adaptivity/xmlutil/IXmlStreaming;Ljava/io/Writer;ZLnl/adaptivity/xmlutil/XmlDeclMode;)Lnl/adaptivity/xmlutil/XmlWriter;
 	public static final fun newWriter (Lnl/adaptivity/xmlutil/IXmlStreaming;Ljava/lang/Appendable;ZLnl/adaptivity/xmlutil/XmlDeclMode;)Lnl/adaptivity/xmlutil/XmlWriter;
 	public static final fun newWriter (Lnl/adaptivity/xmlutil/IXmlStreaming;Lnl/adaptivity/xmlutil/core/impl/multiplatform/Writer;ZLnl/adaptivity/xmlutil/XmlDeclMode;)Lnl/adaptivity/xmlutil/XmlWriter;

diff --git a/core/base/src/commonMain/kotlin/nl/adaptivity/xmlutil/DomReader.kt b/core/base/src/commonMain/kotlin/nl/adaptivity/xmlutil/DomReader.kt
@@ -38,7 +38,7 @@ import nl.adaptivity.xmlutil.dom2.Node as Node2
  *
  * @author Created by pdvrieze on 22/03/17.
  */
-@Deprecated("Don't use directly. Instead create an instance through xmlStreaming")
+@Deprecated("Don't use directly. Instead create an instance through xmlStreaming", ReplaceWith("xmlStreaming.newReader(delegate)", "nl.adaptivity.xmlutil.xmlStreaming"))
 @XmlUtilDeprecatedInternal
 public class DomReader(public val delegate: Node2) : XmlReader {
 

diff --git a/core/base/src/commonMain/kotlin/nl/adaptivity/xmlutil/XmlReader.kt b/core/base/src/commonMain/kotlin/nl/adaptivity/xmlutil/XmlReader.kt
@@ -142,7 +142,10 @@ public interface XmlReader : Closeable, Iterator<EventType> {
 
 
     /** Get some information on the current location in the file. This is implementation dependent.  */
-    @Deprecated("Use extLocationInfo as that allows more detailed information", ReplaceWith("extLocationInfo?.toString()"))
+    @Deprecated(
+        "Use extLocationInfo as that allows more detailed information",
+        ReplaceWith("extLocationInfo?.toString()")
+    )
     public val locationInfo: String?
 
     @Suppress("DEPRECATION")
@@ -159,7 +162,7 @@ public interface XmlReader : Closeable, Iterator<EventType> {
 
     public interface LocationInfo
 
-    public class StringLocationInfo(private val str: String): LocationInfo {
+    public class StringLocationInfo(private val str: String) : LocationInfo {
         override fun toString(): String = str
     }
 
@@ -301,10 +304,13 @@ public fun XmlBufferedReader.consecutiveTextContent(): String {
                     }
                     append(t.text)
                 }
+
                 EventType.START_ELEMENT
                 -> {
                     // If we have text we will actually not ignore the whitespace
-                    if (isNotEmpty()) { append(whiteSpace); whiteSpace.clear() }
+                    if (isNotEmpty()) {
+                        append(whiteSpace); whiteSpace.clear()
+                    }
                     // don't progress the event either
                     break@loop
                 }
@@ -428,6 +434,7 @@ public fun XmlReader.isIgnorable(): Boolean = when (eventType) {
     EventType.PROCESSING_INSTRUCTION,
     EventType.DOCDECL,
     EventType.IGNORABLE_WHITESPACE -> true
+
     EventType.TEXT -> isXmlWhitespace(text)
     else -> false
 }

diff --git a/core/base/src/commonMain/kotlin/nl/adaptivity/xmlutil/core/KtXmlReader.kt b/core/base/src/commonMain/kotlin/nl/adaptivity/xmlutil/core/KtXmlReader.kt
@@ -816,6 +816,10 @@ public class KtXmlReader internal constructor(
         return "KtXmlReader [${getPositionDescription()}]"
     }
 
+    @Deprecated(
+        "Use extLocationInfo as that allows more detailed information",
+        replaceWith = ReplaceWith("extLocationInfo?.toString()")
+    )
     override val locationInfo: String
         get() = "$line:$column"
 

diff --git a/core/base/src/commonMain/kotlin/nl/adaptivity/xmlutil/core/impl/PlatformXmlWriterBase.kt b/core/base/src/commonMain/kotlin/nl/adaptivity/xmlutil/core/impl/PlatformXmlWriterBase.kt
@@ -44,6 +44,7 @@ public abstract class PlatformXmlWriterBase(indentSequence: Iterable<XmlEvent.Te
 
     @get:Suppress("OverridingDeprecatedMember")
     override var indent: Int
+        @Deprecated("Use indentString for better accuracy")
         get() = indentSequence.sumOf {
             when (it.eventType) {
                 EventType.COMMENT -> 7 + it.text.length

diff --git a/...base/src/commonMain/kotlin/nl/adaptivity/xmlutil/core/impl/multiplatform/multiplatform.kt b/...base/src/commonMain/kotlin/nl/adaptivity/xmlutil/core/impl/multiplatform/multiplatform.kt
@@ -59,8 +59,8 @@ public expect val KClass<*>.maybeAnnotations: List<Annotation>
 public expect abstract class Writer : Appendable {
     public open fun write(text: String)
     open override fun append(value: CharSequence?): Appendable
-    abstract open override fun append(value: Char): Appendable
-    abstract open override fun append(value: CharSequence?, startIndex: Int, endIndex: Int): Appendable
+    abstract override fun append(value: Char): Appendable
+    abstract override fun append(value: CharSequence?, startIndex: Int, endIndex: Int): Appendable
     public open fun flush()
 }
 
@@ -85,7 +85,7 @@ public expect abstract class OutputStream : Closeable {
 @XmlUtilInternal
 public expect abstract class Reader {
     public open fun read(): Int
-    public open abstract fun read(buf: CharArray, offset: Int, len: Int): Int
+    public abstract fun read(buf: CharArray, offset: Int, len: Int): Int
 }
 
 @XmlUtilInternal
@@ -94,7 +94,7 @@ public expect abstract class InputStream : Closeable {
 
     public open fun read(b: ByteArray): Int
     public abstract fun read(): Int
-    public open override fun close()
+    public override fun close()
 }
 
 @XmlUtilInternal

diff --git a/core/base/src/commonTest/kotlin/nl/adaptivity/xmlutil/TestKtXmlReader.kt b/core/base/src/commonTest/kotlin/nl/adaptivity/xmlutil/TestKtXmlReader.kt
@@ -29,7 +29,7 @@ import kotlin.test.Test
 class TestKtXmlReader : TestCommonReader() {
 
     private fun createReader(it: String): XmlReader = xmlStreaming.newGenericReader(it)
-    
+
     @Test
     fun testReadCompactFragmentWithNamespaceInOuter() {
         testReadCompactFragmentWithNamespaceInOuter(::createReader)
@@ -86,18 +86,19 @@ class TestKtXmlReader : TestCommonReader() {
                 <?xpacket end='w'?>
             """
         val expected = xmlStreaming.newReader(expectedXml)
-        assertXmlEquals(expected, DomReader(domWriter.target))
+        val actual = xmlStreaming.newReader(domWriter.target)
+        assertXmlEquals(expected, actual)
 
         val fromDom = StringWriter()
         KtXmlWriter(fromDom).use { writer ->
-            DomReader(domWriter.target).use { reader ->
-                while(reader.hasNext()) {
+            xmlStreaming.newReader(domWriter.target).use { reader ->
+                while (reader.hasNext()) {
                     reader.next()
                     reader.writeCurrent(writer)
                 }
             }
         }
-         assertXmlEquals(expectedXml, fromDom.toString())
+        assertXmlEquals(expectedXml, fromDom.toString())
     }
 
     @Test

diff --git a/core/base/src/jvmCommonMain/kotlin/nl/adaptivity/xmlutil/XmlReaderExt.kt b/core/base/src/jvmCommonMain/kotlin/nl/adaptivity/xmlutil/XmlReaderExt.kt
@@ -52,7 +52,7 @@ public actual fun XmlReader.siblingsToFragment(): CompactFragment {
         }
     }
 
-    val startLocation = locationInfo
+    val startLocation = extLocationInfo
     try {
 
         val missingNamespaces:MutableMap<String, String> = TreeMap<String, String>()

diff --git a/core/base/src/jvmCommonMain/kotlin/nl/adaptivity/xmlutil/XmlStreaming.jvm.kt b/core/base/src/jvmCommonMain/kotlin/nl/adaptivity/xmlutil/XmlStreaming.jvm.kt
@@ -36,6 +36,7 @@ import javax.xml.transform.Source
 import kotlin.jvm.Volatile
 import kotlin.reflect.KClass
 import nl.adaptivity.xmlutil.core.impl.multiplatform.Writer as MPWriter
+import org.w3c.dom.Node as DomNode
 import java.io.Writer as JavaIoWriter
 
 @Deprecated(
@@ -318,6 +319,10 @@ public actual object XmlStreaming : XmlStreamingJavaCommon(), IXmlStreaming {
 public actual val xmlStreaming: IXmlStreaming get() = XmlStreaming
 
 
+public fun IXmlStreaming.newReader(node: DomNode): XmlReader {
+    return DomReader(node)
+}
+
 @Suppress("DEPRECATION")
 public actual fun IXmlStreaming.newWriter(
     output: Appendable,

diff --git a/core/base/src/jvmCommonMain/kotlin/nl/adaptivity/xmlutil/XmlWriterUtil.kt b/core/base/src/jvmCommonMain/kotlin/nl/adaptivity/xmlutil/XmlWriterUtil.kt
@@ -29,5 +29,5 @@ public fun XmlWriter.writeChild(node: Node) {
 }
 
 public fun XmlWriter.serialize(node: Node) {
-    serialize(DomReader(node))
+    serialize(xmlStreaming.newReader(node))
 }
diff --git a/core/base/src/jvmCommonMain/kotlin/nl/adaptivity/xmlutil/_XmlStreamingFactory.kt b/core/base/src/jvmCommonMain/kotlin/nl/adaptivity/xmlutil/_XmlStreamingFactory.kt
@@ -61,11 +61,12 @@ public actual interface XmlStreamingFactory {
         xmlDeclMode: XmlDeclMode = XmlDeclMode.None
     ): XmlWriter
 
-    @Deprecated("Use version with xmlDeclMode")
+    @Suppress("DEPRECATION")
+    @Deprecated("Usage of results only works on the JVM")
     public fun newWriter(result: Result, repairNamespaces: Boolean = false, omitXmlDecl: Boolean): XmlWriter =
         newWriter(result, repairNamespaces, XmlDeclMode.from(omitXmlDecl))
 
-    @Deprecated("Usage of results is deprecated")
+    @Deprecated("Usage of results only works on the JVM")
     public fun newWriter(
         result: Result,
         repairNamespaces: Boolean = false,

diff --git a/core/base/src/jvmCommonMain/kotlin/nl/adaptivity/xmlutil/dom/Node.javaShared.kt b/core/base/src/jvmCommonMain/kotlin/nl/adaptivity/xmlutil/dom/Node.javaShared.kt
@@ -20,8 +20,6 @@
 
 package nl.adaptivity.xmlutil.dom
 
-@Suppress("DEPRECATION")
 internal actual fun Node.asAttr(): Attr = this as Attr
 
-@Suppress("DEPRECATION")
 internal actual fun Node.asElement(): Element = this as Element
diff --git a/project-plugins/src/main/kotlin/io/github/xmlutil/plugin/ProjectPlugin.kt b/project-plugins/src/main/kotlin/io/github/xmlutil/plugin/ProjectPlugin.kt
@@ -122,7 +122,6 @@ class ProjectPlugin: Plugin<Project> {
                                 compileTaskProvider.configure {
                                     compilerOptions {
                                         apiVersion = if (isJvm) KotlinVersion.KOTLIN_1_8 else KotlinVersion.KOTLIN_2_0
-                                        configureOptins()
                                     }
                                 }
                             }
@@ -178,6 +177,7 @@ class ProjectPlugin: Plugin<Project> {
     private fun KotlinCommonCompilerOptions.configureCompilerOptions(project: Project, name: String) {
         progressiveMode = true
         languageVersion = KotlinVersion.KOTLIN_2_0
+        configureOptins()
         if (this is KotlinJvmCompilerOptions) {
             project.logger.info("Setting common compilation options for $name")
             jvmTarget = JvmTarget.JVM_1_8
@@ -188,12 +188,13 @@ class ProjectPlugin: Plugin<Project> {
     private fun LanguageSettingsBuilder.configureOptins() {
         optIn("nl.adaptivity.xmlutil.ExperimentalXmlUtilApi")
         optIn("nl.adaptivity.xmlutil.XmlUtilInternal")
-//        optIn("nl.adaptivity.xmlutil.XmlUtilDeprecatedInternal")
+        optIn("nl.adaptivity.xmlutil.XmlUtilDeprecatedInternal")
     }
 
     private fun KotlinCommonCompilerOptions.configureOptins() {
         optIn.add("nl.adaptivity.xmlutil.ExperimentalXmlUtilApi")
         optIn.add("nl.adaptivity.xmlutil.XmlUtilInternal")
+        optIn.add("nl.adaptivity.xmlutil.XmlUtilDeprecatedInternal")
     }
 }
 

diff --git a/serialization/api/android/serialization.api b/serialization/api/android/serialization.api
@@ -25,7 +25,7 @@ public final class nl/adaptivity/xmlutil/serialization/CompactFragmentSerializer
 }
 
 public final class nl/adaptivity/xmlutil/serialization/CompactFragmentSerializerKt {
-	public static final fun serializer (Lnl/adaptivity/xmlutil/util/CompactFragment$Companion;)Lkotlinx/serialization/KSerializer;
+	public static final synthetic fun serializer (Lnl/adaptivity/xmlutil/util/CompactFragment$Companion;)Lkotlinx/serialization/KSerializer;
 }
 
 public final class nl/adaptivity/xmlutil/serialization/DefaultPlatformModuleKt {

diff --git a/serialization/api/jvm/serialization.api b/serialization/api/jvm/serialization.api
@@ -25,7 +25,7 @@ public final class nl/adaptivity/xmlutil/serialization/CompactFragmentSerializer
 }
 
 public final class nl/adaptivity/xmlutil/serialization/CompactFragmentSerializerKt {
-	public static final fun serializer (Lnl/adaptivity/xmlutil/util/CompactFragment$Companion;)Lkotlinx/serialization/KSerializer;
+	public static final synthetic fun serializer (Lnl/adaptivity/xmlutil/util/CompactFragment$Companion;)Lkotlinx/serialization/KSerializer;
 }
 
 public final class nl/adaptivity/xmlutil/serialization/DefaultPlatformModuleKt {

diff --git a/serialization/api/serialization.klib.api b/serialization/api/serialization.klib.api
@@ -578,9 +578,9 @@ final class nl.adaptivity.xmlutil.serialization/XmlParsingException : nl.adaptiv
 final fun (nl.adaptivity.xmlutil.serialization/XmlChildrenName).nl.adaptivity.xmlutil.serialization/toQName(): nl.adaptivity.xmlutil/QName // nl.adaptivity.xmlutil.serialization/toQName|toQName@nl.adaptivity.xmlutil.serialization.XmlChildrenName(){}[0]
 final fun (nl.adaptivity.xmlutil.serialization/XmlSerialName).nl.adaptivity.xmlutil.serialization/toQName(kotlin/String, nl.adaptivity.xmlutil/Namespace?): nl.adaptivity.xmlutil/QName // nl.adaptivity.xmlutil.serialization/toQName|toQName@nl.adaptivity.xmlutil.serialization.XmlSerialName(kotlin.String;nl.adaptivity.xmlutil.Namespace?){}[0]
 final fun (nl.adaptivity.xmlutil.serialization/XmlSerializationPolicy).nl.adaptivity.xmlutil.serialization/typeQName(nl.adaptivity.xmlutil.serialization.structure/XmlDescriptor): nl.adaptivity.xmlutil/QName // nl.adaptivity.xmlutil.serialization/typeQName|typeQName@nl.adaptivity.xmlutil.serialization.XmlSerializationPolicy(nl.adaptivity.xmlutil.serialization.structure.XmlDescriptor){}[0]
+final fun (nl.adaptivity.xmlutil.util/CompactFragment.Companion).nl.adaptivity.xmlutil.serialization/serializer(): kotlinx.serialization/KSerializer<nl.adaptivity.xmlutil.util/CompactFragment> // nl.adaptivity.xmlutil.serialization/serializer|serializer@nl.adaptivity.xmlutil.util.CompactFragment.Companion(){}[0]
 final fun <#A: kotlin/Any> (#A).nl.adaptivity.xmlutil.serialization/writeAsXml(nl.adaptivity.xmlutil/XmlWriter, kotlinx.serialization/SerializationStrategy<#A>) // nl.adaptivity.xmlutil.serialization/writeAsXml|writeAsXml@0:0(nl.adaptivity.xmlutil.XmlWriter;kotlinx.serialization.SerializationStrategy<0:0>){0§<kotlin.Any>}[0]
 final fun nl.adaptivity.xmlutil.serialization/getPlatformDefaultModule(): kotlinx.serialization.modules/SerializersModule // nl.adaptivity.xmlutil.serialization/getPlatformDefaultModule|getPlatformDefaultModule(){}[0]
-final inline fun (nl.adaptivity.xmlutil.util/CompactFragment.Companion).nl.adaptivity.xmlutil.serialization/serializer(): kotlinx.serialization/KSerializer<nl.adaptivity.xmlutil.util/CompactFragment> // nl.adaptivity.xmlutil.serialization/serializer|serializer@nl.adaptivity.xmlutil.util.CompactFragment.Companion(){}[0]
 final inline fun <#A: reified kotlin/Any> (#A).nl.adaptivity.xmlutil.serialization/writeAsXML(nl.adaptivity.xmlutil/XmlWriter) // nl.adaptivity.xmlutil.serialization/writeAsXML|writeAsXML@0:0(nl.adaptivity.xmlutil.XmlWriter){0§<kotlin.Any>}[0]
 final object nl.adaptivity.xmlutil.serialization/CompactFragmentSerializer : nl.adaptivity.xmlutil.serialization/AbstractXmlSerializer<nl.adaptivity.xmlutil.util/CompactFragment> { // nl.adaptivity.xmlutil.serialization/CompactFragmentSerializer|null[0]
     final fun deserializeNonXML(kotlinx.serialization.encoding/Decoder): nl.adaptivity.xmlutil.util/CompactFragment // nl.adaptivity.xmlutil.serialization/CompactFragmentSerializer.deserializeNonXML|deserializeNonXML(kotlinx.serialization.encoding.Decoder){}[0]

diff --git a/...on/src/commonMain/kotlin/nl/adaptivity/xmlutil/serialization/CompactFragmentSerializer.kt b/...on/src/commonMain/kotlin/nl/adaptivity/xmlutil/serialization/CompactFragmentSerializer.kt
@@ -36,9 +36,10 @@ import nl.adaptivity.xmlutil.util.ICompactFragment
 
 @Suppress("EXTENSION_SHADOWED_BY_MEMBER")
 @Deprecated("Use serializer member",
-    ReplaceWith("CompactFragment.serializer()", "nl.adaptivity.xmlutil.util.CompactFragment")
+    ReplaceWith("CompactFragment.serializer()", "nl.adaptivity.xmlutil.util.CompactFragment"),
+    level = DeprecationLevel.HIDDEN
 )
-public inline fun CompactFragment.Companion.serializer(): KSerializer<CompactFragment> =
+public fun CompactFragment.Companion.serializer(): KSerializer<CompactFragment> =
     serializer()
 
 @Deprecated("Use the serializer defined in the core module",

diff --git a/serialization/src/commonMain/kotlin/nl/adaptivity/xmlutil/serialization/XML.kt b/serialization/src/commonMain/kotlin/nl/adaptivity/xmlutil/serialization/XML.kt
@@ -39,12 +39,12 @@ import nl.adaptivity.xmlutil.serialization.XmlSerializationPolicy.DeclaredNameIn
 import nl.adaptivity.xmlutil.serialization.impl.*
 import nl.adaptivity.xmlutil.serialization.structure.*
 import nl.adaptivity.xmlutil.util.CompactFragment
+import nl.adaptivity.xmlutil.util.CompactFragmentSerializer
 import kotlin.jvm.JvmOverloads
 import kotlin.reflect.KClass
 
 @ExperimentalXmlUtilApi
 private val defaultXmlModule = getPlatformDefaultModule() + SerializersModule {
-    contextual(CompactFragment::class, CompactFragmentSerializer)
     contextual(QName::class, QNameSerializer)
 }