Make the project build with 2.1.0. This includes removing all -android artefacts and having those be forwarding dependencies.

Author: pdvrieze

Changelog.md

@@ -13,6 +13,9 @@ Features:
   reader must support that).
 
 Changes:
+- Build with Kotlin 2.1.0. This means that except for `core-android`
+  the other `-android` artefacts are now deprecated. They are separate
+  synthetic configurations that only forward dependencies.
 - `encodeToWriter` will now flush the writer. This is particularly
   relevant in the context of `OutputStreamWriter` that doesn't write
   content until flushed or closed.

README.md

@@ -114,10 +114,15 @@ that mirrors the Java API)
 ```
    implementation("io.github.pdvrieze.xmlutil:serialization-jvm:0.90.4-SNAPSHOT")
 ```
-#### Android
+#### -Android- (Deprecated - this is dependency only - it has no code)
+** Deprecated **
 ```
    implementation("io.github.pdvrieze.xmlutil:serialization-android:0.90.4-SNAPSHOT")
 ```
+
+This version is merely a dependency to the main module that no longer has the android
+specific artefact as this is not supported by kotlin (and has resolution issues).
+
 #### js
 ```
    implementation("io.github.pdvrieze.xmlutil:serialization-js:0.90.4-SNAPSHOT")

core/compat/build.gradle.kts

@@ -40,7 +40,6 @@ kotlin {
     applyDefaultXmlUtilHierarchyTemplate()
 
     jvm("jdk")
-    jvm("android")
     js {
         browser()
         compilerOptions {
@@ -80,11 +79,21 @@ kotlin {
             }
         }
 
-        val androidMain by getting {
-            dependencies {
-                api(projects.coreAndroid)
-            }
-        }
+//        val androidMain by getting {
+//            dependencies {
+//                api(projects.coreAndroid)
+//            }
+//        }
+    }
+}
+
+config {
+    createAndroidCompatComponent = true
+}
+
+afterEvaluate {
+    dependencies {
+        "android"(projects.coreAndroid)
     }
 }
 

gradle/libs.versions.toml

@@ -8,7 +8,7 @@ jmh = "0.7.2"
 jmh-core = "1.37"
 benchmark = "0.4.11"
 junit5-jupiter = "5.10.2"
-kotlin = "2.0.21"
+kotlin = "2.1.0"
 kotlinx-serialization = "1.7.3"
 kotlinx-io = "0.5.4"
 kxml2 = "2.3.0"

kotlin-js-store/yarn.lock

@@ -92,33 +92,12 @@
   dependencies:
     "@types/node" "*"
 
-"@types/eslint-scope@^3.7.3":
-  version "3.7.4"
-  resolved "https://registry.yarnpkg.com/@types/eslint-scope/-/eslint-scope-3.7.4.tgz#37fc1223f0786c39627068a12e94d6e6fc61de16"
-  integrity sha512-9K4zoImiZc3HlIp6AVUDE4CWYx22a+lhSZMYNpbjW04+YF0KWj4pJXnEMjdnFTiQibFFmElcsasJXDbdI/EPhA==
-  dependencies:
-    "@types/eslint" "*"
-    "@types/estree" "*"
-
-"@types/eslint@*":
-  version "8.37.0"
-  resolved "https://registry.yarnpkg.com/@types/eslint/-/eslint-8.37.0.tgz#29cebc6c2a3ac7fea7113207bf5a828fdf4d7ef1"
-  integrity sha512-Piet7dG2JBuDIfohBngQ3rCt7MgO9xCO4xIMKxBThCq5PNRB91IjlJ10eJVwfoNtvTErmxLzwBZ7rHZtbOMmFQ==
-  dependencies:
-    "@types/estree" "*"
-    "@types/json-schema" "*"
-
-"@types/estree@*":
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/@types/estree/-/estree-1.0.1.tgz#aa22750962f3bf0e79d753d3cc067f010c95f194"
-  integrity sha512-LG4opVs2ANWZ1TJoKc937iMmNstM/d0ae1vNbnBvBhqCSezgVUOzcLCqbI5elV8Vy6WKwKjaqR+zO9VKirBBCA==
-
 "@types/estree@^1.0.5":
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/@types/estree/-/estree-1.0.5.tgz#a6ce3e556e00fd9895dd872dd172ad0d4bd687f4"
   integrity sha512-/kYRxGDLWzHOB7q+wtSUQlFrtcdUccpfy+X+9iMBpHK8QLLhx2wIPYuS5DYtR9Wa/YlZAbIovy7qVdB1Aq6Lyw==
 
-"@types/json-schema@*", "@types/json-schema@^7.0.8":
+"@types/json-schema@^7.0.8":
   version "7.0.11"
   resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.11.tgz#d421b6c527a3037f7c84433fd2c4229e016863d3"
   integrity sha512-wOuvG1SN4Us4rez+tylwwwCV1psiNVOkJeM3AUWUNWg/jDQY2+HE/444y5gc+jBmRqASOm2Oeh5c1axHobwRKQ==
@@ -677,7 +656,7 @@ engine.io@~6.5.2:
     engine.io-parser "~5.2.1"
     ws "~8.11.0"
 
-enhanced-resolve@^5.17.0:
+enhanced-resolve@^5.17.1:
   version "5.17.1"
   resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-5.17.1.tgz#67bfbbcc2f81d511be77d686a90267ef7f898a15"
   integrity sha512-LMHl3dXhTcfv8gM4kEzIUeTQ+7fpdA0l2tUf34BddXPkz2A5xJ5L/Pchd5BL6rdccM9QGvu0sWZzK1Z1t4wwyg==
@@ -1122,10 +1101,10 @@ karma-webpack@5.0.1:
     minimatch "^9.0.3"
     webpack-merge "^4.1.5"
 
-karma@6.4.3:
-  version "6.4.3"
-  resolved "https://registry.yarnpkg.com/karma/-/karma-6.4.3.tgz#763e500f99597218bbb536de1a14acc4ceea7ce8"
-  integrity sha512-LuucC/RE92tJ8mlCwqEoRWXP38UMAqpnq98vktmS9SznSoUPPUJQbc91dHcxcunROvfQjdORVA/YFviH+Xci9Q==
+karma@6.4.4:
+  version "6.4.4"
+  resolved "https://registry.yarnpkg.com/karma/-/karma-6.4.4.tgz#dfa5a426cf5a8b53b43cd54ef0d0d09742351492"
+  integrity sha512-LrtUxbdvt1gOpo3gxG+VAJlJAEMhbWlM4YrFQgql98FwF7+K8K12LYO4hnDdUkNjeztYrOXEMqgTajSWgmtI/w==
   dependencies:
     "@colors/colors" "1.5.0"
     body-parser "^1.19.0"
@@ -1157,6 +1136,13 @@ kind-of@^6.0.2:
   resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.3.tgz#07c05034a6c349fa06e24fa35aa76db4580ce4dd"
   integrity sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==
 
+kotlin-web-helpers@2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/kotlin-web-helpers/-/kotlin-web-helpers-2.0.0.tgz#b112096b273c1e733e0b86560998235c09a19286"
+  integrity sha512-xkVGl60Ygn/zuLkDPx+oHj7jeLR7hCvoNF99nhwXMn8a3ApB4lLiC9pk4ol4NHPjyoCbvQctBqvzUcp8pkqyWw==
+  dependencies:
+    format-util "^1.0.5"
+
 loader-runner@^4.2.0:
   version "4.3.0"
   resolved "https://registry.yarnpkg.com/loader-runner/-/loader-runner-4.3.0.tgz#c1b4a163b99f614830353b16755e7149ac2314e1"
@@ -1267,10 +1253,10 @@ mkdirp@^0.5.5:
   dependencies:
     minimist "^1.2.6"
 
-mocha@10.7.0:
-  version "10.7.0"
-  resolved "https://registry.yarnpkg.com/mocha/-/mocha-10.7.0.tgz#9e5cbed8fa9b37537a25bd1f7fb4f6fc45458b9a"
-  integrity sha512-v8/rBWr2VO5YkspYINnvu81inSz2y3ODJrhO175/Exzor1RcEZZkizgE2A+w/CAXXoESS8Kys5E62dOHGHzULA==
+mocha@10.7.3:
+  version "10.7.3"
+  resolved "https://registry.yarnpkg.com/mocha/-/mocha-10.7.3.tgz#ae32003cabbd52b59aece17846056a68eb4b0752"
+  integrity sha512-uQWxAu44wwiACGqjbPYmjo7Lg8sFrS3dQe7PP2FQI+woptP4vZXSMcfMyFL/e1yFEeEpV4RtyTpZROOKmxis+A==
   dependencies:
     ansi-colors "^4.1.3"
     browser-stdout "^1.3.1"
@@ -1868,12 +1854,11 @@ webpack-sources@^3.2.3:
   resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-3.2.3.tgz#2d4daab8451fd4b240cc27055ff6a0c2ccea0cde"
   integrity sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w==
 
-webpack@5.93.0:
-  version "5.93.0"
-  resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.93.0.tgz#2e89ec7035579bdfba9760d26c63ac5c3462a5e5"
-  integrity sha512-Y0m5oEY1LRuwly578VqluorkXbvXKh7U3rLoQCEO04M97ScRr44afGVkI0FQFsXzysk5OgFAxjZAb9rsGQVihA==
+webpack@5.94.0:
+  version "5.94.0"
+  resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.94.0.tgz#77a6089c716e7ab90c1c67574a28da518a20970f"
+  integrity sha512-KcsGn50VT+06JH/iunZJedYGUJS5FGjow8wb9c0v5n1Om8O1g4L6LjtfxwlXIATopoQu+vOXXa7gYisWxCoPyg==
   dependencies:
-    "@types/eslint-scope" "^3.7.3"
     "@types/estree" "^1.0.5"
     "@webassemblyjs/ast" "^1.12.1"
     "@webassemblyjs/wasm-edit" "^1.12.1"
@@ -1882,7 +1867,7 @@ webpack@5.93.0:
     acorn-import-attributes "^1.9.5"
     browserslist "^4.21.10"
     chrome-trace-event "^1.0.2"
-    enhanced-resolve "^5.17.0"
+    enhanced-resolve "^5.17.1"
     es-module-lexer "^1.2.1"
     eslint-scope "5.1.1"
     events "^3.2.0"

project-plugins/src/main/kotlin/io/github/xmlutil/plugin/ProjectPlugin.kt

@@ -29,21 +29,25 @@ import org.gradle.api.Plugin
 import org.gradle.api.Project
 import org.gradle.api.artifacts.VersionCatalogsExtension
 import org.gradle.api.attributes.java.TargetJvmEnvironment
+import org.gradle.api.component.SoftwareComponentFactory
 import org.gradle.api.plugins.JavaPlugin
 import org.gradle.api.plugins.JavaPluginExtension
 import org.gradle.api.provider.Property
+import org.gradle.api.publish.PublishingExtension
+import org.gradle.api.publish.maven.MavenPublication
 import org.gradle.api.tasks.testing.Test
 import org.gradle.jvm.toolchain.JavaLanguageVersion
 import org.gradle.kotlin.dsl.*
 import org.jetbrains.dokka.gradle.DokkaPlugin
-import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi
 import org.jetbrains.kotlin.gradle.dsl.*
 import org.jetbrains.kotlin.gradle.plugin.*
 import org.jetbrains.kotlin.gradle.targets.js.npm.tasks.KotlinNpmInstallTask
 import org.jetbrains.kotlin.gradle.targets.jvm.KotlinJvmTarget
+import javax.inject.Inject
 
-class ProjectPlugin: Plugin<Project> {
-    @OptIn(ExperimentalKotlinGradlePluginApi::class)
+class ProjectPlugin @Inject constructor(
+    private val softwareComponentFactory: SoftwareComponentFactory
+): Plugin<Project> {
     override fun apply(project: Project) {
         project.logger.info("===================\nUsing ProjectPlugin\n===================")
 
@@ -70,7 +74,39 @@ class ProjectPlugin: Plugin<Project> {
             applyLayout.convention(true)
             kotlinApiVersion.convention(KotlinVersion.KOTLIN_1_8)
             kotlinTestVersion.convention(KotlinVersion.DEFAULT)
+            createAndroidCompatComponent.convention(false)
         }
+
+        project.afterEvaluate {
+            if (e.createAndroidCompatComponent.get()) {
+                project.logger.warn("Creating compatible component")
+                val component = softwareComponentFactory.adhoc("depOnlyComponent")
+                project.components.add(component)
+                val pseudoConfig = project.configurations.dependencyScope("android") {
+                    attributes {
+                        attribute(TargetJvmEnvironment.TARGET_JVM_ENVIRONMENT_ATTRIBUTE, project.envAndroid)
+                        attribute(KotlinPlatformType.attribute, KotlinPlatformType.androidJvm)
+                    }
+
+                    component.addVariantsFromConfiguration(this) {
+                        mapToMavenScope("compile")
+                    }
+                    dependencies.add(project.dependencyFactory.create("io.github.pdvrieze.xmlutil:${project.name}:${project.version}"))
+                }
+
+                project.extensions.configure<PublishingExtension> {
+                    publications {
+                        create<MavenPublication>("android") {
+                            artifactId = "${project.name}-android"
+                            from(component)
+                        }
+                    }
+                }
+            }
+
+        }
+
+
         project.plugins.all {
             when (this) {
                 is JavaPlugin -> {
@@ -121,6 +157,7 @@ class ProjectPlugin: Plugin<Project> {
 
                 is KotlinMultiplatformPluginWrapper -> {
                     project.the<KotlinMultiplatformExtension>().apply {
+
                         if(e.applyLayout.get()) applyDefaultXmlUtilHierarchyTemplate()
                         compilerOptions {
                             configureCompilerOptions(project, "project ${project.name}")
@@ -194,11 +231,16 @@ class ProjectPlugin: Plugin<Project> {
                 }
             }
         }
+        project.afterEvaluate {
+            for (c in project.components) {
+                project.logger.warn("Found component: ${c.name}")
+            }
+        }
     }
 
     private fun KotlinCommonCompilerOptions.configureCompilerOptions(project: Project, name: String) {
         progressiveMode = true
-        languageVersion = KotlinVersion.KOTLIN_2_0
+        languageVersion = KotlinVersion.DEFAULT
         configureOptins()
         if (this is KotlinJvmCompilerOptions) {
             project.logger.info("Setting common compilation options for $name")
@@ -227,4 +269,5 @@ abstract class ProjectConfigurationExtension {
     abstract val applyLayout: Property<Boolean>
     abstract val kotlinApiVersion: Property<KotlinVersion>
     abstract val kotlinTestVersion: Property<KotlinVersion>
+    abstract val createAndroidCompatComponent: Property<Boolean>
 }

project-plugins/src/main/kotlin/net/devrieze/gradle/ext/nativeTargets.kt

@@ -131,7 +131,7 @@ private val defaultXmlUtilHierarchyTemplate  = KotlinHierarchyTemplate {
 val Project.nativeState: NativeState
     get() = rootProject.extraProperties["nativeTargets"] as NativeState
 
-@OptIn(org.jetbrains.kotlin.gradle.ExperimentalWasmDsl::class)
+//@OptIn(org.jetbrains.kotlin.gradle.ExperimentalWasmDsl::class)
 fun Project.addNativeTargets(includeWasm: Boolean = true, includeWasi: Boolean = true) {
     val ideaActive = System.getProperty("idea.active") == "true"
     val nativeState = when(property("native.deploy")?.toString()?.lowercase()) {
@@ -249,12 +249,6 @@ fun Project.addNativeTargets(includeWasm: Boolean = true, includeWasi: Boolean =
                 project.logger.debug("Configuring ${path} with hostTarget: ${hostTarget.visibleName} to depend on ${testTasks.joinToString { it.path}}")
                 dependsOn(testTasks)
             }
-
-            targets.withType<KotlinNativeTarget>().configureEach {
-                binaries {
-                    sharedLib(listOf(DEBUG, RELEASE))
-                }
-            }
         }
 
     }

serialization/api/jvm/serialization.api

@@ -30,7 +30,6 @@ import org.jetbrains.kotlin.gradle.dsl.JsModuleKind
 import org.jetbrains.kotlin.gradle.dsl.JsSourceMapEmbedMode
 import org.jetbrains.kotlin.gradle.plugin.KotlinPlatformType
 import org.jetbrains.kotlin.gradle.targets.jvm.KotlinJvmTarget
-import org.jetbrains.kotlin.js.config.SourceMapSourceEmbedding
 
 plugins {
     id("projectPlugin")
@@ -63,7 +62,7 @@ kotlin {
             }
         }
 
-/*
+        /*
         val woodstoxCompilation = compilations.create("woodstoxTest") {
             // This needs to be specified explicitly in 1.9.20
             compilerOptions.options.moduleName = "woodstoxTest"
@@ -75,12 +74,10 @@ kotlin {
                 listOf(woodstoxCompilation)
             )
         }
-*/
+        */
 
     }
 
-    jvm("android")
-
     js {
         browser()
         @Suppress("OPT_IN_USAGE")
@@ -150,7 +147,7 @@ kotlin {
             }
         }
         val commonJvmMain by getting {}
-/*
+        /*
         val jvmWoodstoxTest by getting {
             dependsOn(commonJvmTest)
             dependsOn(commonJvmMain)
@@ -160,26 +157,7 @@ kotlin {
                 runtimeOnly(libs.woodstox)
             }
         }
-*/
-
-        val androidMain by getting {
-            dependencies {
-                compileOnly(libs.kxml2)
-            }
-        }
-
-        val androidTest by getting {
-            dependencies {
-                implementation(kotlin("test-junit5"))
-                runtimeOnly(libs.kxml2)
-
-//                implementation(projects.coreAndroid)
-                implementation(libs.junit5.api)
-                implementation(libs.kotlin.reflect)
-
-                runtimeOnly(libs.junit5.engine)
-            }
-        }
+        */
 
         val jsMain by getting {
             dependencies {
@@ -219,6 +197,10 @@ kotlin {
 
 }
 
+config {
+    createAndroidCompatComponent = true
+}
+
 addNativeTargets()
 
 dependencies {

serialization/api/android/serialization.api serialization/api/serialization.api

@@ -37,7 +37,7 @@ import nl.adaptivity.xmlutil.dom2.Node as Node2
 @Suppress("EXPECT_ACTUAL_CLASSIFIERS_ARE_IN_BETA_WARNING")
 @Deprecated(
     message = "Please use nl.adaptivity.xmlutil.dom2.Node.serializer() in the core module",
-    replaceWith = ReplaceWith("Node.serializer()", "nl.adaptivity.xmlutil.dom2.Node")
+    replaceWith = ReplaceWith("Node.serializer()", "nl.adaptivity.xmlutil.dom2.Node.serializer()")
 )
 public actual object NodeSerializer : XmlSerializer<Node1> {
     private val delegate = Node2.serializer() as XmlSerializer<Node2>

serialization/build.gradle.kts

@@ -42,14 +42,16 @@ base {
     archivesName = "serialutil"
 }
 
+config {
+    createAndroidCompatComponent = true
+}
+
 val autoModuleName = "net.devrieze.serialutil"
 
 kotlin {
     applyDefaultXmlUtilHierarchyTemplate()
     jvm()
 
-    jvm("android")
-
     js {
         browser()
         nodejs()
@@ -86,14 +88,6 @@ kotlin {
             }
         }
 
-        val androidTest by getting {
-            dependencies {
-                implementation(kotlin("test-junit5"))
-                implementation(libs.junit5.api)
-
-                runtimeOnly(libs.junit5.engine)
-            }
-        }
         val jsTest by getting {
             dependencies {
                 implementation(kotlin("test-js"))

serialization/src/androidMain/kotlin/nl/adaptivity/xmlutil/serialization/ElementSerializer.android.kt

@@ -43,6 +43,10 @@ base {
     archivesName = "xmlserializable"
 }
 
+config {
+    createAndroidCompatComponent = true
+}
+
 val serializationVersion: String get() = libs.versions.kotlinx.serialization.get()
 
 val autoModuleName = "net.devrieze.xmlutil.xmlserializable"
@@ -74,17 +78,6 @@ kotlin {
             }
         }
     }
-    jvm("android") {
-        compilerOptions {
-            freeCompilerArgs.add("-Xjvm-default=all")
-        }
-        compilations.all {
-            tasks.named<Test>("${target.name}Test") {
-                testTask.dependsOn(this)
-            }
-            cleanTestTask.dependsOn(tasks.named("clean${target.name[0].uppercaseChar()}${target.name.substring(1)}Test"))
-        }
-    }
     js {
         browser()
 
@@ -124,22 +117,6 @@ kotlin {
             }
         }
 
-        val androidMain by getting {
-            dependencies {
-                compileOnly(libs.kxml2)
-            }
-        }
-
-        val androidTest by getting {
-            dependencies {
-                implementation(kotlin("test-junit5"))
-                implementation(libs.junit5.api)
-
-                runtimeOnly(libs.junit5.engine)
-                runtimeOnly(libs.kxml2)
-            }
-        }
-
         val jsTest by getting {
             dependencies {
                 implementation(kotlin("test-js"))