diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index f8b44e2f5..de3e7e02b 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -12,7 +12,7 @@ jobs:
     steps:
       - uses: actions/checkout@v2
       - name: Setup JBR 21
-        uses: gmitch215/setup-java@6d2c5e1f82f180ae79f799f0ed6e3e5efb4e664d
+        uses: actions/setup-java@v5
         with:
           distribution: 'jetbrains'
           java-version: 21
@@ -41,7 +41,7 @@ jobs:
     steps:
       - uses: actions/checkout@v2
       - name: Setup JBR 21
-        uses: gmitch215/setup-java@6d2c5e1f82f180ae79f799f0ed6e3e5efb4e664d
+        uses: actions/setup-java@v5
         with:
           distribution: 'jetbrains'
           java-version: 21
@@ -56,7 +56,7 @@ jobs:
     steps:
       - uses: actions/checkout@v2
       - name: Setup JBR 21
-        uses: gmitch215/setup-java@6d2c5e1f82f180ae79f799f0ed6e3e5efb4e664d
+        uses: actions/setup-java@v5
         with:
           distribution: 'jetbrains'
           java-version: 21
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index cb0309fe3..18d4539ac 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -12,15 +12,17 @@ jobs:
 
     strategy:
       matrix:
-        ideaVersion: [ "2024.2.0.1" ]
+        ideaVersion: [ "2024.2.6", "2024.3.6", "2025.2.1" ]
 
     steps:
       - uses: actions/checkout@v2
       - name: Setup JBR 21
-        uses: gmitch215/setup-java@6d2c5e1f82f180ae79f799f0ed6e3e5efb4e664d
+        uses: actions/setup-java@v5
         with:
           distribution: 'jetbrains'
           java-version: 21
+          cache: 'gradle'
+          package-type: 'jdk+jcef'
       - name: Set up Elixir
         uses: erlef/setup-beam@v1
         with:
@@ -48,10 +50,12 @@ jobs:
     steps:
       - uses: actions/checkout@v2
       - name: Setup JBR 21
-        uses: gmitch215/setup-java@6d2c5e1f82f180ae79f799f0ed6e3e5efb4e664d
+        uses: actions/setup-java@v5
         with:
           distribution: 'jetbrains'
           java-version: 21
+          cache: 'gradle'
+          package-type: 'jdk+jcef'
       - name: Grant execute permission for gradlew
         run: chmod +x gradlew
       - name: Run Plugin Verifier
diff --git a/.gitignore b/.gitignore
index 833cd8831..a526c5610 100644
--- a/.gitignore
+++ b/.gitignore
@@ -29,3 +29,4 @@ jps-shared/build
 jps-shared/out
 libs/
 .intellijPlatform
+/.kotlin
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0cb26a9eb..6d0432a49 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Changelog
 
+## v22.0.0 (Unreleased)
+### Enhancements
+* [#3712](https://github.com/KronicDeth/intellij-elixir/pull/3712) - [@joshuataylor](https://github.com/joshuataylor)
+  * Upgrade Kotlin to 2.2.10, as it's deprecated in IntelliJ 2025.1+, various deprecations are also fixed.
+  * Fixed adding Erlang/Elixir SDKs in 2025.1+ IDEs.
+
 ## v21.0.0
 ### Enhancements
 * [#3651](https://github.com/KronicDeth/intellij-elixir/pull/3681) - [@joshuataylor](https://github.com/joshuataylor)
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 1b8f55f84..54ff95e1a 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -31,7 +31,7 @@
 6. In "Import Project from Gradle"
    1. Check "Use auto-import"
    2. Check "Create separate module per source set"
-   3. Ensure Gradle JVM is **AT LEAST** Java 1.7 / 7.  (Java 1.8 / 8 is recommended.)
+   3. Ensure Gradle JVM is **AT LEAST** Java 21+.
    Your import settings should look something like this:<br/>
    ![Gradle settings](/screenshots/contributing/gradle_settings.png?raw=true "Gradle settings")
    4. Click Finish
diff --git a/build.gradle b/build.gradle
index 44b05514c..beb3db599 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,11 +1,14 @@
 import org.jetbrains.intellij.platform.gradle.IntelliJPlatformType
 import org.jetbrains.intellij.platform.gradle.TestFrameworkType
 import org.jetbrains.intellij.platform.gradle.tasks.RunIdeTask
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
+import org.jetbrains.kotlin.gradle.dsl.KotlinVersion
+import org.jetbrains.kotlin.gradle.tasks.KotlinJvmCompile
 
 plugins {
-    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 "org.jetbrains.intellij.platform" version "2.7.2"
+    id "org.jetbrains.kotlin.jvm" version "2.2.10"
+    id "de.undercouch.download" version "5.6.0"
     id 'com.adarshr.test-logger' version '4.0.0'
 }
 
@@ -33,13 +36,17 @@ ext {
         channel = "canary"
     }
 
-    version "$pluginVersion$versionSuffix"
+    version = "$pluginVersion$versionSuffix"
 }
 
 allprojects {
     apply plugin: 'java'
     sourceCompatibility = javaVersion
     targetCompatibility = javaVersion
+    java {
+        sourceCompatibility = JavaVersion.VERSION_21
+        targetCompatibility = JavaVersion.VERSION_21
+    }
     tasks.withType(JavaCompile) { options.encoding = 'UTF-8' }
 }
 subprojects {
@@ -58,7 +65,6 @@ subprojects {
             create(providers.gradleProperty("platformType"), providers.gradleProperty("platformVersion"))
 
             bundledPlugins providers.gradleProperty("platformBundledPlugins").map { it.split(',').toList() }
-            plugins providers.gradleProperty("platformPlugins").map { it.split(',').toList() }
 
             instrumentationTools()
             pluginVerifier()
@@ -88,10 +94,11 @@ sourceSets {
     }
 }
 intellijPlatform {
+    // buildSearchableOptions = false
+    // instrumentCode = false
     pluginConfiguration {
         def stripTag = { text, tag -> text.replace("<${tag}>", "").replace("</${tag}>", "") }
-        def bodyInnerHTML = { path ->
-            stripTag(stripTag(file(path).text, "html"), "body")
+        def bodyInnerHTML = { path -> stripTag(stripTag(file(path).text, "html"), "body")
         }
 
         id = providers.gradleProperty("pluginGroup")
@@ -122,13 +129,17 @@ intellijPlatform {
     }
     pluginVerification {
         ides {
-            ide(IntelliJPlatformType.IntellijIdeaCommunity, "243.12818.47")
+            // https://www.jetbrains.com/idea/download/other.html
+//            ide(IntelliJPlatformType.IntellijIdeaCommunity, "2024.2.6")
+//            ide(IntelliJPlatformType.IntellijIdeaCommunity, "2024.3.6")
+            ide IntelliJPlatformType.IntellijIdeaCommunity, "2025.2.1"
         }
     }
 }
 apply plugin: "kotlin"
 
-tasks.withType(RunIdeTask) {
+// Configure all RunIdeTask instances (including the new platform-specific ones)
+tasks.withType(RunIdeTask).configureEach {
     // Set JVM arguments
     jvmArguments.addAll(["-Didea.debug.mode=true", "-Didea.is.internal=true", "-Dlog4j2.debug=true", "-Dlogger.org=TRACE", "-XX:+AllowEnhancedClassRedefinition"])
 
@@ -142,19 +153,26 @@ tasks.withType(RunIdeTask) {
     if (project.hasProperty("runIdeWorkingDirectory") && !project.property("runIdeWorkingDirectory").isEmpty()) {
         workingDir = file(project.property("runIdeWorkingDirectory"))
     }
+
+    def compatiblePluginsList = providers.gradleProperty("runIdeCompatiblePlugins").get().with { it.isEmpty() ? [] : it.split(",") }
+    if (compatiblePluginsList.size() > 0) {
+        dependencies {
+            intellijPlatform {
+                compatiblePlugins(compatiblePluginsList)
+            }
+        }
+    }
 }
 
 kotlin {
     jvmToolchain(21)
 }
 
-//noinspection GroovyAssignabilityCheck,GrUnresolvedAccess
-tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).configureEach {
-    //noinspection GrUnresolvedAccess
-    kotlinOptions {
-        apiVersion = "1.7"
-        jvmTarget = "21"
-        freeCompilerArgs = ["-Xjvm-default=all"]
+tasks.withType(KotlinJvmCompile).configureEach {
+    compilerOptions {
+        jvmTarget.set(JvmTarget.JVM_21)
+        freeCompilerArgs.add("-Xjvm-default=all")
+        apiVersion.set(KotlinVersion.KOTLIN_2_2)
     }
 }
 
@@ -176,50 +194,30 @@ test {
     }
 }
 
+// Get the list of platforms from gradle.properties
+def runIdePlatformsList = providers.gradleProperty("runIdePlatforms").get().split(",")
+
 intellijPlatformTesting {
-    // Get the list of platforms from gradle.properties
-    def platformsList = providers.gradleProperty("platformsList").get().split(",")
-
-    // Use providers.gradleProperty to get the 'runIdePlugins' property
-    def runIdePluginsProperty = providers.gradleProperty("runIdePlugins").getOrElse("")
-    def runIdePluginsList = runIdePluginsProperty.split(",")
-
-    platformsList.each { platform ->
-        runIde.create("run${platform}") {
-            type = IntelliJPlatformType."${platform}"
-            version = providers.gradleProperty("platformVersion${platform}").get()
-            prepareSandboxTask {
-                sandboxDirectory = project.layout.buildDirectory.dir("${platform.toLowerCase()}-sandbox")
-            }
+    runIde {
+        runIdePlatformsList.each { platform ->
+            "run${platform}" {
+                type = IntelliJPlatformType."${platform}"
+                version = providers.gradleProperty("platformVersion${platform}").get()
 
-            // if runIdePluginsList is not empty, set the plugins
-            if (runIdePluginsList.size() > 0) {
-                plugins {
-                    // Apply each plugin from the 'runIdePluginsList'
-                    runIdePluginsList.each { plugin ->
-                        plugins(plugin.trim())
-                    }
+                prepareSandboxTask {
+                    sandboxDirectory = project.layout.buildDirectory.dir("${platform.toLowerCase()}-sandbox")
                 }
             }
-        }
 
-        // if enableEAPIDEs is true, create an EAP instance
-        if (providers.gradleProperty("enableEAPIDEs").get().toLowerCase() == "true") {
-            runIde.create("run${platform}EAP") {
-                type = IntelliJPlatformType."${platform}"
-                version = providers.gradleProperty("platformVersion${platform}EAP").get()
-                prepareSandboxTask {
-                    sandboxDirectory = project.layout.buildDirectory.dir("${platform.toLowerCase()}_eap-sandbox")
-                }
-                useInstaller = false
-
-                // if runIdePluginsList is not empty, set the plugins
-                if (runIdePluginsList.size() > 0) {
-                    plugins {
-                        // Apply each plugin from the 'runIdePluginsList'
-                        runIdePluginsList.each { plugin ->
-                            plugins(plugin.trim())
-                        }
+            // if enableEAPIDEs is true, create an EAP instance
+            if (providers.gradleProperty("enableEAPIDEs").get().toLowerCase() == "true") {
+                "run${platform}EAP" {
+                    type = IntelliJPlatformType."${platform}"
+                    version = providers.gradleProperty("platformVersion${platform}EAP").get()
+                    useInstaller = false
+
+                    prepareSandboxTask {
+                        sandboxDirectory = project.layout.buildDirectory.dir("${platform.toLowerCase()}_eap-sandbox")
                     }
                 }
             }
@@ -237,7 +235,7 @@ task testCompilation(type: Test, group: 'Verification', dependsOn: [classes, tes
 }
 
 repositories {
-    maven { url 'https://maven-central.storage.googleapis.com' }
+    maven { url = 'https://maven-central.storage.googleapis.com' }
     mavenCentral()
     intellijPlatform {
         defaultRepositories()
@@ -248,9 +246,7 @@ dependencies {
     intellijPlatform {
         create(providers.gradleProperty("platformType"), providers.gradleProperty("platformVersion"))
 
-        bundledPlugins providers.gradleProperty("platformBundledPlugins").map { it.split(',').toList() }
-        plugins providers.gradleProperty("platformPlugins").map { it.split(',').toList() }
-
+        bundledPlugins(providers.gradleProperty("platformBundledPlugins").map { it.split(',').toList() })
         instrumentationTools()
         pluginVerifier()
         zipSigner()
@@ -285,12 +281,12 @@ idea {
     }
 }
 
-task getElixir {
+tasks.register('getElixir') {
     doLast {
-        def folder = new File(elixirPath)
+        def folder = new File(elixirPath as String)
 
         if (!folder.isDirectory() || folder.list().size() == 0) {
-            download {
+            download.run {
                 src "https://github.com/elixir-lang/elixir/archive/v${elixirVersion}.zip"
                 dest "${rootDir}/cache/Elixir.${elixirVersion}.zip"
                 overwrite false
@@ -314,7 +310,7 @@ task getElixir {
 
 task getQuoter {
     doLast {
-        download {
+        download.run {
             src "https://github.com/KronicDeth/intellij_elixir/archive/v${quoterVersion}.zip"
             dest quoterZipPath
             overwrite false
@@ -423,3 +419,11 @@ idea {
         generatedSourceDirs += file('gen')
     }
 }
+
+// Uncomment to allow using build-scan.
+// if (hasProperty('buildScan')) {
+//     buildScan {
+//         termsOfServiceUrl = 'https://gradle.com/terms-of-service'
+//         termsOfServiceAgree = 'yes'
+//     }
+// }
diff --git a/gradle.properties b/gradle.properties
index a4282d658..6c7776bb9 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -2,58 +2,67 @@
 pluginGroup=org.elixir_lang
 pluginName=Elixir
 pluginRepositoryUrl=https://github.com/KronicDeth/intellij-elixir/
-pluginVersion=21.0.0
+pluginVersion=22.0.0
 vendorName=Elle Imhoff
 vendorEmail=Kronic.Deth@gmail.com
 # https://youtrack.jetbrains.com/articles/IDEA-A-2100661899/IntelliJ-IDEA-2024.1-241.14494.240-build-Release-Notes
 pluginSinceBuild=243.21565.180
 pluginUntilBuild=
+#pluginVerificationIDEAVersions="251.26927.53"
+#pluginVerificationRubyMineVersions="251.26927.47"
 # Set this to open
 runIdeWorkingDirectory=
 # Define versions for running the IDEs, as each IDE can release at different release versions.
-platformVersionIntellijIdeaCommunity=2024.3.2.2
-platformVersionIntellijIdeaUltimate=2024.3.2.2
-platformVersionRubyMine=2024.3
-platformVersionPyCharmCommunity=2024.3
-platformVersionPyCharmProfessional=2024.3
-platformVersionWebStorm=2024.3
+platformVersionIntellijIdeaCommunity=2025.2.1
+platformVersionIntellijIdeaUltimate=2025.2.1
+platformVersionRubyMine=2025.2
+platformVersionPyCharmCommunity=2025.2.1
+platformVersionPyCharmProfessional=2025.2.1
+platformVersionWebStorm=2025.2.1
 
-enableEAPIDEs=true
-platformVersionIntellijIdeaCommunityEAP=251-EAP-SNAPSHOT
-platformVersionIntellijIdeaUltimateEAP=251-EAP-SNAPSHOT
-platformVersionPyCharmCommunityEAP=251-EAP-SNAPSHOT
-platformVersionPyCharmProfessionalEAP=251-EAP-SNAPSHOT
-platformVersionRubyMineEAP=251-EAP-SNAPSHOT
-platformVersionWebStormEAP=251-EAP-SNAPSHOT
+enableEAPIDEs=false
+platformVersionIntellijIdeaCommunityEAP=252-EAP-SNAPSHOT
+platformVersionIntellijIdeaUltimateEAP=252-EAP-SNAPSHOT
+platformVersionPyCharmCommunityEAP=252-EAP-SNAPSHOT
+platformVersionPyCharmProfessionalEAP=252-EAP-SNAPSHOT
+platformVersionRubyMineEAP=252-EAP-SNAPSHOT
+platformVersionWebStormEAP=252-EAP-SNAPSHOT
 # Comma-separated list of platforms to include
-platformsList=IntellijIdeaCommunity,IntellijIdeaUltimate,RubyMine,PyCharmCommunity,PyCharmProfessional,WebStorm
+runIdePlatforms=IntellijIdeaCommunity,IntellijIdeaUltimate,RubyMine,PyCharmCommunity,PyCharmProfessional,WebStorm
 # The versions we target, 21 is needed for IntelliJ Plugins
 javaVersion=21
 javaTargetVersion=21
 # Defined in `.tool-versions`, check via `elixir --version`
 elixirVersion=1.13.4
+quoterVersion=2.1.0
 # 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.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
-# https://plugins.jetbrains.com/plugin/24468-classic-ui
-# https://plugins.jetbrains.com/plugin/7641-action-tracker - Act
-# https://plugins.jetbrains.com/plugin/15104-ide-perf - IDE Performande
-# https://plugins.jetbrains.com/plugin/227-psiviewer - View PSI
-platformPlugins = PsiViewer:243.7768, com.google.ide-perf:1.3.2, org.jetbrains.action-tracker:0.3.3, com.intellij.classic.ui:243.21565.122,krasa.CpuUsageIndicator:1.18.0-IJ2023
-# Example: platformBundledPlugins = com.intellij.java
+platformVersion=2025.2.1
+
+# Plugins which will run ONLY when running `runIde` tasks, not for testing/release.
+#
+# Usage:
+# When using `./gradlew runIde`, pass the Gradle Property:
+# -PrunIdeCompatiblePlugins="PsiViewer,com.google.ide-perf,org.jetbrains.action-tracker,com.intellij.classic.ui,krasa.CpuUsageIndicator,IdeaVIM"
+#
+# Recommendations:
+# https://plugins.jetbrains.com/plugin/24468-classic-ui - Classic UI (old UI)
+# https://plugins.jetbrains.com/plugin/7641-action-tracker - Action Tracker (Allows to record actions performed by user in IntelliJ IDEs)
+# https://plugins.jetbrains.com/plugin/15104-ide-perf - IDE Performance
+# https://plugins.jetbrains.com/plugin/227-psiviewer - PSI Viewer (A Program Structure Interface (PSI) tree viewer)
+# IdeaVIM
+runIdeCompatiblePlugins=
 # We need com.intellij.java to compile JPS, and markdown.
-platformBundledPlugins=org.intellij.plugins.markdown,com.intellij.java
+platformBundledPlugins=org.intellij.plugins.markdown,com.intellij.java,org.intellij.intelliLang
+
 # 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.12.1
+gradleVersion=8.14.3
 # Opt-out flag for bundling Kotlin standard library -> https://jb.gg/intellij-platform-kotlin-stdlib
 kotlin.stdlib.default.dependency=false
 publishChannels=canary
-runIdePlugins=IdeaVim:2.16.0
 # These must be set, or Out of Memory (OOM) errors will occur during compiling.
 org.gradle.jvmargs=-Xmx4096m
 kotlin.daemon.jvmargs=-Xmx4906m
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index a4b76b953..1b33c55ba 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 e18bc253b..7705927e9 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.12.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-all.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/gradlew b/gradlew
index f3b75f3b0..23d15a936 100755
--- a/gradlew
+++ b/gradlew
@@ -114,7 +114,7 @@ case "$( uname )" in                #(
   NONSTOP* )        nonstop=true ;;
 esac
 
-CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+CLASSPATH="\\\"\\\""
 
 
 # Determine the Java command to use to start the JVM.
@@ -205,7 +205,7 @@ fi
 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,
+#   * DEFAULT_JVM_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.
@@ -213,7 +213,7 @@ DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 set -- \
         "-Dorg.gradle.appname=$APP_BASE_NAME" \
         -classpath "$CLASSPATH" \
-        org.gradle.wrapper.GradleWrapperMain \
+        -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \
         "$@"
 
 # Stop when "xargs" is not available.
diff --git a/gradlew.bat b/gradlew.bat
index 9b42019c7..5eed7ee84 100644
--- a/gradlew.bat
+++ b/gradlew.bat
@@ -70,11 +70,11 @@ goto fail
 :execute
 @rem Setup the command line
 
-set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+set CLASSPATH=
 
 
 @rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %*
 
 :end
 @rem End local scope for the variables with windows NT shell
diff --git a/jps-builder/build.gradle b/jps-builder/build.gradle
index 1d22d5d1d..a08226d5f 100644
--- a/jps-builder/build.gradle
+++ b/jps-builder/build.gradle
@@ -8,6 +8,11 @@ compileTestJava {
 compileJava {
     dependsOn(":jps-shared:composedJar")
 }
+java {
+    sourceCompatibility = JavaVersion.VERSION_21
+    targetCompatibility = JavaVersion.VERSION_21
+}
+tasks.withType(JavaCompile) { options.encoding = 'UTF-8' }
 
 // Ensuring the necessary tasks are executed before tests
 test {
@@ -30,4 +35,4 @@ test {
 
 dependencies {
     implementation project(':jps-shared')
-}
\ No newline at end of file
+}
diff --git a/jps-shared/build.gradle b/jps-shared/build.gradle
index a869b0950..0854ee58f 100644
--- a/jps-shared/build.gradle
+++ b/jps-shared/build.gradle
@@ -1,2 +1,6 @@
 jar.archiveFileName = "jps-shared.jar"
-testClasses.enabled = false
\ No newline at end of file
+testClasses.enabled = false
+java {
+    sourceCompatibility = JavaVersion.VERSION_21
+    targetCompatibility = JavaVersion.VERSION_21
+}
diff --git a/resources/META-INF/changelog.html b/resources/META-INF/changelog.html
index 8f2f5b206..144f8221d 100644
--- a/resources/META-INF/changelog.html
+++ b/resources/META-INF/changelog.html
@@ -1,5 +1,21 @@
 <html>
 <body>
+
+<h1>v22.0.0-EAP</h1>
+<ul>
+    <li>
+        <p>Enhancements</p>
+        <ul>
+            <li>
+                <a href="https://github.com/KronicDeth/intellij-elixir/pull/3712">
+                    #3712 Support Jetbrains 2025.1+ (2025.2+), Upgrade Kotlin to 2.2.10, as it's deprecated in IntelliJ 2025.1+, various deprecations are also fixed,
+                    fixed adding Erlang/Elixir SDKs in 2025.1+ IDEs.
+                </a> - <a href="https://github.com/joshuataylor">@joshuataylor</a>
+            </li>
+        </ul>
+    </li>
+</ul>
+
 <h1>v21.0.0</h1>
 <ul>
     <li>
diff --git a/resources/META-INF/plugin.xml b/resources/META-INF/plugin.xml
index 83d3b7839..c86172e7f 100644
--- a/resources/META-INF/plugin.xml
+++ b/resources/META-INF/plugin.xml
@@ -22,7 +22,11 @@
     </extensions>
 
     <extensions defaultExtensionNs="com.intellij">
-<!--        <errorHandler implementation="org.elixir_lang.errorreport.Submitter"/>-->
+        <registryKey key="org.elixir_lang.injection.enableLiteralSigilInjection"
+                     defaultValue="false"
+                     description="Enables literal sigil injection, which allows the Elixir sigil ~S to work. WARNING: THIS IS CURRENTLY BUGGY AND CAUSING ISSUES WITH ~s"/>
+
+        <!--        <errorHandler implementation="org.elixir_lang.errorreport.Submitter"/>-->
         <errorHandler implementation="com.intellij.diagnostic.JetBrainsMarketplaceErrorReportSubmitter"/>
 
         <!-- `openProjectProcessor` for Small IDEs -->
@@ -215,8 +219,8 @@
         <lang.psiStructureViewFactory language="Elixir" implementationClass="org.elixir_lang.structure_view.Factory"/>
         <lang.quoteHandler language="Elixir" implementationClass="org.elixir_lang.QuoteHandler"/>
         <lang.syntaxHighlighterFactory
-                                       implementationClass="org.elixir_lang.ElixirSyntaxHighlighterFactory"
-                                       language="Elixir"/>
+                implementationClass="org.elixir_lang.ElixirSyntaxHighlighterFactory"
+                language="Elixir"/>
         <localInspection displayName="Ambiguous nested calls" enabledByDefault="true" groupName="Elixir"
                          implementationClass="org.elixir_lang.inspection.NoParenthesesManyStrict" language="Elixir"
                          level="ERROR" shortName="NoParenthesesManyStrict"/>
diff --git a/src/org/elixir_lang/ElixirSyntaxHighlighter.kt b/src/org/elixir_lang/ElixirSyntaxHighlighter.kt
index 40385a472..19489b973 100644
--- a/src/org/elixir_lang/ElixirSyntaxHighlighter.kt
+++ b/src/org/elixir_lang/ElixirSyntaxHighlighter.kt
@@ -222,8 +222,8 @@ class ElixirSyntaxHighlighter : SyntaxHighlighterBase() {
             ('A'..'Z').flatMap { letter ->
                 arrayOf("LOWER", "UPPER").map { capitalization ->
                     val name: Char = when (capitalization) {
-                        "LOWER" -> letter.toLowerCase()
-                        "UPPER" -> letter.toUpperCase()
+                        "LOWER" -> letter.lowercaseChar()
+                        "UPPER" -> letter.uppercaseChar()
                         else -> '?'
                     }
 
@@ -235,8 +235,8 @@ class ElixirSyntaxHighlighter : SyntaxHighlighterBase() {
         val SIGIL_NAMES: kotlin.collections.List<Char> = ('A'..'Z').flatMap { letter ->
             arrayOf("LOWER", "UPPER").map { capitalization ->
                 val name: Char = when (capitalization) {
-                    "LOWER" -> letter.toLowerCase()
-                    "UPPER" -> letter.toUpperCase()
+                    "LOWER" -> letter.lowercaseChar()
+                    "UPPER" -> letter.uppercaseChar()
                     else -> '?'
                 }
                 name
@@ -247,8 +247,8 @@ class ElixirSyntaxHighlighter : SyntaxHighlighterBase() {
         val SIGIL_BY_NAME: Map<Char, TextAttributesKey> = ('A'..'Z').flatMap { letter ->
             arrayOf("LOWER", "UPPER").map { capitalization ->
                 val name: Char = when (capitalization) {
-                    "LOWER" -> letter.toLowerCase()
-                    "UPPER" -> letter.toUpperCase()
+                    "LOWER" -> letter.lowercaseChar()
+                    "UPPER" -> letter.uppercaseChar()
                     else -> '?'
                 }
                 name to TextAttributesKey.createTextAttributesKey("ELIXIR_SIGIL_${capitalization}_${letter}", SIGIL)
diff --git a/src/org/elixir_lang/UsageTypeProvider.kt b/src/org/elixir_lang/UsageTypeProvider.kt
index f0f92da1c..888cdb42e 100644
--- a/src/org/elixir_lang/UsageTypeProvider.kt
+++ b/src/org/elixir_lang/UsageTypeProvider.kt
@@ -15,7 +15,7 @@ import org.elixir_lang.psi.call.qualification.Qualified
 import org.elixir_lang.reference.Callable
 
 class UsageTypeProvider : com.intellij.usages.impl.rules.UsageTypeProviderEx {
-    override fun getUsageType(element: PsiElement?, targets: Array<out UsageTarget>): UsageType? =
+    override fun getUsageType(element: PsiElement, targets: Array<UsageTarget>): UsageType? =
         when (element) {
             is AtUnqualifiedNoParenthesesCall<*> -> MODULE_ATTRIBUTE_ACCUMULATE_OR_OVERRIDE
             is AtOperation -> MODULE_ATTRIBUTE_READ
@@ -26,7 +26,7 @@ class UsageTypeProvider : com.intellij.usages.impl.rules.UsageTypeProviderEx {
 
     override fun getUsageType(element: PsiElement): UsageType? = getUsageType(element, emptyArray())
 
-    private fun getUsageType(targets: Array<out UsageTarget>): UsageType? =
+    private fun getUsageType(targets: Array<UsageTarget>): UsageType? =
         targets.mapNotNull { getUsageType(it) }.fold(null as UsageType?) { acc, targetUsageType ->
             when {
                 acc == targetUsageType ->
@@ -65,7 +65,7 @@ class UsageTypeProvider : com.intellij.usages.impl.rules.UsageTypeProviderEx {
             else -> null
         }
 
-    private fun getUsageType(call: Call, targets: Array<out UsageTarget>): UsageType? =
+    private fun getUsageType(call: Call, targets: Array<UsageTarget>): UsageType? =
         when (ReadWriteAccessDetector.getExpressionAccess(call)) {
             com.intellij.codeInsight.highlighting.ReadWriteAccessDetector.Access.Read -> getReadUsageType(call, targets)
             com.intellij.codeInsight.highlighting.ReadWriteAccessDetector.Access.Write -> getWriteUsageType(call)
@@ -101,7 +101,7 @@ class UsageTypeProvider : com.intellij.usages.impl.rules.UsageTypeProviderEx {
                 null
         }
 
-    private fun getReadUsageType(call: Call, targets: Array<out UsageTarget>): UsageType {
+    private fun getReadUsageType(call: Call, targets: Array<UsageTarget>): UsageType {
         return when {
             CallDefinitionClause.isFunction(call) -> FUNCTION_CALL
             CallDefinitionClause.isMacro(call) -> MACRO_CALL
@@ -156,7 +156,7 @@ private val MACRO_DEFINITION_CLAUSE = UsageType { "Macro definition clause" }
 private val REMOTE_CALL = UsageType { "Remote call" }
 private val USE = UsageType { "Use" }
 
-private fun Array<out UsageTarget>.anyEquivalentElement(element: PsiElement): Boolean =
+private fun Array<UsageTarget>.anyEquivalentElement(element: PsiElement): Boolean =
     element.manager.let { manager ->
         this.any {
             manager.areElementsEquivalent(element, (it as? PsiElement2UsageTargetAdapter)?.element)
diff --git a/src/org/elixir_lang/beam/chunk/elixir_documentation/CallbackDoc.kt b/src/org/elixir_lang/beam/chunk/elixir_documentation/CallbackDoc.kt
index ea893ed20..28f0c9faa 100644
--- a/src/org/elixir_lang/beam/chunk/elixir_documentation/CallbackDoc.kt
+++ b/src/org/elixir_lang/beam/chunk/elixir_documentation/CallbackDoc.kt
@@ -14,19 +14,21 @@ data class CallbackDoc(val nameArity: NameArity, val line: Int, val kind: Kind,
         CALLBACK,
         MACROCALLBACK;
 
-        val attributeName: String by lazy { name.toLowerCase() }
+        val attributeName: String by lazy { name.lowercase() }
         val attribute: String by lazy { "@$attributeName" }
 
         companion object {
             private val KIND_BY_ATTRIBUTE_NAME =
-                    Kind.values().associateBy { it.attributeName }
+                Kind.values().associateBy { it.attributeName }
 
             fun from(term: OtpErlangObject): Kind? =
                 when (term) {
                     is OtpErlangAtom ->
-                            from(term)
+                        from(term)
+
                     else -> {
-                        logger.error("""
+                        logger.error(
+                            """
                                      Kind `${term.javaClass}` is not an `OtpErlangAtom`
 
                                      ## kind
@@ -34,7 +36,8 @@ data class CallbackDoc(val nameArity: NameArity, val line: Int, val kind: Kind,
                                      ```elixir
                                      ${inspect(term)}
                                      ```
-                                     """)
+                                     """
+                        )
 
                         null
                     }
@@ -53,7 +56,8 @@ data class CallbackDoc(val nameArity: NameArity, val line: Int, val kind: Kind,
             when (term) {
                 is OtpErlangTuple -> from(term)
                 else -> {
-                    logger.error("""
+                    logger.error(
+                        """
                                  :callback_docs element is not a tuple
 
                                  ## element
@@ -61,7 +65,8 @@ data class CallbackDoc(val nameArity: NameArity, val line: Int, val kind: Kind,
                                  ```elixir
                                  ${inspect(term)}
                                  ```
-                                 """.trimIndent())
+                                 """.trimIndent()
+                    )
 
                     null
                 }
@@ -82,19 +87,20 @@ data class CallbackDoc(val nameArity: NameArity, val line: Int, val kind: Kind,
                     null
                 }
             } else {
-                logger.error("""
+                logger.error(
+                    """
                              :callback_docs element tuple arity ($arity) is not 4
 
                              ```elixir
                              ${inspect(tuple)}
                              ```
-                             """.trimIndent())
+                             """.trimIndent()
+                )
 
                 null
             }
         }
 
 
-
     }
 }
diff --git a/src/org/elixir_lang/beam/chunk/elixir_documentation/Doc.kt b/src/org/elixir_lang/beam/chunk/elixir_documentation/Doc.kt
index 2c8eed08c..bddbfc884 100644
--- a/src/org/elixir_lang/beam/chunk/elixir_documentation/Doc.kt
+++ b/src/org/elixir_lang/beam/chunk/elixir_documentation/Doc.kt
@@ -10,13 +10,15 @@ import org.elixir_lang.NameArity
 import org.elixir_lang.beam.chunk.ElixirDocumentation.Companion.doc
 import org.elixir_lang.beam.term.inspect
 import org.elixir_lang.beam.term.line
+import java.util.Locale
+import java.util.Locale.getDefault
 
 data class Doc(val nameArity: NameArity, val line: Int, val kind: Kind, val arguments: List<String>, val doc: Any?) {
     enum class Kind {
         DEF,
         DEFMACRO;
 
-        val macro: String by lazy { name.toLowerCase() }
+        val macro: String by lazy { name.lowercase(getDefault()) }
 
         companion object {
             private val KIND_BY_MACRO = Kind.values().associateBy { it.macro }
diff --git a/src/org/elixir_lang/beam/chunk/elixir_documentation/TypeDoc.kt b/src/org/elixir_lang/beam/chunk/elixir_documentation/TypeDoc.kt
index 5ed1cc54f..94f6edfd5 100644
--- a/src/org/elixir_lang/beam/chunk/elixir_documentation/TypeDoc.kt
+++ b/src/org/elixir_lang/beam/chunk/elixir_documentation/TypeDoc.kt
@@ -15,7 +15,7 @@ class TypeDoc(val nameArity: NameArity, val line: Int, val kind: Kind, val doc:
         TYPE,
         TYPEP;
 
-        val attributeName: String by lazy { name.toLowerCase() }
+        val attributeName: String by lazy { name.lowercase() }
         val attribute: String by lazy { "@$attributeName" }
 
         companion object {
diff --git a/src/org/elixir_lang/distillery/Configuration.kt b/src/org/elixir_lang/distillery/Configuration.kt
index 09640771d..d80ae25f1 100644
--- a/src/org/elixir_lang/distillery/Configuration.kt
+++ b/src/org/elixir_lang/distillery/Configuration.kt
@@ -108,7 +108,7 @@ class Configuration(name: String, project: Project, configurationFactory: Config
         }
 
     var codeLoadingMode: CodeLoadingMode?
-        get() = _envs[CODE_LOADING_MODE]?.let { CodeLoadingMode.valueOf(it.toUpperCase()) }
+        get() = _envs[CODE_LOADING_MODE]?.let { CodeLoadingMode.valueOf(it.uppercase()) }
         set(codeLoadingMode) {
             if (codeLoadingMode == null) {
                 _envs.remove(CODE_LOADING_MODE)
diff --git a/src/org/elixir_lang/distillery/configuration/editor/CodeLoadingMode.kt b/src/org/elixir_lang/distillery/configuration/editor/CodeLoadingMode.kt
index 1def0e30a..03ea7b2df 100644
--- a/src/org/elixir_lang/distillery/configuration/editor/CodeLoadingMode.kt
+++ b/src/org/elixir_lang/distillery/configuration/editor/CodeLoadingMode.kt
@@ -2,9 +2,9 @@ package org.elixir_lang.distillery.configuration.editor
 
 enum class CodeLoadingMode {
     EMBEDDED {
-        override fun toString(): String = super.toString().toLowerCase()
+        override fun toString(): String = super.toString().lowercase()
     },
     INTERACTIVE {
-        override fun toString(): String = super.toString().toLowerCase()
+        override fun toString(): String = super.toString().lowercase()
     }
 }
diff --git a/src/org/elixir_lang/documentation/ElixirDocumentationProvider.kt b/src/org/elixir_lang/documentation/ElixirDocumentationProvider.kt
index d69c298b9..949b676ca 100644
--- a/src/org/elixir_lang/documentation/ElixirDocumentationProvider.kt
+++ b/src/org/elixir_lang/documentation/ElixirDocumentationProvider.kt
@@ -4,7 +4,7 @@ import com.ericsson.otp.erlang.OtpErlangBinary
 import com.ericsson.otp.erlang.OtpErlangObject
 import com.intellij.lang.documentation.DocumentationMarkup
 import com.intellij.lang.documentation.DocumentationProvider
-import com.intellij.lang.parser.GeneratedParserUtilBase.DummyBlock
+import com.intellij.psi.DummyBlockType.DummyBlock
 import com.intellij.openapi.editor.Editor
 import com.intellij.openapi.project.Project
 import com.intellij.openapi.util.TextRange
diff --git a/src/org/elixir_lang/exunit/TestLineMarkerProvider.kt b/src/org/elixir_lang/exunit/TestLineMarkerProvider.kt
index 2744d3410..73ebe0f6b 100644
--- a/src/org/elixir_lang/exunit/TestLineMarkerProvider.kt
+++ b/src/org/elixir_lang/exunit/TestLineMarkerProvider.kt
@@ -59,7 +59,7 @@ class ExUnitLineMarkerProvider : RunLineMarkerContributor() {
         if (SystemUtils.IS_OS_WINDOWS) {
             // In Elixir, the drive letter is lowercase for some reason.
             val location = "file://".length
-            url = url.replaceRange(location, location + 1, url[location].toLowerCase().toString())
+            url = url.replaceRange(location, location + 1, url[location].lowercaseChar().toString())
         }
         val state = TestStateStorage.getInstance(element.project)?.getState(url)
         return withExecutorActions(getTestStateIcon(state, isClass))
diff --git a/src/org/elixir_lang/find_usages/handler/Call.kt b/src/org/elixir_lang/find_usages/handler/Call.kt
index 5a5ed77de..8b4a69ccd 100644
--- a/src/org/elixir_lang/find_usages/handler/Call.kt
+++ b/src/org/elixir_lang/find_usages/handler/Call.kt
@@ -108,3 +108,4 @@ private fun Iterable<CallNameArityInterval>.withEnclosingModularMacroCall():
 
 private fun Iterable<EnclosingCallEnclosedCallNameArityInterval>.toSecondaryElements(): List<PsiElement> =
         this.flatMap { it.toSecondaryElements() }
+
diff --git a/src/org/elixir_lang/injection/markdown/Injector.kt b/src/org/elixir_lang/injection/markdown/Injector.kt
index 5bc20e05d..a76219ead 100644
--- a/src/org/elixir_lang/injection/markdown/Injector.kt
+++ b/src/org/elixir_lang/injection/markdown/Injector.kt
@@ -4,9 +4,9 @@ import com.intellij.lang.injection.MultiHostInjector
 import com.intellij.lang.injection.MultiHostRegistrar
 import com.intellij.openapi.diagnostic.RuntimeExceptionWithAttachments
 import com.intellij.openapi.util.TextRange
+import com.intellij.openapi.util.registry.Registry
 import com.intellij.psi.PsiElement
 import org.elixir_lang.ElixirLanguage
-import org.elixir_lang.errorreport.Logger
 import org.elixir_lang.psi.*
 import org.elixir_lang.psi.impl.stripAccessExpression
 import org.elixir_lang.reference.ModuleAttribute.Companion.DOCUMENTATION_NAME_SET
@@ -25,9 +25,37 @@ class Injector : MultiHostInjector {
             ?.let { getLanguagesToInjectInQuote(registrar, it) }
     }
 
+    /**
+     * Returns true if we should inject into literal sigils (~S, ~W, …).
+     * By default this is **disabled** to avoid SmartPsiElementPointer issues in IntelliJ 2025.1+.
+     * Can be enabled via Registry for testing or if using older IntelliJ versions.
+     */
+    private fun literalSigilInjectionEnabled(): Boolean =
+        Registry.`is`(REG_KEY_ENABLE_LITERAL_SIGIL_INJECTION, false)
+
     private fun getLanguagesToInjectInQuote(registrar: MultiHostRegistrar, documentation: PsiElement) {
         when (documentation) {
+            is SigilHeredoc -> {
+                // Handle sigil heredocs (like ~s"""...""" or ~S"""...""")
+                val isLiteral = isLiteralSigil(documentation)
+
+                if (isLiteral) {
+                    // Literal sigils (~S""") - inject with caution due to IntelliJ 2025.1+ issues
+                    val injectionEnabled = literalSigilInjectionEnabled()
+
+                    if (injectionEnabled) {
+                        // If enabled via Registry, inject Markdown only (no nested Elixir)
+                        injectMarkdownInQuote(registrar, documentation)
+                    }
+                    // If disabled, no injection occurs to avoid SmartPsiElementPointer crashes
+                } else {
+                    // Interpolating sigils (~s""") - inject Elixir code blocks only
+                    injectElixirInCodeBlocksInQuote(registrar, documentation)
+                }
+            }
+
             is Heredoc -> {
+                // Handle regular heredocs (like """...""" or '''...''')
                 injectMarkdownInQuote(registrar, documentation)
                 injectElixirInCodeBlocksInQuote(registrar, documentation)
             }
@@ -62,24 +90,22 @@ class Injector : MultiHostInjector {
                     "deprecated" -> getLanguagesToInjectInQuote(registrar, documentation.keywordValue)
                     "authors", "group", "guard", "request_body", "responses", "since", "type" -> Unit
                     else -> {
-                        Logger.error(
-                            javaClass,
+                        LOGGER.error(
                             "Do not known whether to inject Markdown in documentation key $key",
-                            documentation
                         )
                     }
                 }
             }
 
             else -> {
-                Logger.error(javaClass, "Do not know whether to inject Markdown in documentation", documentation)
+                LOGGER.error("Do not know whether to inject Markdown in documentation")
             }
         }
     }
 
     private fun injectMarkdownInQuote(registrar: MultiHostRegistrar, documentation: Heredoc) {
         var injectionStarted = false
-        val prefixLength = documentation.heredocPrefix.textLength
+        val prefixLength = documentation.heredocPrefix?.textLength ?: 0
         val quoteOffset = documentation.textOffset
         var listIndent = -1
         var inException = false
@@ -165,7 +191,7 @@ class Injector : MultiHostInjector {
                 try {
                     registrar.addPlace(null, null, documentation, textRangeInQuote)
                 } catch (exception: RuntimeExceptionWithAttachments) {
-                    Logger.error(javaClass, "Cannot inject markdown in Heredoc", documentation)
+                    LOGGER.error("Cannot inject markdown in Heredoc - exception: $exception", exception)
                 }
             }
         }
@@ -187,7 +213,7 @@ class Injector : MultiHostInjector {
     private fun injectElixirInCodeBlocksInQuote(registrar: MultiHostRegistrar, documentation: Heredoc) {
         registrar.startInjecting(MarkdownLanguage.INSTANCE)
 
-        val prefixLength = documentation.heredocPrefix.textLength
+        val prefixLength = documentation.heredocPrefix?.textLength ?: 0
         val quoteOffset = documentation.textOffset
         var inCodeBlock = false
         var listIndent = -1
@@ -293,6 +319,7 @@ class Injector : MultiHostInjector {
         listOf(AtUnqualifiedNoParenthesesCall::class.java)
 
     companion object {
+        private val LOGGER = com.intellij.openapi.diagnostic.Logger.getInstance(Injector::class.java)
         private const val CODE_BLOCK_INDENT = "    "
         private const val CODE_BLOCK_INDENT_LENGTH = CODE_BLOCK_INDENT.length
         private const val IEX_PROMPT = "iex> "
@@ -306,5 +333,18 @@ class Injector : MultiHostInjector {
 
         fun isValidHost(atUnqualifiedNoParenthesesCall: AtUnqualifiedNoParenthesesCall<*>): Boolean =
             atUnqualifiedNoParenthesesCall.atIdentifier.lastChild?.text in DOCUMENTATION_NAME_SET
+
+        /**
+         * Registry key to control literal sigil injection behavior.
+         *
+         * Path: Help -> Find Action… -> "Registry…" -> search for this key name
+         */
+        const val REG_KEY_ENABLE_LITERAL_SIGIL_INJECTION =
+            "org.elixir_lang.injection.enableLiteralSigilInjection"
+
+        private fun isLiteralSigil(heredoc: Heredoc): Boolean {
+            val prefix = heredoc.heredocPrefix?.text ?: return false
+            return prefix.length >= 2 && prefix[0] == '~' && prefix[1].isUpperCase()
+        }
     }
 }
diff --git a/src/org/elixir_lang/sdk/elixir/Type.kt b/src/org/elixir_lang/sdk/elixir/Type.kt
index da14369f5..c0192c7e1 100644
--- a/src/org/elixir_lang/sdk/elixir/Type.kt
+++ b/src/org/elixir_lang/sdk/elixir/Type.kt
@@ -2,12 +2,13 @@ package org.elixir_lang.sdk.elixir
 
 import com.intellij.facet.FacetManager
 import com.intellij.openapi.application.ApplicationManager
-import com.intellij.openapi.application.ModalityState
 import com.intellij.openapi.application.ReadAction
+import com.intellij.openapi.application.writeAction
 import com.intellij.openapi.diagnostic.Logger
 import com.intellij.openapi.fileChooser.FileChooserDescriptor
 import com.intellij.openapi.module.Module
 import com.intellij.openapi.module.ModuleUtilCore
+import com.intellij.openapi.progress.runBlockingCancellable
 import com.intellij.openapi.project.Project
 import com.intellij.openapi.project.ProjectBundle
 import com.intellij.openapi.projectRoots.*
@@ -326,12 +327,21 @@ ELIXIR_SDK_HOME
 
         private fun configureSdkPaths(sdk: Sdk) {
             val sdkModificator = sdk.sdkModificator
-            org.elixir_lang.sdk.Type
-                .addCodePaths(sdkModificator)
+
+            // Configure base paths
+            org.elixir_lang.sdk.Type.addCodePaths(sdkModificator)
             addDocumentationPaths(sdkModificator)
             addSourcePaths(sdkModificator)
+
+            // Configure internal Erlang SDK - this will now create and fully setup the Erlang SDK synchronously
             configureInternalErlangSdk(sdk, sdkModificator)
-            ApplicationManager.getApplication().runWriteAction { sdkModificator.commitChanges() }
+
+            // Use coroutine-based approach for final commit for IntelliJ 2025.2+ compatibility
+            runBlockingCancellable {
+                writeAction {
+                    sdkModificator.commitChanges()
+                }
+            }
         }
 
         private fun configureInternalErlangSdk(
@@ -471,16 +481,23 @@ ELIXIR_SDK_HOME
         ): Sdk? {
             val sdkName = erlangSdkType.suggestSdkName("Default " + erlangSdkType.name, homePath)
             val projectJdkImpl = ProjectJdkImpl(sdkName, erlangSdkType)
-            projectJdkImpl.homePath = homePath
-            erlangSdkType.setupSdkPaths(projectJdkImpl)
+            var modificator = projectJdkImpl.sdkModificator
+            modificator.homePath = homePath
 
             return if (projectJdkImpl.versionString != null) {
-                ApplicationManager.getApplication().invokeAndWait(
-                    {
-                        ApplicationManager.getApplication().runWriteAction { projectJdkTable.addJdk(projectJdkImpl) }
-                    },
-                    ModalityState.NON_MODAL,
-                )
+                // First commit the basic SDK setup
+                modificator.commitChanges()
+
+                // Add to SDK table and setup paths using coroutine-based approach
+                runBlockingCancellable {
+                    writeAction {
+                        projectJdkTable.addJdk(projectJdkImpl)
+
+                        // Setup SDK paths - this will work properly within the write action
+                        erlangSdkType.setupSdkPaths(projectJdkImpl)
+                    }
+                }
+
                 projectJdkImpl
             } else {
                 null
diff --git a/src/org/elixir_lang/sdk/erlang/Type.kt b/src/org/elixir_lang/sdk/erlang/Type.kt
index f056ee33e..0c04da0a5 100644
--- a/src/org/elixir_lang/sdk/erlang/Type.kt
+++ b/src/org/elixir_lang/sdk/erlang/Type.kt
@@ -2,7 +2,9 @@ package org.elixir_lang.sdk.erlang
 
 import com.intellij.execution.ExecutionException
 import com.intellij.openapi.application.ApplicationManager
+import com.intellij.openapi.application.writeAction
 import com.intellij.openapi.diagnostic.Logger
+import com.intellij.openapi.progress.runBlockingCancellable
 import com.intellij.openapi.projectRoots.Sdk
 import com.intellij.openapi.projectRoots.SdkModel
 import com.intellij.openapi.projectRoots.SdkModificator
@@ -117,7 +119,19 @@ class Type : SdkType("Erlang SDK for Elixir SDK") {
         val sdkModificator = sdk.sdkModificator
         org.elixir_lang.sdk.Type
             .addCodePaths(sdkModificator)
-        ApplicationManager.getApplication().runWriteAction { sdkModificator.commitChanges() }
+
+        // Check if we're already in a write action (called from Elixir SDK setup)
+        if (ApplicationManager.getApplication().isWriteAccessAllowed) {
+            // We're already in a write action, commit directly
+            sdkModificator.commitChanges()
+        } else {
+            // Use coroutine-based approach for IntelliJ 2025.2+ compatibility when called independently
+            runBlockingCancellable {
+                writeAction {
+                    sdkModificator.commitChanges()
+                }
+            }
+        }
     }
 
     override fun suggestHomePath(): String? = suggestHomePaths().firstOrNull()
diff --git a/src/org/elixir_lang/spell_checking/literal/Splitter.kt b/src/org/elixir_lang/spell_checking/literal/Splitter.kt
index 5c9f4389b..7c0b52fa5 100644
--- a/src/org/elixir_lang/spell_checking/literal/Splitter.kt
+++ b/src/org/elixir_lang/spell_checking/literal/Splitter.kt
@@ -6,7 +6,7 @@ import com.intellij.spellchecker.inspections.PlainTextSplitter
 import com.intellij.util.Consumer
 
 object Splitter : BaseSplitter() {
-    override fun split(text: String?, range: TextRange, consumer: Consumer<TextRange>?) {
+    override fun split(text: String?, range: TextRange, consumer: Consumer<TextRange>) {
         if (text != null && 1 <= range.length && 0 <= range.startOffset) {
             val nonescapedTextRangeList = excludeByPattern(text, range, ESCAPE_SEQUENCE_PATTERN, 0)
 
diff --git a/tests/org/elixir_lang/PlatformTestCase.kt b/tests/org/elixir_lang/PlatformTestCase.kt
index 2aa5f03fd..a1a67ef58 100644
--- a/tests/org/elixir_lang/PlatformTestCase.kt
+++ b/tests/org/elixir_lang/PlatformTestCase.kt
@@ -1,14 +1,25 @@
 package org.elixir_lang
 
+import com.intellij.openapi.util.registry.Registry
 import com.intellij.testFramework.fixtures.BasePlatformTestCase
-import java.lang.Exception
+import org.elixir_lang.injection.markdown.Injector
 
 @org.junit.Ignore("abstract")
 open class PlatformTestCase : BasePlatformTestCase() {
+
+    @Throws(Exception::class)
+    override fun setUp() {
+        super.setUp()
+
+        // Enable literal sigil injection for tests to maintain backward compatibility
+        Registry.get(Injector.REG_KEY_ENABLE_LITERAL_SIGIL_INJECTION).setValue(true)
+    }
+
     @Throws(Exception::class)
     override fun tearDown() {
         try {
-            super.tearDown()
+            // Reset registry to default
+            Registry.get(Injector.REG_KEY_ENABLE_LITERAL_SIGIL_INJECTION).resetToDefault()
         } catch (e: Exception) {
 
         }