Skip to content

Commit

Permalink
Support Jetbrains 2024.3 (243.21565.193) (#3651)
Browse files Browse the repository at this point in the history
* Support Jetbrains 2024.3 (243.12818.47)

* Use 2024.3

* Bump intellij platform to 2.1.0, kotlin to 1.9.25

* tweak kotlin versions

* bump pluginSinceBuild to 243
  • Loading branch information
joshuataylor authored Nov 14, 2024
1 parent b698fda commit 51645e4
Show file tree
Hide file tree
Showing 3 changed files with 19 additions and 15 deletions.
12 changes: 8 additions & 4 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ import org.jetbrains.intellij.platform.gradle.TestFrameworkType
import org.jetbrains.intellij.platform.gradle.tasks.RunIdeTask

plugins {
id "org.jetbrains.intellij.platform" version "2.0.1"
id "org.jetbrains.kotlin.jvm" version "1.9.24"
id "org.jetbrains.intellij.platform" version "2.1.0"
id "org.jetbrains.kotlin.jvm" version "1.9.25"
id "de.undercouch.download" version "4.1.2"
id 'com.adarshr.test-logger' version '4.0.0'
}
Expand Down Expand Up @@ -120,7 +120,7 @@ intellijPlatform {
}
pluginVerification {
ides {
ide(IntelliJPlatformType.IntellijIdeaCommunity, "2024.2.0.1")
ide(IntelliJPlatformType.IntellijIdeaCommunity, "243.12818.47")
}
}
}
Expand All @@ -142,8 +142,12 @@ tasks.withType(RunIdeTask) {
}
}

kotlin {
jvmToolchain(21)
}

//noinspection GroovyAssignabilityCheck,GrUnresolvedAccess
tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).all {
tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).configureEach {
//noinspection GrUnresolvedAccess
kotlinOptions {
apiVersion = "1.7"
Expand Down
20 changes: 10 additions & 10 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -6,19 +6,19 @@ pluginVersion=19.0.1
vendorName=Elle Imhoff
vendorEmail=[email protected]
# https://youtrack.jetbrains.com/articles/IDEA-A-2100661899/IntelliJ-IDEA-2024.1-241.14494.240-build-Release-Notes
pluginSinceBuild=242.20224.300
pluginUntilBuild=242.*
pluginSinceBuild=243.21565.193
pluginUntilBuild=243.*

# Set this to open
runIdeWorkingDirectory=

# Define versions for running the IDEs, as each IDE can release at different release versions.
platformVersionIntellijIdeaCommunity=2024.2.0.1
platformVersionIntellijIdeaUltimate=2024.2.0.1
platformVersionRubyMine=2024.2
platformVersionPyCharmCommunity=2024.2
platformVersionPyCharmProfessional=2024.2
platformVersionWebStorm=2024.2
platformVersionIntellijIdeaCommunity=2024.3
platformVersionIntellijIdeaUltimate=2024.3
platformVersionRubyMine=2024.3
platformVersionPyCharmCommunity=2024.3
platformVersionPyCharmProfessional=2024.3
platformVersionWebStorm=2024.3

# Comma-separated list of platforms to include
platformsList=IntellijIdeaCommunity,IntellijIdeaUltimate,RubyMine,PyCharmCommunity,PyCharmProfessional,WebStorm
Expand All @@ -33,7 +33,7 @@ elixirVersion=1.13.4
# IntelliJ Platform Properties -> https://plugins.jetbrains.com/docs/intellij/tools-gradle-intellij-plugin.html#configuration-intellij-extension
# Target IntelliJ Community by default
platformType=IC
platformVersion=2024.2.0.1
platformVersion=2024.3

# Plugin Dependencies -> https://plugins.jetbrains.com/docs/intellij/plugin-dependencies.html
# Example: platformPlugins = com.jetbrains.php:203.4449.22, org.intellij.scala:2023.3.27@EAP
Expand All @@ -44,7 +44,7 @@ platformBundledPlugins=org.intellij.plugins.markdown,com.intellij.java
# Gradle Releases -> https://github.com/gradle/gradle/releases
# 8.5 is set because newer versions have weird run time caching issues, even with caching turned off.
# See https://github.com/gradle/gradle/issues/28974
gradleVersion=8.5
gradleVersion=8.10.1
# Opt-out flag for bundling Kotlin standard library -> https://jb.gg/intellij-platform-kotlin-stdlib
kotlin.stdlib.default.dependency=false
publishChannels=canary
Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.1-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down

0 comments on commit 51645e4

Please sign in to comment.