Enable Java default interface methods.

examples/build.gradle.kts

@@ -1,7 +1,7 @@
 /*
- * Copyright (c) 2018.
+ * Copyright (c) 2023.
  *
- * This file is part of XmlUtil.
+ * This file is part of xmlutil.
  *
  * This file is licenced to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
@@ -20,9 +20,6 @@
 
 @file:Suppress("PropertyName")
 
-import net.devrieze.gradle.ext.envJvm
-import org.gradle.api.attributes.java.TargetJvmEnvironment.TARGET_JVM_ENVIRONMENT_ATTRIBUTE
-
 plugins {
     kotlin("jvm")
     alias(libs.plugins.kotlinSerialization)
@@ -33,6 +30,12 @@ base {
     archivesName.set("examples")
 }
 
+kotlin {
+    compilerOptions {
+        freeCompilerArgs.set(freeCompilerArgs.get() + "-Xjvm-default=all")
+    }
+}
+
 val autoModuleName = "net.devrieze.serialexamples"
 
 dependencies {

serialization/build.gradle.kts

@@ -61,6 +61,9 @@ kotlin {
                     attributes("Automatic-Module-Name" to autoModuleName)
                 }
             }
+            kotlinOptions {
+                freeCompilerArgs += "-Xjvm-default=all"
+            }
         }
 
         val woodstoxCompilation = compilations.create("woodstoxTest") {
@@ -78,7 +81,13 @@ kotlin {
     }
 //        androidTarget("actualAndroid")
 
-    jvm("android")
+    jvm("android") {
+        compilations.all {
+            kotlinOptions {
+                freeCompilerArgs += "-Xjvm-default=all"
+            }
+        }
+    }
     js {
         browser()
         compilations.all {

serialization/src/commonMain/kotlin/nl/adaptivity/xmlutil/serialization/XML.kt

@@ -31,6 +31,7 @@ import kotlinx.serialization.modules.SerializersModule
 import kotlinx.serialization.modules.plus
 import nl.adaptivity.xmlutil.*
 import nl.adaptivity.xmlutil.core.impl.multiplatform.Language
+import nl.adaptivity.xmlutil.core.impl.multiplatform.MpJvmDefaultWithCompatibility
 import nl.adaptivity.xmlutil.core.impl.multiplatform.StringWriter
 import nl.adaptivity.xmlutil.core.impl.multiplatform.use
 import nl.adaptivity.xmlutil.serialization.XML.Companion.encodeToWriter
@@ -1012,6 +1013,7 @@ public class XML(
             decodeFromReader(loader, reader)
     }
 
+    @MpJvmDefaultWithCompatibility
     public interface XmlCodecConfig {
         /**
          * The currently active serialization context
@@ -1034,6 +1036,7 @@ public class XML(
      * [XmlWriter]. This is used for example by [CompactFragment] to make the fragment transparent when serializing to
      * XML.
      */
+    @MpJvmDefaultWithCompatibility
     public interface XmlOutput : XmlCodecConfig {
         /**
          * The name for the current tag
@@ -1077,6 +1080,7 @@ public class XML(
      * [XmlReader]. This is used for example by [CompactFragment] to read arbitrary XML from the stream and store it inside
      * the buffer (without attempting to use the serializer/decoder for it.
      */
+    @MpJvmDefaultWithCompatibility
     public interface XmlInput : XmlCodecConfig {
         /**
          * The reader used. Can be used directly by serializers

serialization/src/commonMain/kotlin/nl/adaptivity/xmlutil/serialization/structure/XmlDescriptor.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020.
+ * Copyright (c) 2023.
  *
  * This file is part of xmlutil.
  *
@@ -31,6 +31,7 @@ import kotlinx.serialization.descriptors.*
 import kotlinx.serialization.modules.EmptySerializersModule
 import kotlinx.serialization.modules.SerializersModule
 import nl.adaptivity.xmlutil.*
+import nl.adaptivity.xmlutil.core.impl.multiplatform.MpJvmDefaultWithCompatibility
 import nl.adaptivity.xmlutil.core.impl.multiplatform.maybeAnnotations
 import nl.adaptivity.xmlutil.serialization.*
 import nl.adaptivity.xmlutil.serialization.XmlCodecBase.Companion.declRequestedName
@@ -66,6 +67,7 @@ internal fun SerialDescriptor.declOutputKind(): OutputKind? {
 /**
  * Interface describing a type without providing access to child xml descriptors
  */
+@MpJvmDefaultWithCompatibility
 public interface SafeXmlDescriptor {
     @ExperimentalSerializationApi
     public val isNullable: Boolean
@@ -1288,6 +1290,7 @@ public class XmlListDescriptor internal constructor(
  * Interface that provides parent info that does provide actual access to the child. As such it is safe to
  * be used to determine properties of the child.
  */
+@MpJvmDefaultWithCompatibility
 public interface SafeParentInfo {
     /** Is the parent type an inline class. */
     public val parentIsInline: Boolean

testutil/build.gradle.kts

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022.
+ * Copyright (c) 2023.
  *
  * This file is part of xmlutil.
  *
@@ -20,11 +20,10 @@
 
 @file:Suppress("PropertyName")
 
-import net.devrieze.gradle.ext.*
-import org.gradle.api.attributes.java.TargetJvmEnvironment.TARGET_JVM_ENVIRONMENT_ATTRIBUTE
-import org.jetbrains.kotlin.gradle.plugin.KotlinPlatformType
+import net.devrieze.gradle.ext.addNativeTargets
+import net.devrieze.gradle.ext.configureDokka
+import net.devrieze.gradle.ext.doPublish
 import org.jetbrains.kotlin.gradle.targets.js.dsl.ExperimentalWasmDsl
-import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 plugins {
     kotlin("multiplatform")
@@ -49,7 +48,14 @@ base {
 val moduleName = "io.github.pdvrieze.testutil"
 
 kotlin {
-    jvm()
+    jvm {
+        compilations.all {
+            kotlinOptions {
+                freeCompilerArgs += "-Xjvm-default=all"
+            }
+        }
+
+    }
     js {
         browser()
         nodejs()
@@ -81,7 +87,6 @@ kotlin {
         }
     }
 
-    @Suppress("UNUSED_VARIABLE")
     sourceSets {
         val commonMain by getting {
             dependencies {
@@ -95,6 +100,7 @@ kotlin {
         all {
             languageSettings.apply {
                 optIn("nl.adaptivity.xmlutil.ExperimentalXmlUtilApi")
+                optIn("nl.adaptivity.xmlutil.XmlUtilInternal")
             }
         }
     }

testutil/src/commonMain/kotlin/io/github/pdvrieze/xmlutil/testutil/assertXmlEquals.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022.
+ * Copyright (c) 2023.
  *
  * This file is part of xmlutil.
  *
@@ -120,7 +120,6 @@ internal fun assertStartElementEquals(
     messageProvider: () -> String? = { null }
 ) {
     assertQNameEquivalent(expectedEvent.name, actualEvent.name, messageProvider)
-    val elementNamespace = expectedEvent.namespaceUri
 
     val expectedAttributes = expectedEvent.attributes.filter { it.namespaceUri != XMLConstants.XMLNS_ATTRIBUTE_NS_URI }
         .map { XmlEvent.Attribute(it.namespaceUri, it.localName, "", it.value) }

xmlserializable/api/android/xmlserializable.api

@@ -30,11 +30,6 @@ public abstract interface class nl/adaptivity/xmlutil/xmlserializable/ExtXmlDese
 	public abstract fun deserializeChildren (Lnl/adaptivity/xmlutil/XmlReader;)V
 }
 
-public final class nl/adaptivity/xmlutil/xmlserializable/ExtXmlDeserializable$DefaultImpls {
-	public static fun deserializeAttribute (Lnl/adaptivity/xmlutil/xmlserializable/ExtXmlDeserializable;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Z
-	public static fun onBeforeDeserializeChildren (Lnl/adaptivity/xmlutil/xmlserializable/ExtXmlDeserializable;Lnl/adaptivity/xmlutil/XmlReader;)V
-}
-
 public final class nl/adaptivity/xmlutil/xmlserializable/SerializableCollection : nl/adaptivity/xmlutil/xmlserializable/BaseSerializableContainer, java/util/Collection, kotlin/jvm/internal/markers/KMappedMarker {
 	public fun <init> (Ljavax/xml/namespace/QName;Ljava/util/Collection;)V
 	public synthetic fun add (Ljava/lang/Object;)Z
@@ -113,26 +108,14 @@ public final class nl/adaptivity/xmlutil/xmlserializable/SerializableList : nl/a
 }
 
 public abstract interface class nl/adaptivity/xmlutil/xmlserializable/SimpleXmlDeserializable : nl/adaptivity/xmlutil/xmlserializable/XmlDeserializable {
-	public abstract fun deserializeChild (Lnl/adaptivity/xmlutil/XmlReader;)Z
-	public abstract fun deserializeChildText (Ljava/lang/CharSequence;)Z
-}
-
-public final class nl/adaptivity/xmlutil/xmlserializable/SimpleXmlDeserializable$DefaultImpls {
-	public static fun deserializeAttribute (Lnl/adaptivity/xmlutil/xmlserializable/SimpleXmlDeserializable;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Z
-	public static fun deserializeChild (Lnl/adaptivity/xmlutil/xmlserializable/SimpleXmlDeserializable;Lnl/adaptivity/xmlutil/XmlReader;)Z
-	public static fun deserializeChildText (Lnl/adaptivity/xmlutil/xmlserializable/SimpleXmlDeserializable;Ljava/lang/CharSequence;)Z
-	public static fun onBeforeDeserializeChildren (Lnl/adaptivity/xmlutil/xmlserializable/SimpleXmlDeserializable;Lnl/adaptivity/xmlutil/XmlReader;)V
+	public fun deserializeChild (Lnl/adaptivity/xmlutil/XmlReader;)Z
+	public fun deserializeChildText (Ljava/lang/CharSequence;)Z
 }
 
 public abstract interface class nl/adaptivity/xmlutil/xmlserializable/XmlDeserializable {
-	public abstract fun deserializeAttribute (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Z
+	public fun deserializeAttribute (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Z
 	public abstract fun getElementName ()Ljavax/xml/namespace/QName;
-	public abstract fun onBeforeDeserializeChildren (Lnl/adaptivity/xmlutil/XmlReader;)V
-}
-
-public final class nl/adaptivity/xmlutil/xmlserializable/XmlDeserializable$DefaultImpls {
-	public static fun deserializeAttribute (Lnl/adaptivity/xmlutil/xmlserializable/XmlDeserializable;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Z
-	public static fun onBeforeDeserializeChildren (Lnl/adaptivity/xmlutil/xmlserializable/XmlDeserializable;Lnl/adaptivity/xmlutil/XmlReader;)V
+	public fun onBeforeDeserializeChildren (Lnl/adaptivity/xmlutil/XmlReader;)V
 }
 
 public abstract interface annotation class nl/adaptivity/xmlutil/xmlserializable/XmlDeserializer : java/lang/annotation/Annotation {

xmlserializable/api/jvm/xmlserializable.api

@@ -30,11 +30,6 @@ public abstract interface class nl/adaptivity/xmlutil/xmlserializable/ExtXmlDese
 	public abstract fun deserializeChildren (Lnl/adaptivity/xmlutil/XmlReader;)V
 }
 
-public final class nl/adaptivity/xmlutil/xmlserializable/ExtXmlDeserializable$DefaultImpls {
-	public static fun deserializeAttribute (Lnl/adaptivity/xmlutil/xmlserializable/ExtXmlDeserializable;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Z
-	public static fun onBeforeDeserializeChildren (Lnl/adaptivity/xmlutil/xmlserializable/ExtXmlDeserializable;Lnl/adaptivity/xmlutil/XmlReader;)V
-}
-
 public final class nl/adaptivity/xmlutil/xmlserializable/SerializableCollection : nl/adaptivity/xmlutil/xmlserializable/BaseSerializableContainer, java/util/Collection, kotlin/jvm/internal/markers/KMappedMarker {
 	public fun <init> (Ljavax/xml/namespace/QName;Ljava/util/Collection;)V
 	public synthetic fun add (Ljava/lang/Object;)Z
@@ -113,26 +108,14 @@ public final class nl/adaptivity/xmlutil/xmlserializable/SerializableList : nl/a
 }
 
 public abstract interface class nl/adaptivity/xmlutil/xmlserializable/SimpleXmlDeserializable : nl/adaptivity/xmlutil/xmlserializable/XmlDeserializable {
-	public abstract fun deserializeChild (Lnl/adaptivity/xmlutil/XmlReader;)Z
-	public abstract fun deserializeChildText (Ljava/lang/CharSequence;)Z
-}
-
-public final class nl/adaptivity/xmlutil/xmlserializable/SimpleXmlDeserializable$DefaultImpls {
-	public static fun deserializeAttribute (Lnl/adaptivity/xmlutil/xmlserializable/SimpleXmlDeserializable;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Z
-	public static fun deserializeChild (Lnl/adaptivity/xmlutil/xmlserializable/SimpleXmlDeserializable;Lnl/adaptivity/xmlutil/XmlReader;)Z
-	public static fun deserializeChildText (Lnl/adaptivity/xmlutil/xmlserializable/SimpleXmlDeserializable;Ljava/lang/CharSequence;)Z
-	public static fun onBeforeDeserializeChildren (Lnl/adaptivity/xmlutil/xmlserializable/SimpleXmlDeserializable;Lnl/adaptivity/xmlutil/XmlReader;)V
+	public fun deserializeChild (Lnl/adaptivity/xmlutil/XmlReader;)Z
+	public fun deserializeChildText (Ljava/lang/CharSequence;)Z
 }
 
 public abstract interface class nl/adaptivity/xmlutil/xmlserializable/XmlDeserializable {
-	public abstract fun deserializeAttribute (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Z
+	public fun deserializeAttribute (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Z
 	public abstract fun getElementName ()Ljavax/xml/namespace/QName;
-	public abstract fun onBeforeDeserializeChildren (Lnl/adaptivity/xmlutil/XmlReader;)V
-}
-
-public final class nl/adaptivity/xmlutil/xmlserializable/XmlDeserializable$DefaultImpls {
-	public static fun deserializeAttribute (Lnl/adaptivity/xmlutil/xmlserializable/XmlDeserializable;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Z
-	public static fun onBeforeDeserializeChildren (Lnl/adaptivity/xmlutil/xmlserializable/XmlDeserializable;Lnl/adaptivity/xmlutil/XmlReader;)V
+	public fun onBeforeDeserializeChildren (Lnl/adaptivity/xmlutil/XmlReader;)V
 }
 
 public abstract interface annotation class nl/adaptivity/xmlutil/xmlserializable/XmlDeserializer : java/lang/annotation/Annotation {

xmlserializable/build.gradle.kts

@@ -57,6 +57,9 @@ kotlin {
 
     jvm {
         compilations.all {
+            kotlinOptions {
+                freeCompilerArgs += "-Xjvm-default=all"
+            }
             tasks.named<Test>("${target.name}Test") {
                 testTask.dependsOn(this)
             }
@@ -70,6 +73,9 @@ kotlin {
     }
     jvm("android") {
         compilations.all {
+            kotlinOptions {
+                freeCompilerArgs += "-Xjvm-default=all"
+            }
             tasks.named<Test>("${target.name}Test") {
                 testTask.dependsOn(this)
             }