From f363fce8f30e771e00159adc8551cd9c6dcb0976 Mon Sep 17 00:00:00 2001 From: chylex <contact@chylex.com> Date: Thu, 16 Mar 2023 16:51:37 +0100 Subject: [PATCH] Update Gradle and Java version --- .gitignore | 3 --- .idea/compiler.xml | 6 ------ .idea/gradle.xml | 19 ------------------- .idea/vcs.xml | 6 ------ build.gradle.kts | 9 ++++----- gradle/wrapper/gradle-wrapper.properties | 2 +- resources/META-INF/plugin.xml | 2 +- 7 files changed, 6 insertions(+), 41 deletions(-) delete mode 100644 .idea/compiler.xml delete mode 100644 .idea/gradle.xml delete mode 100644 .idea/vcs.xml diff --git a/.gitignore b/.gitignore index 481dbe7..f411aaa 100644 --- a/.gitignore +++ b/.gitignore @@ -1,9 +1,6 @@ /.idea/* !/.idea/runConfigurations -!/.idea/compiler.xml !/.idea/encodings.xml -!/.idea/gradle.xml -!/.idea/vcs.xml /.gradle/ /build/ diff --git a/.idea/compiler.xml b/.idea/compiler.xml deleted file mode 100644 index fb7f4a8..0000000 --- a/.idea/compiler.xml +++ /dev/null @@ -1,6 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<project version="4"> - <component name="CompilerConfiguration"> - <bytecodeTargetLevel target="11" /> - </component> -</project> \ No newline at end of file diff --git a/.idea/gradle.xml b/.idea/gradle.xml deleted file mode 100644 index 592fdc7..0000000 --- a/.idea/gradle.xml +++ /dev/null @@ -1,19 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<project version="4"> - <component name="GradleMigrationSettings" migrationVersion="1" /> - <component name="GradleSettings"> - <option name="linkedExternalProjectsSettings"> - <GradleProjectSettings> - <option name="delegatedBuild" value="true" /> - <option name="testRunner" value="GRADLE" /> - <option name="distributionType" value="DEFAULT_WRAPPED" /> - <option name="externalProjectPath" value="$PROJECT_DIR$" /> - <option name="modules"> - <set> - <option value="$PROJECT_DIR$" /> - </set> - </option> - </GradleProjectSettings> - </option> - </component> -</project> \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml deleted file mode 100644 index 94a25f7..0000000 --- a/.idea/vcs.xml +++ /dev/null @@ -1,6 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<project version="4"> - <component name="VcsDirectoryMappings"> - <mapping directory="$PROJECT_DIR$" vcs="Git" /> - </component> -</project> \ No newline at end of file diff --git a/build.gradle.kts b/build.gradle.kts index 0c8b14d..d6418a8 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,7 +1,7 @@ plugins { java idea - id("org.jetbrains.intellij") version "1.7.0" + id("org.jetbrains.intellij") version "1.13.2" } group = "com.chylex.intellij.coloredicons" @@ -14,7 +14,7 @@ repositories { intellij { type.set("IU") - version.set("LATEST-EAP-SNAPSHOT") + version.set("2022.3.3") updateSinceUntilBuild.set(false) } @@ -27,7 +27,7 @@ configurations { } java { - toolchain.languageVersion.set(JavaLanguageVersion.of(11)) + toolchain.languageVersion.set(JavaLanguageVersion.of(17)) } sourceSets { @@ -45,9 +45,8 @@ sourceSets { dependencies { "helpersImplementation"("commons-io:commons-io:2.11.0") - "ides"("com.jetbrains.intellij.idea:ideaIU:LATEST-EAP-SNAPSHOT") - if (System.getProperty("downloadExtraIDEs", "") == "true") { + "ides"("com.jetbrains.intellij.idea:ideaIU:LATEST-EAP-SNAPSHOT") "ides"("com.jetbrains.intellij.clion:clion:LATEST-EAP-SNAPSHOT") "ides"("com.jetbrains.intellij.goland:goland:LATEST-EAP-SNAPSHOT") "ides"("com.jetbrains.intellij.phpstorm:phpstorm:LATEST-EAP-SNAPSHOT") diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 69a9715..070cb70 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/resources/META-INF/plugin.xml b/resources/META-INF/plugin.xml index ae29e99..871a2b6 100644 --- a/resources/META-INF/plugin.xml +++ b/resources/META-INF/plugin.xml @@ -36,7 +36,7 @@ </ul> ]]></change-notes> - <idea-version since-build="183.0" /> + <idea-version since-build="223.0" /> <depends>com.intellij.modules.platform</depends> <application-components>