feat(intellij): upgrade platform version to 2022.3 / Java 17 (#4258)

felangel · Oct 2, 2024 · 2bd2b6b · 2bd2b6b
1 parent 5a80a9a
commit 2bd2b6b
Show file tree

Hide file tree

Showing 8 changed files with 19 additions and 12 deletions.
diff --git a/extensions/intellij/intellij_generator_plugin/.gitignore b/extensions/intellij/intellij_generator_plugin/.gitignore
@@ -2,6 +2,7 @@
 .idea/**/workspace.xml
 .idea/**/tasks.xml
 .idea/dictionaries
+local.properties
 
 # Sensitive or high-churn files:
 .idea/**/dataSources/

diff --git a/extensions/intellij/intellij_generator_plugin/build.gradle b/extensions/intellij/intellij_generator_plugin/build.gradle
@@ -1,24 +1,25 @@
 plugins {
     id 'java'
-    id 'org.jetbrains.intellij' version '1.16.1'
-    id 'org.jetbrains.kotlin.jvm' version '1.9.22'
+    id 'org.jetbrains.intellij' version '1.17.4'
+    id 'org.jetbrains.kotlin.jvm' version '1.9.25'
 }
 
 group 'com.bloc'
-version '4.0.1'
+version '4.0.2'
 
 apply plugin: 'org.jetbrains.intellij'
 apply plugin: 'java'
 apply plugin: 'kotlin'
 apply plugin: 'idea'
 
 java {
-    sourceCompatibility = 11
-    targetCompatibility = 11
+    sourceCompatibility = 17
+    targetCompatibility = 17
 }
 
 intellij {
-    version = '2022.1.1'
+    type = 'IC'
+    version = '2022.3'
     plugins = ['java']
     updateSinceUntilBuild.set(false)
 }
@@ -28,17 +29,16 @@ repositories {
 }
 
 dependencies {
-    compileOnly("org.jetbrains.kotlin:kotlin-stdlib-jdk8")
     testCompileOnly(group: 'junit', name: 'junit', version: '4.13.2')
     implementation("com.fleshgrinder.kotlin:case-format:0.2.0")
 }
 
 compileKotlin {
-    kotlinOptions.jvmTarget = "11"
+    kotlinOptions.jvmTarget = "17"
 }
 
 compileTestKotlin {
-    kotlinOptions.jvmTarget = "11"
+    kotlinOptions.jvmTarget = "17"
 }
 
 patchPluginXml {

diff --git a/extensions/intellij/intellij_generator_plugin/gradle.properties b/extensions/intellij/intellij_generator_plugin/gradle.properties
@@ -1 +1,2 @@
-kotlin.code.style=official
+kotlin.code.style=official
+kotlin.stdlib.default.dependency = true
diff --git a/extensions/intellij/intellij_generator_plugin/gradle/wrapper/gradle-wrapper.properties b/extensions/intellij/intellij_generator_plugin/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/...ator_plugin/src/main/java/com/bloc/intellij_generator_plugin/action/GenerateBlocAction.kt b/...ator_plugin/src/main/java/com/bloc/intellij_generator_plugin/action/GenerateBlocAction.kt
@@ -10,6 +10,7 @@ import com.intellij.openapi.project.Project
 import com.intellij.psi.*
 
 class GenerateBlocAction : AnAction(), GenerateBlocDialog.Listener {
+    override fun getActionUpdateThread(): ActionUpdateThread = ActionUpdateThread.BGT
 
     private lateinit var dataContext: DataContext
 

diff --git a/...tor_plugin/src/main/java/com/bloc/intellij_generator_plugin/action/GenerateCubitAction.kt b/...tor_plugin/src/main/java/com/bloc/intellij_generator_plugin/action/GenerateCubitAction.kt
@@ -10,6 +10,7 @@ import com.intellij.openapi.project.Project
 import com.intellij.psi.*
 
 class GenerateCubitAction : AnAction(), GenerateBlocDialog.Listener {
+    override fun getActionUpdateThread(): ActionUpdateThread = ActionUpdateThread.BGT
 
     private lateinit var dataContext: DataContext
 

diff --git a/...n/src/main/java/com/bloc/intellij_generator_plugin/action/GenerateEquatablePropsAction.kt b/...n/src/main/java/com/bloc/intellij_generator_plugin/action/GenerateEquatablePropsAction.kt
@@ -3,6 +3,7 @@ package com.bloc.intellij_generator_plugin.action
 import com.intellij.lang.ASTNode
 import com.intellij.openapi.actionSystem.AnAction
 import com.intellij.openapi.actionSystem.AnActionEvent
+import com.intellij.openapi.actionSystem.ActionUpdateThread
 import com.intellij.openapi.actionSystem.CommonDataKeys
 import com.intellij.openapi.command.WriteCommandAction
 import com.intellij.openapi.editor.Document
@@ -13,6 +14,7 @@ import com.intellij.psi.util.PsiUtilBase
 
 
 class GenerateEquatablePropsAction : AnAction() {
+    override fun getActionUpdateThread(): ActionUpdateThread = ActionUpdateThread.BGT
 
     private var propsNullable = false
 

diff --git a/extensions/intellij/intellij_generator_plugin/src/main/resources/META-INF/plugin.xml b/extensions/intellij/intellij_generator_plugin/src/main/resources/META-INF/plugin.xml
@@ -11,6 +11,7 @@
 
     <change-notes><![CDATA[
         <ul>
+          <li>v4.0.2 - Support for Intellij 2024.2</li>
           <li>v4.0.1 - Support for Intellij 2024</li>
           <li>v4.0.0 - Support for Sealed Classes and Dependency Upgrades</li>
           <li>v3.4.0 - Support for Freezed</li>
@@ -40,7 +41,7 @@
     </change-notes>
 
     <!-- please see http://www.jetbrains.org/intellij/sdk/docs/basics/getting_started/build_number_ranges.html for description -->
-    <idea-version since-build="145.0" until-build="241.*"/>
+    <idea-version since-build="223" until-build="243.*"/>
 
     <!-- please see http://www.jetbrains.org/intellij/sdk/docs/basics/getting_started/plugin_compatibility.html
        on how to target different products -->