Skip to content

Commit

Permalink
#20 Plugin is not compatible with intellij 2020.1
Browse files Browse the repository at this point in the history
  • Loading branch information
denis_kusakin@epam.com committed Apr 11, 2020
1 parent 3fa8636 commit ddb90ec
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
6 changes: 3 additions & 3 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@ buildscript {
}

plugins {
id 'org.jetbrains.intellij' version '0.3.4'
id 'org.jetbrains.intellij' version '0.4.18'
}

group 'org.deniskusakin.aem'
version '0.2.3'
version '0.2.4'

apply plugin: 'kotlin'

Expand All @@ -36,7 +36,7 @@ compileTestKotlin {
kotlinOptions.jvmTarget = "1.8"
}
intellij {
version '2019.3.1'
version '2020.1'
}
patchPluginXml {
changeNotes """
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -86,13 +86,13 @@ class AEMGroovyConsole(val project: Project, val descriptor: RunContentDescripto
val ui = descriptor.component
ui.add(consoleViewComponent, BorderLayout.CENTER)
ui.add(toolbar.component, BorderLayout.WEST)
ExecutionManager.getInstance(project).contentManager.showRunContent(defaultExecutor, descriptor)
ExecutionManager.getInstance(project).getContentManager().showRunContent(defaultExecutor, descriptor)
return console
}

private fun VirtualFile.getConsole(serverName: String): AEMGroovyConsole? {
val console = getUserData(GROOVY_CONSOLE)?.get(serverName) ?: return null
if (ExecutionManager.getInstance(console.project).contentManager.allDescriptors.contains(console.descriptor)) {
if (ExecutionManager.getInstance(console.project).getContentManager().allDescriptors.contains(console.descriptor)) {
return console
}
//TODO: In default Groovy Console implementation this somehow works without such hack
Expand All @@ -119,7 +119,7 @@ class AEMGroovyConsole(val project: Project, val descriptor: RunContentDescripto
val serverHost = currentServerInfo.url
view.clear()
view.print("\nRunning script on $serverName\n\n", ConsoleViewContentType.LOG_WARNING_OUTPUT)
ExecutionManager.getInstance(project).contentManager.toFrontRunContent(defaultExecutor, descriptor)
ExecutionManager.getInstance(project).getContentManager().toFrontRunContent(defaultExecutor, descriptor)

Fuel.post("$serverHost/bin/groovyconsole/post.json", listOf(Pair("script", scriptContent)))
.timeout(NETWORK_TIMEOUT)
Expand Down

0 comments on commit ddb90ec

Please sign in to comment.