backwards compatibility issues

(cherry picked from commit e9337ca)

Author: BFergerson

gradle.properties

@@ -24,4 +24,5 @@ kotlin.stdlib.default.dependency = true
 apolloVersion=3.0.0
 vertxVersion=4.2.4
 slf4jVersion=1.7.33
-jacksonVersion=2.12.5
+jacksonVersion=2.13.1
+joorVersion=0.9.13

marker/build.gradle.kts

@@ -7,6 +7,7 @@ val kotlinVersion = ext.get("kotlinVersion")
 val pluginGroup: String by project
 val projectVersion: String by project
 val slf4jVersion: String by project
+val joorVersion: String by project
 
 publishing {
     publications {
@@ -28,6 +29,7 @@ repositories {
 dependencies {
     val intellijVersion = "213.6777.52"
 
+    compileOnly("org.jooq:joor:$joorVersion")
     compileOnly("com.github.sourceplusplus.protocol:protocol:$projectVersion")
     compileOnly("org.jetbrains.kotlinx:kotlinx-coroutines-core:$kotlinVersion")
     compileOnly("org.jetbrains.kotlin:kotlin-stdlib-jdk8")

marker/src/main/kotlin/spp/jetbrains/marker/source/mark/api/component/jcef/SourceMarkJcefComponent.kt

@@ -25,6 +25,8 @@ import com.intellij.ui.jcef.JBCefClient
 import kotlinx.coroutines.GlobalScope
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
+import org.joor.Reflect
+import org.joor.ReflectException
 import spp.jetbrains.marker.source.mark.api.component.api.SourceMarkComponent
 import spp.jetbrains.marker.source.mark.api.component.jcef.config.SourceMarkJcefComponentConfiguration
 import java.awt.Dimension
@@ -68,9 +70,12 @@ class SourceMarkJcefComponent(
 
             //periodically update zoom level
             GlobalScope.launch {
-                while(browser != null) {
+                while (browser != null) {
                     delay(50)
-                    browser?.zoomLevel = configuration.zoomLevel
+                    try {
+                        browser?.let { Reflect.on(it).call("setZoomLevel", configuration.zoomLevel) }
+                    } catch (ignore: ReflectException) {
+                    }
                 }
             }
 

plugin/CHANGELOG.md

@@ -4,6 +4,7 @@
 
 ## [Unreleased]
 ### Added
+- Ability to configure plugin via `.spp/spp-plugin.yml` file
 
 ### Changed
 
@@ -12,6 +13,7 @@
 ### Removed
 
 ### Fixed
+- Backwards compatibility issues
 
 ### Security
 

plugin/build.gradle.kts

@@ -8,6 +8,7 @@ plugins {
     id("maven-publish")
 }
 
+val joorVersion: String by project
 val jacksonVersion: String by project
 val vertxVersion: String by project
 val kotlinVersion = ext.get("kotlinVersion")
@@ -66,6 +67,7 @@ dependencies {
         implementation("com.github.sourceplusplus.protocol:protocol:$projectVersion")
     }
 
+    implementation("org.jooq:joor:$joorVersion")
     implementation("com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:$jacksonVersion")
     implementation("org.apache.commons:commons-text:1.9")
     implementation("com.github.sh5i:git-stein:v0.5.0")
@@ -74,7 +76,6 @@ dependencies {
     implementation("io.vertx:vertx-lang-kotlin:$vertxVersion")
     implementation("io.vertx:vertx-lang-kotlin-coroutines:$vertxVersion")
     implementation("io.vertx:vertx-web:$vertxVersion")
-    //implementation("io.vertx:vertx-service-discovery:$vertxVersion")
     implementation(files(".ext/vertx-service-discovery-4.0.3-SNAPSHOT.jar"))
     implementation("io.vertx:vertx-service-proxy:$vertxVersion")
     implementation("io.vertx:vertx-tcp-eventbus-bridge:$vertxVersion")

plugin/src/main/kotlin/spp/jetbrains/sourcemarker/SourceMarkerPlugin.kt

@@ -168,7 +168,7 @@ object SourceMarkerPlugin {
         DatabindCodec.mapper().registerModule(GuavaModule())
         DatabindCodec.mapper().registerModule(Jdk8Module())
         DatabindCodec.mapper().registerModule(JavaTimeModule())
-        DatabindCodec.mapper().registerModule(KotlinModule())
+        DatabindCodec.mapper().registerModule(KotlinModule.Builder().build())
         DatabindCodec.mapper().enable(SerializationFeature.WRITE_ENUMS_USING_TO_STRING)
         DatabindCodec.mapper().enable(DeserializationFeature.READ_ENUMS_USING_TO_STRING)