Update sample plugin for toolbox 2.6.0 + clean up useless libs

vladertel · vladertel · commit 2f0a4c5b9213 · 2024-11-29T11:26:33.000+01:00
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -37,7 +37,6 @@ jvmWrapper {
 
 dependencies {
     compileOnly(libs.bundles.toolbox.plugin.api)
-    implementation(libs.slf4j)
     implementation(libs.bundles.serialization)
     implementation(libs.coroutines.core)
 }
@@ -53,7 +52,7 @@ tasks.compileKotlin {
     compilerOptions.jvmTarget.set(JvmTarget.JVM_21)
 }
 
-val pluginId = "dev.kropp.toolbox.sample"
+val pluginId = "com.jetbrains.toolbox.sample"
 val pluginVersion = "0.0.1"
 
 val assemblePlugin by tasks.registering(Jar::class) {
@@ -118,6 +117,6 @@ val uploadPlugin by tasks.creating {
         // instance.uploader.uploadNewPlugin(pluginZip.outputs.files.singleFile, listOf("toolbox", "gateway"), LicenseUrl.APACHE_2_0, ProductFamily.TOOLBOX)
 
         // subsequent updates
-        instance.uploader.upload("dev.kropp.toolbox.sample", pluginZip.outputs.files.singleFile)
+        instance.uploader.upload(pluginId, pluginZip.outputs.files.singleFile)
     }
 }
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -3,23 +3,18 @@ toolbox-plugin-api = "0.2"
 kotlin = "2.0.10"
 coroutines = "1.7.3"
 serialization = "1.5.0"
-okhttp = "4.10.0"
-slf4j = "2.0.3"
 dependency-license-report = "2.5"
 marketplace-client = "2.0.38"
 gradle-wrapper = "0.14.0"
 
 
 [libraries]
-kotlin-stdlib = { module = "com.jetbrains.kotlin:kotlin-stdlib", version.ref = "kotlin" }
 toolbox-core-api = { module = "com.jetbrains.toolbox:core-api", version.ref = "toolbox-plugin-api" }
 toolbox-ui-api = { module = "com.jetbrains.toolbox:ui-api", version.ref = "toolbox-plugin-api" }
 toolbox-remote-dev-api = { module = "com.jetbrains.toolbox:remote-dev-api", version.ref = "toolbox-plugin-api" }
 coroutines-core = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version.ref = "coroutines" }
 serialization-core = { module = "org.jetbrains.kotlinx:kotlinx-serialization-core", version.ref = "serialization" }
 serialization-json = { module = "org.jetbrains.kotlinx:kotlinx-serialization-json", version.ref = "serialization" }
-okhttp = { module = "com.squareup.okhttp3:okhttp", version.ref = "okhttp" }
-slf4j = { module = "org.slf4j:slf4j-api", version.ref = "slf4j" }
 
 marketplace-client = { module = "org.jetbrains.intellij:plugin-repository-rest-client", version.ref = "marketplace-client" }
 
diff --git a/src/main/kotlin/SampleRemoteProvider.kt b/src/main/kotlin/SampleRemoteProvider.kt
@@ -1,6 +1,7 @@
 package toolbox.gateway.sample
 
 import com.jetbrains.toolbox.api.core.ServiceLocator
+import com.jetbrains.toolbox.api.core.diagnostics.Logger
 import com.jetbrains.toolbox.api.core.ui.icons.SvgIcon
 import com.jetbrains.toolbox.api.remoteDev.ProviderVisibilityState
 import com.jetbrains.toolbox.api.remoteDev.RemoteEnvironmentConsumer
@@ -11,7 +12,6 @@ import kotlinx.serialization.json.Json
 //import okhttp3.OkHttpClient
 //import okhttp3.Request
 import org.intellij.lang.annotations.Language
-import org.slf4j.LoggerFactory
 import java.net.URI
 import kotlin.time.Duration.Companion.seconds
 
@@ -21,7 +21,7 @@ class SampleRemoteProvider(
     coroutineScope: CoroutineScope,
     serviceLocator: ServiceLocator,
 ) : RemoteProvider {
-    private val logger = LoggerFactory.getLogger(javaClass)
+    private val logger = serviceLocator.getService(Logger::class.java)
 
     init {
         coroutineScope.launch {
@@ -78,6 +78,6 @@ class SampleRemoteProvider(
     override fun removeEnvironmentsListener(listener: RemoteEnvironmentConsumer) {}
 
     override fun handleUri(uri: URI) {
-        logger.debug("External request: {}", uri)
+        logger.debug { "External request: $uri" }
     }
 }
diff --git a/src/main/resources/extension.json b/src/main/resources/extension.json
@@ -1,15 +1,15 @@
 {
-  "id": "dev.kropp.toolbox.sample",
+  "id": "com.jetbrains.toolbox.sample",
   "version": "0.0.1",
   "meta": {
     "readableName": "Sample plugin",
     "description": "This plugin is a sample of Remote Development integration into JetBrains Toolbox App",
     "vendor": "Toolbox + Gateway",
-    "url": "https://github.com/kropp/toolbox-gateway-sample"
+    "url": "https://github.com/vladertel/toolbox-remote-dev-sample"
   },
-  "apiVersion": "0.2",
+  "apiVersion": "0.3",
   "compatibleVersionRange": {
-    "from": "2.6.0",
-    "to": "2.6.0"
+    "from": "2.6.0.0",
+    "to": "2.6.0.99999"
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,6 @@ jvmWrapper {`
`37`	`37`
`38`	`38`	`dependencies {`
`39`	`39`	`compileOnly(libs.bundles.toolbox.plugin.api)`
`40`		`- implementation(libs.slf4j)`
`41`	`40`	`implementation(libs.bundles.serialization)`
`42`	`41`	`implementation(libs.coroutines.core)`
`43`	`42`	`}`
`@@ -53,7 +52,7 @@ tasks.compileKotlin {`
`53`	`52`	`compilerOptions.jvmTarget.set(JvmTarget.JVM_21)`
`54`	`53`	`}`
`55`	`54`
`56`		`-val pluginId = "dev.kropp.toolbox.sample"`
	`55`	`+val pluginId = "com.jetbrains.toolbox.sample"`
`57`	`56`	`val pluginVersion = "0.0.1"`
`58`	`57`
`59`	`58`	`val assemblePlugin by tasks.registering(Jar::class) {`
`@@ -118,6 +117,6 @@ val uploadPlugin by tasks.creating {`
`118`	`117`	`// instance.uploader.uploadNewPlugin(pluginZip.outputs.files.singleFile, listOf("toolbox", "gateway"), LicenseUrl.APACHE_2_0, ProductFamily.TOOLBOX)`
`119`	`118`
`120`	`119`	`// subsequent updates`
`121`		`- instance.uploader.upload("dev.kropp.toolbox.sample", pluginZip.outputs.files.singleFile)`
	`120`	`+ instance.uploader.upload(pluginId, pluginZip.outputs.files.singleFile)`
`122`	`121`	`}`
`123`	`122`	`}`