fix(bulk-model-sync-lib): fixed jvm name conflicting with java keyword

Author: mhuster23

model-sync-lib/src/commonMain/kotlin/org/modelix/model/sync/ModelImporter.kt

@@ -8,6 +8,7 @@ import org.modelix.model.api.getDescendants
 import org.modelix.model.api.remove
 import org.modelix.model.data.ModelData
 import org.modelix.model.data.NodeData
+import kotlin.jvm.JvmName
 
 /**
  * A ModelImporter updates an existing [INode] and its subtree based on a [ModelData] specification.
@@ -30,6 +31,7 @@ class ModelImporter(private val root: INode) {
      *
      * @param data the model specification
      */
+    @JvmName("importData")
     fun import(data: ModelData) {
         originalIdToExisting.clear()
         postponedReferences.clear()

model-sync-lib/src/jvmMain/kotlin/org/modelix/model/sync/PlatformSpecific.kt

@@ -3,12 +3,6 @@ package org.modelix.model.sync
 import org.modelix.model.data.ModelData
 import java.io.File
 
-// import is a reserved keyword in java
-@Deprecated("Use importFile instead", ReplaceWith("importFile(jsonFile)"))
-fun ModelImporter.import(jsonFile: File) {
-    this.importFile(jsonFile)
-}
-
 /**
  * Incrementally updates the root of the receiver [ModelImporter]
  * based on the [ModelData] specification contained in the given file.
@@ -17,7 +11,8 @@ fun ModelImporter.import(jsonFile: File) {
  *
  * @throws IllegalArgumentException if the file is not a json file or the file does not exist.
  */
-fun ModelImporter.importFile(jsonFile: File) {
+@JvmName("importFile")
+fun ModelImporter.import(jsonFile: File) {
     require(jsonFile.exists())
     require(jsonFile.extension == "json")