Skip to content

Commit e9f14d0

Browse files
committed
build: fix gradle plugin tests
1 parent 2713fbc commit e9f14d0

File tree

3 files changed

+7
-7
lines changed

3 files changed

+7
-7
lines changed

model-api-gen-gradle/src/functionalTest/kotlin/org/modelix/metamodel/gradle/MetaModelGradlePluginFunctionalTest.kt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import org.junit.rules.TemporaryFolder
1212
import org.modelix.model.data.LanguageData
1313

1414
/**
15-
* A simple functional test for the 'org.modelix.metamodel.gradle.greeting' plugin.
15+
* A simple functional test for the 'org.modelix.model-api-gen' plugin.
1616
*/
1717
class MetaModelGradlePluginFunctionalTest {
1818
@get:Rule
@@ -30,7 +30,7 @@ class MetaModelGradlePluginFunctionalTest {
3030
getSettingsFile().writeText("")
3131
getBuildFile().writeText("""
3232
plugins {
33-
id('org.modelix.metamodel.gradle')
33+
id('org.modelix.model-api-gen')
3434
}
3535
3636
repositories {
@@ -43,7 +43,7 @@ metamodel {
4343
mpsHome = file("${File("build/mps").absolutePath}")
4444
mpsHeapSize = "2g"
4545
kotlinDir = file("" + buildDir + "/kotlin_gen")
46-
registrationHelperName = "org.modelix.metamodel.gradle.functionalTest.Languages"
46+
registrationHelperName = "org.modelix.model-api-gen-gradle.functionalTest.Languages"
4747
typescriptDir = file("" + buildDir + "/ts_gen")
4848
includeNamespace("jetbrains.mps.baseLanguage")
4949
exportModules("jetbrains.mps.runtime")
@@ -86,7 +86,7 @@ metamodel {
8686
getSettingsFile().writeText("")
8787
getBuildFile().writeText("""
8888
plugins {
89-
id('org.modelix.metamodel.gradle')
89+
id('org.modelix.model-api-gen')
9090
}
9191
9292
repositories {
@@ -97,7 +97,7 @@ repositories {
9797
9898
metamodel {
9999
kotlinDir = file("" + buildDir + "/kotlin_gen")
100-
registrationHelperName = "org.modelix.metamodel.gradle.functionalTest.Languages"
100+
registrationHelperName = "org.modelix.model-api-gen-gradle.functionalTest.Languages"
101101
typescriptDir = file("" + buildDir + "/ts_gen")
102102
includeNamespace("jetbrains.mps.baseLanguage")
103103
jsonDir = file("$jsonPath")

model-api-gen-gradle/src/main/kotlin/org/modelix/metamodel/gradle/MetaModelGradlePlugin.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ class MetaModelGradlePlugin: Plugin<Project> {
2121
val exporterDependencies = project.configurations.create("metamodel-mps-dependencies")
2222
val exporterDir = getBuildOutputDir().resolve("mpsExporter")
2323
val modelixCoreVersion = readModelixCoreVersion() ?: throw RuntimeException("modelix.core version not found")
24-
project.dependencies.add(exporterDependencies.name, "org.modelix:metamodel-export-mps:$modelixCoreVersion")
24+
project.dependencies.add(exporterDependencies.name, "org.modelix.mps:metamodel-export:$modelixCoreVersion")
2525
val downloadExporterDependencies = project.tasks.register("downloadMetaModelExporter", Sync::class.java) { task ->
2626
task.enabled = settings.jsonDir == null
2727
task.from(exporterDependencies.resolve().map { project.zipTree(it) })

model-api-gen-gradle/src/test/kotlin/org/modelix/metamodel/gradle/MetaModelGradlePluginTest.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ class MetaModelGradlePluginTest {
1414
@Test fun `plugin registers task`() {
1515
// Create a test project and apply the plugin
1616
val project = ProjectBuilder.builder().build()
17-
project.plugins.apply("org.modelix.metamodel.gradle")
17+
project.plugins.apply("org.modelix.model-api-gen")
1818

1919
// Verify the result
2020
assertNotNull(project.tasks.findByName("generateMetaModelSources"))

0 commit comments

Comments
 (0)