Update Fleet dependency to 1.29

Undin · Undin · commit e0eb71cfb35b · 2023-11-30T21:28:32.000+01:00
It required updating fleet gradle plugin and kotlin plugin as well
diff --git a/fleet-plugin/build.gradle.kts b/fleet-plugin/build.gradle.kts
@@ -2,7 +2,7 @@ import org.jetbrains.fleet.dsl.FleetKotlinDependencyHandler
 
 plugins {
   idea
-  id("org.jetbrains.fleet-plugin") version "0.2.99"
+  id("org.jetbrains.fleet-plugin") version "0.3.121"
 }
 
 idea {
diff --git a/fleet-plugin/src/commonImpl/java/module-info.java b/fleet-plugin/src/commonImpl/java/module-info.java
@@ -1,11 +1,12 @@
 module com.jetbrains.edu.fleet.common {
   requires kotlin.stdlib;
   requires kotlinx.coroutines.core;
-  requires fleet.rhizomedb;
   requires fleet.common;
+  requires fleet.kernel.plugins;
+  requires fleet.rhizomedb;
+  requires fleet.util.network;
 
   requires com.jetbrains.edu.format;
-  requires fleet.util.network;
   requires retrofit2;
   requires com.fasterxml.jackson.databind;
   requires okhttp3;
diff --git a/fleet-plugin/src/frontendImpl/kotlin/com/jetbrains/edu/fleet/frontend/EduFrontendPlugin.kt b/fleet-plugin/src/frontendImpl/kotlin/com/jetbrains/edu/fleet/frontend/EduFrontendPlugin.kt
@@ -24,6 +24,7 @@ import fleet.kernel.*
 import fleet.kernel.plugins.ContributionScope
 import fleet.kernel.plugins.Plugin
 import fleet.kernel.plugins.PluginScope
+import fleet.kernel.plugins.worker
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.supervisorScope
 import noria.NoriaContext
@@ -37,8 +38,8 @@ class EduFrontendPlugin : Plugin<Unit> {
 
   override fun ContributionScope.load(pluginScope: PluginScope) {
     actions(
-      createImportCourseAction(),
-      createImportMarketplaceCourseAction(),
+      createImportCourseAction(pluginScope),
+      createImportMarketplaceCourseAction(pluginScope),
       courseViewAction
     )
     entityRenderer(CourseIdDialogEntity::class, NoriaContext::courseIdDialog)
@@ -56,21 +57,21 @@ class EduFrontendPlugin : Plugin<Unit> {
 //          launchOnEachEntity<FrontendEntity> {
 //            val shipParams = it.shipParams as? OpenLocalWorkspace ?: return@launchOnEachEntity
 //            val courseId = shipParams.extra["courseId"] ?: return@launchOnEachEntity
-//            createCourse(courseId, kernel)
+//            createCourse(courseId, pluginScope)
 //          }
 //        }
 //      }
 //    }
   }
 }
 
-private suspend fun createCourse(id: String?, kernel: Kernel) {
+private suspend fun createCourse(id: String?, pluginScope: PluginScope) {
   val courseId = id?.toInt() ?: return
   MarketplaceConnector.loadCourse(courseId) { course ->
-    kernel.saga {
+    pluginScope.saga {
       val window = lastFocusedEntity(WindowEntity::class) ?: return@saga
       showSelectFolderDialog(window) { item, showValidationError ->
-        kernel.saga {
+        pluginScope.saga {
           val fileAddress = item.child(course.name)
           val success = CourseProjectGenerator().createCourse(fileAddress, course)
           if (success) {
diff --git a/fleet-plugin/src/frontendImpl/kotlin/com/jetbrains/edu/fleet/frontend/actions/EduImportCourseAction.kt b/fleet-plugin/src/frontendImpl/kotlin/com/jetbrains/edu/fleet/frontend/actions/EduImportCourseAction.kt
@@ -1,15 +1,14 @@
 package com.jetbrains.edu.fleet.frontend.actions
 
-import fleet.api.child
 import com.jetbrains.edu.fleet.common.CourseEntity
 import com.jetbrains.edu.fleet.common.generation.CourseProjectGenerator
 import com.jetbrains.edu.fleet.common.marketplace.MarketplaceConnector
 import com.jetbrains.edu.fleet.common.yaml.YamlFormatSynchronizer
 import com.jetbrains.edu.fleet.frontend.EduTriggers
 import com.jetbrains.edu.fleet.frontend.ui.newCourseTreeView
 import com.jetbrains.edu.fleet.frontend.ui.showCourseIdDialog
+import fleet.api.child
 import fleet.frontend.actions.FleetDataKeys
-import fleet.frontend.actions.kernel
 import fleet.frontend.actions.sagaAction
 import fleet.frontend.actions.windowEntity
 import fleet.frontend.fsd.showSelectFolderDialog
@@ -18,37 +17,36 @@ import fleet.frontend.layout.ShowOpts
 import fleet.frontend.layout.WindowEntity
 import fleet.frontend.layout.openTool
 import fleet.frontend.navigation.attachToWorkspace
-import fleet.kernel.Kernel
 import fleet.kernel.change
+import fleet.kernel.plugins.PluginScope
 import fleet.kernel.saga
 import noria.model.Action
 import noria.model.ActionPresentation
 
-internal fun createImportMarketplaceCourseAction(): Action {
+internal fun createImportMarketplaceCourseAction(pluginScope: PluginScope): Action {
   return Action(
     perform = sagaAction { actionContext ->
       val window = actionContext.windowEntity
-      val kernel = actionContext.kernel
-      kernel.changeAsync {
+      pluginScope.changeAsync {
         showCourseIdDialog(window) {
-          kernel.saga {
-            createCourse(it, window, kernel)
+          pluginScope.saga {
+            createCourse(it, window, pluginScope)
           }
         }
       }
     },
     identifier = "import-marketplace-course",
-    requirements = setOf(FleetDataKeys.Kernel, FleetDataKeys.Window),
+    requirements = setOf(FleetDataKeys.Window),
     triggers = setOf(EduTriggers.ImportMarketplace),
     defaultPresentation = ActionPresentation("Import Marketplace Course"))
 }
 
-private suspend fun createCourse(id: String?, window: WindowEntity, kernel: Kernel) {
+private suspend fun createCourse(id: String?, window: WindowEntity, pluginScope: PluginScope) {
   val courseId = id?.toInt() ?: return
   MarketplaceConnector.loadCourse(courseId) { course ->
-    kernel.saga {
+    pluginScope.saga {
       showSelectFolderDialog(window) { item, showValidationError ->
-        kernel.saga {
+        pluginScope.saga {
           val fileAddress = item.child(course.name)
           val success = CourseProjectGenerator().createCourse(fileAddress, course)
           if (success) {
diff --git a/fleet-plugin/src/frontendImpl/kotlin/com/jetbrains/edu/fleet/frontend/actions/EduImportLocalCourseAction.kt b/fleet-plugin/src/frontendImpl/kotlin/com/jetbrains/edu/fleet/frontend/actions/EduImportLocalCourseAction.kt
@@ -18,7 +18,7 @@ import fleet.frontend.layout.ShowOpts
 import fleet.frontend.layout.openTool
 import fleet.frontend.navigation.attachToWorkspace
 import fleet.kernel.change
-import fleet.kernel.kernel
+import fleet.kernel.plugins.PluginScope
 import fleet.kernel.saga
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
@@ -28,11 +28,10 @@ import java.io.File
 import java.nio.charset.StandardCharsets
 import java.util.zip.ZipFile
 
-internal fun createImportCourseAction(): Action {
+internal fun createImportCourseAction(pluginScope: PluginScope): Action {
   return Action(
     perform = sagaAction { actionContext ->
       val window = actionContext.windowEntity
-      val kernel = kernel()
 
       showOpenDialog(window) { item ->
         withContext(Dispatchers.IO) {
@@ -43,7 +42,7 @@ internal fun createImportCourseAction(): Action {
           val course = readCourseJson(reader) ?: return@showOpenDialog ConfirmDialogCommand.CLOSE
 
           showSelectFolderDialog(window) { item, showValidationError ->
-            kernel.saga {
+            pluginScope.saga {
               val fileAddress = item.child(course.name)
               val success = CourseProjectGenerator().createCourse(fileAddress, course)
               if (success) {
@@ -64,7 +63,7 @@ internal fun createImportCourseAction(): Action {
       }
     },
     identifier = "import-local-course",
-    requirements = setOf(FleetDataKeys.Kernel, FleetDataKeys.Window),
+    requirements = setOf(FleetDataKeys.Window),
     triggers = setOf(EduTriggers.Import),
     defaultPresentation = ActionPresentation("Import Course"))
 }
diff --git a/fleet-plugin/src/frontendImpl/kotlin/com/jetbrains/edu/fleet/frontend/ui/CourseIdDialogEntity.kt b/fleet-plugin/src/frontendImpl/kotlin/com/jetbrains/edu/fleet/frontend/ui/CourseIdDialogEntity.kt
@@ -1,7 +1,7 @@
 package com.jetbrains.edu.fleet.frontend.ui
 
+import fleet.frontend.PluginScopeKey
 import fleet.frontend.layout.*
-import fleet.frontend.ui.db.KernelKey
 import fleet.kernel.ChangeScope
 import fleet.util.plus
 import noria.NoriaContext
@@ -29,13 +29,13 @@ fun ChangeScope.showCourseIdDialog(window: WindowEntity, onConfirm: (String?) ->
 }
 
 fun NoriaContext.courseIdDialog(courseDialog: CourseIdDialogEntity) {
+  val pluginScope = PluginScopeKey.value
   dialog {
-    val kernel = requireNotNull(bindings[KernelKey])
     hbox(align = Align.Center) {
       uiText("Enter course id: ")
       gap(width = 2)
       textInput("", onInput = { newValue ->
-        kernel.changeAsync {
+        pluginScope.changeAsync {
           courseDialog.id = newValue
         }
       })
diff --git a/fleet-plugin/src/frontendImpl/kotlin/com/jetbrains/edu/fleet/frontend/ui/CourseViewEntity.kt b/fleet-plugin/src/frontendImpl/kotlin/com/jetbrains/edu/fleet/frontend/ui/CourseViewEntity.kt
@@ -60,6 +60,6 @@ val courseViewAction = Action(
     }
   },
   identifier = "open-course-tree",
-  requirements = setOf(FleetDataKeys.Kernel, FleetDataKeys.Window),
+  requirements = setOf(FleetDataKeys.Window),
   triggers = setOf(EduTriggers.CourseView)
 )
diff --git a/gradle.properties b/gradle.properties
@@ -40,9 +40,9 @@ eduFormatSourcesArtifactPath=build/distributions/edu-format-sources.jar
 ## Fleet properties
 fleetIntegration=false
 
-fleetRuntimeVersion=1.27.47
-fleetRuntimeMinVersion=1.26.0
-fleetRuntimeMaxVersion=1.27.999
+fleetRuntimeVersion=1.29.14
+fleetRuntimeMinVersion=1.29.0
+fleetRuntimeMaxVersion=1.29.999
 
 # See `Setup` section in `fleet-plugin/README.md`
 spaceUsername=
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,5 +1,5 @@
 [versions]
-kotlin = "1.9.0"
+kotlin = "1.9.21"
 jackson = "2.14.3"
 okhttp = "4.10.0"
 retrofit = "2.9.0"

Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@ import org.jetbrains.fleet.dsl.FleetKotlinDependencyHandler`
`2`	`2`
`3`	`3`	`plugins {`
`4`	`4`	`idea`
`5`		`- id("org.jetbrains.fleet-plugin") version "0.2.99"`
	`5`	`+ id("org.jetbrains.fleet-plugin") version "0.3.121"`
`6`	`6`	`}`
`7`	`7`
`8`	`8`	`idea {`
Original file line number	Diff line number	Diff line change
`@@ -60,6 +60,6 @@ val courseViewAction = Action(`
`60`	`60`	`}`
`61`	`61`	`},`
`62`	`62`	`identifier = "open-course-tree",`
`63`		`- requirements = setOf(FleetDataKeys.Kernel, FleetDataKeys.Window),`
	`63`	`+ requirements = setOf(FleetDataKeys.Window),`
`64`	`64`	`triggers = setOf(EduTriggers.CourseView)`
`65`	`65`	`)`