Merge branch 'release/v1.0.2-223' into zowe-release/v1.0.2-223

Signed-off-by: Uladzislau <[email protected]>
zowe · May 18, 2023 · 78ba7aa · 78ba7aa
2 parents b08887e + 7b08251
commit 78ba7aa
Show file tree

Hide file tree

Showing 12 changed files with 9 additions and 37 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -31,7 +31,7 @@ apply(plugin = "org.jetbrains.intellij")
 apply(from = "gradle/sonar.gradle")
 
 group = "org.zowe"
-version = "1.0.2-221"
+version = "1.0.2-223"
 val remoteRobotVersion = "0.11.18"
 
 repositories {
@@ -53,8 +53,8 @@ repositories {
 }
 
 java {
-  sourceCompatibility = JavaVersion.VERSION_11
-  targetCompatibility = JavaVersion.VERSION_11
+  sourceCompatibility = JavaVersion.VERSION_17
+  targetCompatibility = JavaVersion.VERSION_17
 }
 
 dependencies {
@@ -80,23 +80,23 @@ dependencies {
 }
 
 intellij {
-  version.set("2022.1")
+  version.set("2022.3")
 }
 
 tasks {
   withType<KotlinCompile> {
     kotlinOptions {
-      jvmTarget = JavaVersion.VERSION_11.toString()
+      jvmTarget = JavaVersion.VERSION_17.toString()
       languageVersion = org.jetbrains.kotlin.config.LanguageVersion.LATEST_STABLE.versionString
     }
   }
 
   patchPluginXml {
-    sinceBuild.set("221.5080")
-    untilBuild.set("222.*")
+    sinceBuild.set("223.7571")
+    untilBuild.set("223.*")
     changeNotes.set(
       """
-      <b>WARNING: </b> version 1.0 introduces breaking change. You won't be able to use the plugin with IntelliJ version less than 2022.1
+      <b>WARNING: </b> version 1.0 introduces breaking change. You won't be able to use the plugin with IntelliJ version less than 2022.3
       <br>
       <br>
       <b>New features:</b>

diff --git a/src/main/kotlin/org/zowe/explorer/editor/MFPastePreprocessor.kt b/src/main/kotlin/org/zowe/explorer/editor/MFPastePreprocessor.kt
@@ -43,24 +43,6 @@ class MFPastePreprocessor : CopyPastePostProcessor<TextBlockTransferableData>()
       return DATA_FLAVOR
     }
 
-    // This function is not needed to be overridden since v1.0.2-223
-    @ApiStatus.ScheduledForRemoval(inVersion = "2.0.0")
-    override fun getOffsetCount(): Int {
-      return 0
-    }
-
-    // This function is not needed to be overridden since v1.0.2-223
-    @ApiStatus.ScheduledForRemoval(inVersion = "2.0.0")
-    override fun getOffsets(offsets: IntArray?, index: Int): Int {
-      return index
-    }
-
-    // This function is not needed to be overridden since v1.0.2-223
-    @ApiStatus.ScheduledForRemoval(inVersion = "2.0.0")
-    override fun setOffsets(offsets: IntArray?, index: Int): Int {
-      return index
-    }
-
     companion object {
       private val DATA_FLAVOR = DataFlavor(MFPastePreprocessor::class.java, "class: ChangeContentByPasteAction")
     }

diff --git a/src/main/kotlin/org/zowe/explorer/explorer/actions/AddMemberAction.kt b/src/main/kotlin/org/zowe/explorer/explorer/actions/AddMemberAction.kt
@@ -22,7 +22,6 @@ import org.zowe.explorer.dataops.getAttributesService
 import org.zowe.explorer.dataops.operations.*
 import org.zowe.explorer.explorer.FilesWorkingSet
 import org.zowe.explorer.explorer.ui.*
-import org.zowe.explorer.utils.service // TODO: remove in 1.0.2-223 and greater
 import org.zowe.explorer.vfs.MFVirtualFile
 
 /** Class that represents "Add member" action */

diff --git a/src/main/kotlin/org/zowe/explorer/explorer/actions/AllocateDatasetAction.kt b/src/main/kotlin/org/zowe/explorer/explorer/actions/AllocateDatasetAction.kt
@@ -32,7 +32,6 @@ import org.zowe.explorer.explorer.ui.*
 import org.zowe.explorer.utils.castOrNull
 import org.zowe.explorer.utils.clone
 import org.zowe.explorer.utils.crudable.getByUniqueKey
-import org.zowe.explorer.utils.service // TODO: remove in 1.0.2-223 and greater
 import org.zowe.kotlinsdk.*
 
 /**

diff --git a/src/main/kotlin/org/zowe/explorer/explorer/actions/ChangeContentModeAction.kt b/src/main/kotlin/org/zowe/explorer/explorer/actions/ChangeContentModeAction.kt
@@ -20,7 +20,6 @@ import org.zowe.explorer.dataops.attributes.*
 import org.zowe.explorer.explorer.ui.FILE_EXPLORER_VIEW
 import org.zowe.explorer.explorer.ui.FileExplorerView
 import org.zowe.explorer.utils.sendTopic
-import org.zowe.explorer.utils.service // TODO: remove in 1.0.2-223 and greater
 import org.zowe.explorer.vfs.MFVirtualFile
 import org.zowe.kotlinsdk.XIBMDataType
 

diff --git a/src/main/kotlin/org/zowe/explorer/explorer/actions/CreateUssEntityAction.kt b/src/main/kotlin/org/zowe/explorer/explorer/actions/CreateUssEntityAction.kt
@@ -29,7 +29,6 @@ import org.zowe.explorer.dataops.operations.UssChangeModeOperation
 import org.zowe.explorer.dataops.operations.UssChangeModeParams
 import org.zowe.explorer.explorer.ui.*
 import org.zowe.explorer.utils.castOrNull
-import org.zowe.explorer.utils.service // TODO: remove in 1.0.2-223 and greater
 import org.zowe.explorer.vfs.MFVirtualFile
 import org.zowe.kotlinsdk.ChangeMode
 import org.zowe.kotlinsdk.FileType

diff --git a/src/main/kotlin/org/zowe/explorer/explorer/actions/PurgeJobAction.kt b/src/main/kotlin/org/zowe/explorer/explorer/actions/PurgeJobAction.kt
@@ -15,7 +15,6 @@ import org.zowe.explorer.dataops.operations.jobs.PurgeJobOperation
 import org.zowe.explorer.explorer.ui.*
 import org.zowe.explorer.ui.build.jobs.JOBS_LOG_VIEW
 import org.zowe.explorer.ui.build.jobs.JobBuildTreeView
-import org.zowe.explorer.utils.service // TODO: remove in 1.0.2-223 and greater
 import org.zowe.kotlinsdk.ExecData
 import org.zowe.kotlinsdk.JESApi
 import org.zowe.kotlinsdk.Job

diff --git a/src/main/kotlin/org/zowe/explorer/explorer/actions/RenameAction.kt b/src/main/kotlin/org/zowe/explorer/explorer/actions/RenameAction.kt
@@ -29,7 +29,6 @@ import org.zowe.explorer.explorer.FilesWorkingSet
 import org.zowe.explorer.explorer.ui.*
 import org.zowe.explorer.utils.clone
 import org.zowe.explorer.utils.crudable.getByUniqueKey
-import org.zowe.explorer.utils.service // TODO: remove in 1.0.2-223 and greater
 
 /**
  * Class which represents a rename action

diff --git a/src/main/kotlin/org/zowe/explorer/explorer/ui/ExplorerTreeNode.kt b/src/main/kotlin/org/zowe/explorer/explorer/ui/ExplorerTreeNode.kt
@@ -31,7 +31,6 @@ import org.zowe.explorer.explorer.Explorer
 import org.zowe.explorer.explorer.UIComponentManager
 import org.zowe.explorer.utils.isBeingEditingNow
 import org.zowe.explorer.utils.runWriteActionInEdtAndWait
-import org.zowe.explorer.utils.service // TODO: remove in 1.0.2-223 and greater
 import org.zowe.explorer.vfs.MFVirtualFile
 import javax.swing.tree.TreePath
 

diff --git a/src/main/kotlin/org/zowe/explorer/explorer/ui/ExplorerWindowFactory.kt b/src/main/kotlin/org/zowe/explorer/explorer/ui/ExplorerWindowFactory.kt
@@ -26,8 +26,7 @@ class ExplorerWindowFactory : ToolWindowFactory, DumbAware {
   }
 
   override fun createToolWindowContent(project: Project, toolWindow: ToolWindow) {
-    // TODO: ContentFactory.SERVICE.getInstance() -> ContentFactory.getInstance() in new versions of the plugin
-    val contentFactory = ContentFactory.SERVICE.getInstance()
+    val contentFactory = ContentFactory.getInstance()
     UIComponentManager.INSTANCE.getExplorerContentProviders<Explorer<*>>().forEach {
       val content = contentFactory
         .createContent(it.buildExplorerContent(toolWindow.disposable, project), it.displayName, it.isLockable)

diff --git a/src/main/kotlin/org/zowe/explorer/explorer/ui/FileExplorerView.kt b/src/main/kotlin/org/zowe/explorer/explorer/ui/FileExplorerView.kt
@@ -37,7 +37,6 @@ import org.zowe.explorer.explorer.Explorer
 import org.zowe.explorer.explorer.FilesWorkingSet
 import org.zowe.explorer.utils.getMinimalCommonParents
 import org.zowe.explorer.utils.getParentsChain
-import org.zowe.explorer.utils.service // TODO: remove in 1.0.2-223 and greater
 import org.zowe.explorer.vfs.MFVirtualFile
 import java.awt.Toolkit
 import java.awt.datatransfer.DataFlavor

diff --git a/src/main/kotlin/org/zowe/explorer/explorer/ui/FileLikeDatasetNode.kt b/src/main/kotlin/org/zowe/explorer/explorer/ui/FileLikeDatasetNode.kt
@@ -24,7 +24,6 @@ import org.zowe.explorer.dataops.attributes.RemoteDatasetAttributes
 import org.zowe.explorer.dataops.attributes.RemoteMemberAttributes
 import org.zowe.explorer.dataops.getAttributesService
 import org.zowe.explorer.explorer.ExplorerUnit
-import org.zowe.explorer.utils.service // TODO: remove in 1.0.2-223 and greater
 import org.zowe.explorer.vfs.MFVirtualFile
 import icons.ForMainframeIcons