From 5ea619768ff6f7778b1d2cb130f06939413b0181 Mon Sep 17 00:00:00 2001 From: Felix Angelov Date: Tue, 12 Mar 2024 23:12:57 -0500 Subject: [PATCH] chore(intellij): update dependencies (#4102) --- .../intellij_generator_plugin/build.gradle | 24 ++++++++++--------- .../gradle/wrapper/gradle-wrapper.properties | 3 +-- .../action/GenerateBlocDialog.java | 2 +- .../action/GenerateEquatablePropsAction.kt | 2 +- 4 files changed, 16 insertions(+), 15 deletions(-) diff --git a/extensions/intellij/intellij_generator_plugin/build.gradle b/extensions/intellij/intellij_generator_plugin/build.gradle index 2b24c69bb26..b385456d54a 100644 --- a/extensions/intellij/intellij_generator_plugin/build.gradle +++ b/extensions/intellij/intellij_generator_plugin/build.gradle @@ -1,7 +1,7 @@ plugins { id 'java' - id 'org.jetbrains.intellij' version '0.4.17' - id 'org.jetbrains.kotlin.jvm' version '1.3.11' + id 'org.jetbrains.intellij' version '1.16.1' + id 'org.jetbrains.kotlin.jvm' version '1.9.22' } group 'com.bloc' @@ -12,12 +12,14 @@ apply plugin: 'java' apply plugin: 'kotlin' apply plugin: 'idea' -sourceCompatibility = 1.8 -targetCompatibility = 1.8 +java { + sourceCompatibility = 11 + targetCompatibility = 11 +} intellij { - version '2017.3' - updateSinceUntilBuild false + version = '2022.1.1' + plugins = ['java'] } repositories { @@ -25,16 +27,16 @@ repositories { } dependencies { - compile "org.jetbrains.kotlin:kotlin-stdlib-jdk8" - testCompile group: 'junit', name: 'junit', version: '4.12' - implementation "com.fleshgrinder.kotlin:case-format:0.2.0" + 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 = "1.8" + kotlinOptions.jvmTarget = "11" } compileTestKotlin { - kotlinOptions.jvmTarget = "1.8" + kotlinOptions.jvmTarget = "11" } patchPluginXml { diff --git a/extensions/intellij/intellij_generator_plugin/gradle/wrapper/gradle-wrapper.properties b/extensions/intellij/intellij_generator_plugin/gradle/wrapper/gradle-wrapper.properties index 50a3c9eff8f..f42e62f3724 100644 --- a/extensions/intellij/intellij_generator_plugin/gradle/wrapper/gradle-wrapper.properties +++ b/extensions/intellij/intellij_generator_plugin/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,5 @@ -#Thu Apr 18 19:36:22 CDT 2019 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-all.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.3-all.zip diff --git a/extensions/intellij/intellij_generator_plugin/src/main/java/com/bloc/intellij_generator_plugin/action/GenerateBlocDialog.java b/extensions/intellij/intellij_generator_plugin/src/main/java/com/bloc/intellij_generator_plugin/action/GenerateBlocDialog.java index 9482e675819..16fb4d8cde9 100644 --- a/extensions/intellij/intellij_generator_plugin/src/main/java/com/bloc/intellij_generator_plugin/action/GenerateBlocDialog.java +++ b/extensions/intellij/intellij_generator_plugin/src/main/java/com/bloc/intellij_generator_plugin/action/GenerateBlocDialog.java @@ -13,7 +13,7 @@ public class GenerateBlocDialog extends DialogWrapper { private JComboBox style; public GenerateBlocDialog(final Listener listener) { - super(null); + super(false); this.listener = listener; init(); } diff --git a/extensions/intellij/intellij_generator_plugin/src/main/java/com/bloc/intellij_generator_plugin/action/GenerateEquatablePropsAction.kt b/extensions/intellij/intellij_generator_plugin/src/main/java/com/bloc/intellij_generator_plugin/action/GenerateEquatablePropsAction.kt index 97592c72b13..5ad91fb3106 100644 --- a/extensions/intellij/intellij_generator_plugin/src/main/java/com/bloc/intellij_generator_plugin/action/GenerateEquatablePropsAction.kt +++ b/extensions/intellij/intellij_generator_plugin/src/main/java/com/bloc/intellij_generator_plugin/action/GenerateEquatablePropsAction.kt @@ -16,7 +16,7 @@ class GenerateEquatablePropsAction : AnAction() { var propsNullable = false - override fun update(event: AnActionEvent?) { + override fun update(event: AnActionEvent) { super.update(event) val action = event?.presentation; if (action != null) {