Skip to content

Commit 1eacc95

Browse files
authored
Merge pull request #393 from modelix/fix/deprecate-register-languages
fix(bulk-model-sync-gradle): deprecate registerLanguage
2 parents bb767e6 + 533db0d commit 1eacc95

File tree

4 files changed

+4
-18
lines changed

4 files changed

+4
-18
lines changed

bulk-model-sync-gradle/src/main/kotlin/org/modelix/model/sync/bulk/gradle/ModelSyncGradlePlugin.kt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,6 @@ class ModelSyncGradlePlugin : Plugin<Project> {
152152
val importIntoModelServer = project.tasks.register(importTaskName, ImportIntoModelServer::class.java) {
153153
it.dependsOn(previousTask)
154154
it.inputDir.set(jsonDir)
155-
it.registeredLanguages.set(syncDirection.registeredLanguages)
156155
val serverTarget = syncDirection.target as ServerTarget
157156

158157
it.url.set(serverTarget.url)

bulk-model-sync-gradle/src/main/kotlin/org/modelix/model/sync/bulk/gradle/config/ModelSyncGradleSettings.kt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
package org.modelix.model.sync.bulk.gradle.config
1818

1919
import org.gradle.api.Action
20+
import org.modelix.kotlin.utils.DeprecationInfo
2021
import org.modelix.model.api.ILanguage
2122
import java.io.File
2223

@@ -40,7 +41,6 @@ data class SyncDirection(
4041
internal var source: SyncEndpoint? = null,
4142
internal var target: SyncEndpoint? = null,
4243
internal val includedModules: Set<String> = mutableSetOf(),
43-
internal val registeredLanguages: Set<ILanguage> = mutableSetOf(),
4444
internal val includedModulePrefixes: Set<String> = mutableSetOf(),
4545
internal var continueOnError: Boolean = false,
4646
) {
@@ -76,9 +76,9 @@ data class SyncDirection(
7676
(includedModulePrefixes as MutableSet).add(prefix)
7777
}
7878

79-
fun registerLanguage(language: ILanguage) {
80-
(registeredLanguages as MutableSet).add(language)
81-
}
79+
@Deprecated("Registering languages is not necessary. This call can be safely removed.", ReplaceWith(""))
80+
@DeprecationInfo(since = "2024-01-08")
81+
fun registerLanguage(language: ILanguage) {}
8282

8383
fun enableContinueOnError(state: Boolean) {
8484
continueOnError = state

bulk-model-sync-gradle/src/main/kotlin/org/modelix/model/sync/bulk/gradle/tasks/ImportIntoModelServer.kt

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,6 @@ import org.gradle.api.tasks.PathSensitive
2828
import org.gradle.api.tasks.PathSensitivity
2929
import org.gradle.api.tasks.TaskAction
3030
import org.modelix.model.ModelFacade
31-
import org.modelix.model.api.ILanguage
32-
import org.modelix.model.api.ILanguageRepository
3331
import org.modelix.model.api.INode
3432
import org.modelix.model.api.PNodeAdapter
3533
import org.modelix.model.client2.ModelClientV2
@@ -57,9 +55,6 @@ abstract class ImportIntoModelServer @Inject constructor(of: ObjectFactory) : De
5755
@Input
5856
val url: Property<String> = of.property(String::class.java)
5957

60-
@Input
61-
val registeredLanguages: SetProperty<ILanguage> = of.setProperty(ILanguage::class.java)
62-
6358
@Input
6459
val includedModules: SetProperty<String> = of.setProperty(String::class.java)
6560

@@ -74,10 +69,6 @@ abstract class ImportIntoModelServer @Inject constructor(of: ObjectFactory) : De
7469

7570
@TaskAction
7671
fun import() {
77-
registeredLanguages.get().forEach {
78-
ILanguageRepository.default.registerLanguage(it)
79-
}
80-
8172
val inputDir = inputDir.get().asFile
8273
val repoId = RepositoryId(repositoryId.get())
8374

docs/global/modules/core/pages/reference/component-bulk-model-sync-gradle.adoc

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -63,10 +63,6 @@ This means that only a minimal amount of write operations is used to update the
6363
|Action<LocalTarget>
6464
|Defines a local target (MPS).
6565

66-
|`registerLanguage`
67-
|ILanguage
68-
|Registers the given language and all of its concepts for the synchronisation process.
69-
7066
|`includeModule`
7167
|String
7268
|Includes the module specified by the given fully qualified name in the synchronisation process.

0 commit comments

Comments
 (0)