diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 87ce02887..d51da48c6 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -8,7 +8,7 @@ jobs: strategy: matrix: - ideaVersion: [ "2024.1.4" ] + ideaVersion: [ "2024.2.0.1" ] steps: - uses: actions/checkout@v2 diff --git a/CHANGELOG.md b/CHANGELOG.md index 718099a16..f9e261319 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,15 @@ # Changelog +## v18.0.2 +### Enhancements +* [#3628](https://github.com/KronicDeth/intellij-elixir/pull/3628) - [@joshuataylor](https://github.com/joshuataylor) + * Add support for 2024.2 IDEs + +## v18.0.1 +### Enhancements +* [#3582](https://github.com/KronicDeth/intellij-elixir/pull/3582) - [@rNoz](https://github.com/rNoz) + * Enabling proper code generation for comments (Comment with Line/Block Comment) + ## v18.0.0 ### Breaking changes * [#3569](https://github.com/KronicDeth/intellij-elixir/pull/3569) - [@ashleysommer](https://github.com/ashleysommer), [@joshuataylor](https://github.com/joshuataylor) diff --git a/build.gradle b/build.gradle index 74b838179..c67e8fafb 100644 --- a/build.gradle +++ b/build.gradle @@ -1,7 +1,8 @@ plugins { id "org.jetbrains.intellij" version "1.17.3" - id "org.jetbrains.kotlin.jvm" version "1.9.10" + id "org.jetbrains.kotlin.jvm" version "1.9.24" id "de.undercouch.download" version "4.1.2" + id 'com.adarshr.test-logger' version '4.0.0' } ext { @@ -68,9 +69,8 @@ allprojects { changeNotes.set(bodyInnerHTML("resources/META-INF/changelog.html")) pluginDescription.set(bodyInnerHTML("resources/META-INF/description.html")) - - sinceBuild = "241.14494.240" - untilBuild = "241.*" + sinceBuild = "242.20224.300" // 2024.2 + untilBuild = "242.*" // Support 2024.2 } publishPlugin { @@ -82,7 +82,7 @@ allprojects { } runPluginVerifier { - ideVersions = ["2024.1.4"] + ideVersions = ["2024.2.0.1"] } } @@ -138,6 +138,8 @@ dependencies { testImplementation group: 'org.mockito', name: 'mockito-core', version: '2.2.9' testImplementation group: 'org.objenesis', name: 'objenesis', version: '2.4' + testImplementation 'junit:junit:4.13.2' + testImplementation "org.opentest4j:opentest4j:1.3.0" } project(':jps-builder') { diff --git a/gradle.properties b/gradle.properties index 3dc24bdc2..7f2a19629 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,8 +1,8 @@ # Available idea versions: # https://www.jetbrains.com/intellij-repository/releases # https://www.jetbrains.com/intellij-repository/snapshots -baseVersion=18.0.1 -ideaVersion=2024.1.4 +baseVersion=18.0.2 +ideaVersion=2024.2 # MUST stay at 1.8 for JPS (Build/Compile Project) compatibility even if JRE/JBR is newer javaVersion=17 javaTargetVersion=17 diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index afba10928..d64cd4917 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index c7d437bbb..1af9e0930 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,7 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.4-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip networkTimeout=10000 +validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew index 65dcd68d6..1aa94a426 100755 --- a/gradlew +++ b/gradlew @@ -83,10 +83,8 @@ done # This is normally unused # shellcheck disable=SC2034 APP_BASE_NAME=${0##*/} -APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit - -# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' +# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) +APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD=maximum @@ -133,10 +131,13 @@ location of your Java installation." fi else JAVACMD=java - which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + if ! command -v java >/dev/null 2>&1 + then + die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. Please set the JAVA_HOME variable in your environment to match the location of your Java installation." + fi fi # Increase the maximum file descriptors if we can. @@ -144,7 +145,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then case $MAX_FD in #( max*) # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. - # shellcheck disable=SC3045 + # shellcheck disable=SC2039,SC3045 MAX_FD=$( ulimit -H -n ) || warn "Could not query maximum file descriptor limit" esac @@ -152,7 +153,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then '' | soft) :;; #( *) # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. - # shellcheck disable=SC3045 + # shellcheck disable=SC2039,SC3045 ulimit -n "$MAX_FD" || warn "Could not set maximum file descriptor limit to $MAX_FD" esac @@ -197,11 +198,15 @@ if "$cygwin" || "$msys" ; then done fi -# Collect all arguments for the java command; -# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of -# shell script including quotes and variable substitutions, so put them in -# double quotes to make sure that they get re-expanded; and -# * put everything else in single quotes, so that it's not re-expanded. + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Collect all arguments for the java command: +# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, +# and any embedded shellness will be escaped. +# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be +# treated as '${Hostname}' itself on the command line. set -- \ "-Dorg.gradle.appname=$APP_BASE_NAME" \ diff --git a/jps-shared/build.gradle b/jps-shared/build.gradle index 8326e92cb..6324fdb5f 100644 --- a/jps-shared/build.gradle +++ b/jps-shared/build.gradle @@ -1,4 +1,7 @@ -jar.archiveName = "jps-shared.jar" +jar { + archiveBaseName.set("jps-shared") + archiveExtension.set("jar") +} testClasses.enabled = false repositories { diff --git a/resources/META-INF/changelog.html b/resources/META-INF/changelog.html index 36b318131..5720ce5e1 100644 --- a/resources/META-INF/changelog.html +++ b/resources/META-INF/changelog.html @@ -1,38 +1,53 @@ -

v18.0.1

+

v18.0.2

-

Bug Fixes

+ +

v18.0.1

-

Enhancements

- +

v17.0.1