Merge pull request #184 from modelix/modelix.core-11.1.3

build(deps): migration to modelix.core 11.1.3

Author: slisson

build.gradle.kts

@@ -52,7 +52,7 @@ subprojects {
     version = rootProject.version
     group = rootProject.group
 
-    val kotlinApiVersion = org.jetbrains.kotlin.gradle.dsl.KotlinVersion.KOTLIN_1_4
+    val kotlinApiVersion = org.jetbrains.kotlin.gradle.dsl.KotlinVersion.KOTLIN_1_6
     subproject.tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile>().configureEach {
         kotlinOptions {
             jvmTarget = "11"

gradle/libs.versions.toml

@@ -5,14 +5,13 @@ modelix-model-api-gen = { id = "org.modelix.model-api-gen", version.ref = "model
 npm-publish = { id = "dev.petuska.npm.publish", version = "3.4.3" }
 
 [versions]
-modelixCore = "9.1.0"
+modelixCore = "11.1.3"
 kotlinCoroutines="1.10.1"
-ktor="3.0.1"
+ktor="3.0.3"
 
 [libraries]
 modelix-model-api = { group = "org.modelix", name = "model-api", version.ref = "modelixCore" }
 modelix-model-api-gen-runtime = { group = "org.modelix", name = "model-api-gen-runtime", version.ref = "modelixCore" }
-modelix-light-model-client = { group = "org.modelix", name = "light-model-client", version.ref = "modelixCore" }
 modelix-authorization = { group = "org.modelix", name = "authorization", version.ref = "modelixCore" }
 modelix-model-client = { group = "org.modelix", name = "model-client", version.ref = "modelixCore" }
 modelix-model-server = { group = "org.modelix", name = "model-server", version.ref = "modelixCore" }

mps-diff-plugin/build.gradle.kts

@@ -46,7 +46,7 @@ kotlin {
     sourceSets {
         main {
             languageSettings {
-                apiVersion = KotlinVersion.KOTLIN_1_4.version
+                apiVersion = KotlinVersion.KOTLIN_1_6.version
             }
         }
     }

mps-generator-execution-plugin/build.gradle.kts

@@ -45,7 +45,7 @@ kotlin {
     sourceSets {
         main {
             languageSettings {
-                apiVersion = KotlinVersion.KOTLIN_1_4.version
+                apiVersion = KotlinVersion.KOTLIN_1_6.version
             }
         }
     }

mps-legacy-sync-plugin/src/test/kotlin/SyncPluginTestBase.kt

@@ -41,8 +41,7 @@ import org.jetbrains.mps.openapi.language.SConcept
 import org.jetbrains.mps.openapi.model.SModel
 import org.jetbrains.mps.openapi.model.SNode
 import org.jetbrains.mps.openapi.module.SModule
-import org.modelix.authorization.installAuthentication
-import org.modelix.model.InMemoryModels
+import org.modelix.authorization.ModelixAuthorization
 import org.modelix.model.api.BuiltinLanguages
 import org.modelix.model.client2.IModelClientV2
 import org.modelix.model.client2.ModelClientV2
@@ -53,13 +52,13 @@ import org.modelix.model.lazy.RepositoryId
 import org.modelix.model.mpsadapters.mps.ProjectAsNode
 import org.modelix.model.mpsadapters.mps.SModuleAsNode
 import org.modelix.model.server.Main.installStatusPages
+import org.modelix.model.server.ModelServerPermissionSchema
 import org.modelix.model.server.handlers.IdsApiImpl
 import org.modelix.model.server.handlers.KeyValueLikeModelServer
 import org.modelix.model.server.handlers.ModelReplicationServer
 import org.modelix.model.server.handlers.RepositoriesManager
 import org.modelix.model.server.store.InMemoryStoreClient
-import org.modelix.model.server.store.LocalModelClient
-import org.modelix.model.server.store.forContextRepository
+import org.modelix.model.server.store.RequiresTransaction
 import org.modelix.model.server.store.forGlobalRepository
 import org.modelix.mps.sync.ModelSyncService
 import org.modelix.mps.sync.api.IBinding
@@ -74,7 +73,7 @@ abstract class SyncPluginTestBase(private val testDataName: String?) : HeavyPlat
     companion object {
         suspend fun delayUntil(
             checkIntervalMilliseconds: Long = 1000,
-            timeoutMilliseconds: Long = 30_000,
+            timeoutMilliseconds: Long = 60_000,
             exceptionMessage: String? = "Waited too long.",
             condition: suspend () -> Boolean,
         ) {
@@ -143,22 +142,28 @@ abstract class SyncPluginTestBase(private val testDataName: String?) : HeavyPlat
 
     protected fun runTestWithModelServer(block: suspend ApplicationTestBuilder.() -> Unit) = testApplication {
         application {
-            installAuthentication(unitTestMode = true)
+            install(ModelixAuthorization) {
+                configureForUnitTests()
+                permissionSchema = ModelServerPermissionSchema.SCHEMA
+            }
             install(ContentNegotiation) {
                 json()
             }
             install(io.ktor.server.websocket.WebSockets)
             install(io.ktor.server.resources.Resources)
             install(io.ktor.server.routing.IgnoreTrailingSlash)
             installStatusPages()
-            val inMemoryModels = InMemoryModels()
             val storeClient = InMemoryStoreClient()
-            val localModelClient = LocalModelClient(storeClient.forContextRepository())
-            storeClient.forGlobalRepository().put("server-id", "sync-plugin-test")
-            val repositoriesManager = RepositoriesManager(localModelClient)
-            KeyValueLikeModelServer(repositoriesManager, storeClient.forGlobalRepository(), inMemoryModels).init(this)
-            ModelReplicationServer(repositoriesManager, localModelClient, inMemoryModels).init(this)
-            IdsApiImpl(repositoriesManager, localModelClient).init(this)
+
+            @OptIn(RequiresTransaction::class)
+            storeClient.runWrite {
+                storeClient.forGlobalRepository().put("server-id", "sync-plugin-test", true)
+            }
+
+            val repositoriesManager = RepositoriesManager(storeClient)
+            KeyValueLikeModelServer(repositoriesManager).init(this)
+            ModelReplicationServer(repositoriesManager).init(this)
+            IdsApiImpl(repositoriesManager).init(this)
         }
         httpClient = client
         postModelServerSetup()