Merge pull request #20 from tyro/Check_On_2021.2

Tested on 2021.2. Fix incorrect logger name.
tyro · Aug 18, 2021 · c5cf571 · c5cf571
2 parents fdaaf1c + 16b68ac
commit c5cf571
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 8 deletions.
diff --git a/build.gradle b/build.gradle
@@ -29,11 +29,14 @@ compileTestKotlin {
 }
 
 intellij {
-    version '2021.1.3'
+    version '2021.2'
 }
 
 patchPluginXml {
-    changeNotes """21/07/2021<br>
+    changeNotes """17/08/2021<br>
+Tested on 2021.2<br>
+<br>
+21/07/2021<br>
 Add Websocket server support<br>
 <br>
 02/07/2021<br>

diff --git a/deploy.sh b/deploy.sh
@@ -2,10 +2,12 @@
 
 # Token lives in prd vault, "token Pairing Tool Upload"
 TOKEN="secret"
-VERSION="3.1.$(date +"%s")"
+VERSION="4.0.$(date +"%s")"
 # Blank channel is the main release channel
 CHANNEL=
 
+echo "Publishing $VERSION"
+
 ./gradlew \
   clean \
   licenseFormat \
@@ -16,5 +18,5 @@ CHANNEL=
     -Ptoken=$TOKEN \
     -Pchannels=$CHANNEL
 
-gh release create ${VERSION} build/distributions/* \
-  -t ${VERSION}
+#gh release create ${VERSION} build/distributions/* \
+#  -t ${VERSION}
diff --git a/src/main/kotlin/com/tyro/oss/pairing/server/WebSocketServer.kt b/src/main/kotlin/com/tyro/oss/pairing/server/WebSocketServer.kt
@@ -37,7 +37,7 @@ class WebSocketServer(
     private val blockingQueue: BlockingQueue<String> = LinkedBlockingQueue()
 
     companion object {
-        private val LOG = Logger.getInstance(KafkaClient::class.java)
+        private val LOG = Logger.getInstance(WebSocketServer::class.java)
     }
 
     init {

diff --git a/src/main/kotlin/com/tyro/oss/pairing/toolwindow/ToggleKafkaConnectionButton.kt b/src/main/kotlin/com/tyro/oss/pairing/toolwindow/ToggleKafkaConnectionButton.kt
@@ -37,11 +37,11 @@ class ToggleKafkaConnectionButton : AnActionButton(START_TEXT, START_ICON) {
     override fun actionPerformed(e: AnActionEvent) {
         val app = ApplicationManager.getApplication().getComponent(PairingToolInitializer::class.java)
         if(app?.isPairing() == true) {
-            ActionManager.getInstance().getActionOrStub(
+            ActionManager.getInstance().getAction(
                 StopPairing.STOP_PAIRING_ID
             )?.actionPerformed(e)
         } else {
-            ActionManager.getInstance().getActionOrStub(
+            ActionManager.getInstance().getAction(
                 StartPairing.START_PARING_ID
             )?.actionPerformed(e)
         }