From f05fb3dbbb23da435cbead8b0707d42c120932e1 Mon Sep 17 00:00:00 2001
From: Joe Roskopf <7951665+j-roskopf@users.noreply.github.com>
Date: Thu, 20 Mar 2025 19:23:24 -0500
Subject: [PATCH] Platform updates

---
 CHANGELOG.md                             | 3 +++
 build.gradle.kts                         | 8 ++++++--
 gradle.properties                        | 8 ++++----
 gradle/libs.versions.toml                | 4 ++--
 gradle/wrapper/gradle-wrapper.properties | 2 +-
 5 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6f8f29b..7f19428 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,8 @@
 # Module Maker Changelog
 
+## [1.1.1]
+- Platform updates
+
 ## [1.1.0]
 - Support Multiplatform modules
 
diff --git a/build.gradle.kts b/build.gradle.kts
index 8ee18e9..19da77f 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -23,6 +23,9 @@ buildscript {
         mavenCentral()
         google()
         maven { url = uri("https://plugins.gradle.org/m2/") }
+        maven {
+            url = uri("https://www.jetbrains.com/intellij-repository/releases")
+        }
     }
 }
 
@@ -48,7 +51,7 @@ dependencies {
     implementation(compose.materialIconsExtended)
     implementation(libs.segment)
 
-    val version = "0.8.10"
+    val version = "0.8.18"
     val macTarget = "macos-arm64"
     val windowsTarget = "windows-x64"
     val linuxTarget = "linux-x64"
@@ -61,6 +64,7 @@ dependencies {
 
     // IntelliJ Platform Gradle Plugin Dependencies Extension - read more: https://plugins.jetbrains.com/docs/intellij/tools-intellij-platform-gradle-plugin-dependencies-extension.html
     intellijPlatform {
+        javaCompiler("243.26053.29") // https://github.com/JetBrains/intellij-platform-gradle-plugin/issues/1894
         create(properties("platformType").get(), properties("platformVersion").get())
 
         // Plugin Dependencies. Uses `platformBundledPlugins` property from the gradle.properties file for bundled IntelliJ Platform plugins.
@@ -69,7 +73,7 @@ dependencies {
         // Plugin Dependencies. Uses `platformPlugins` property from the gradle.properties file for plugin from JetBrains Marketplace.
         plugins(properties("platformPlugins").map { it.split(',') })
 
-        instrumentationTools()
+        // instrumentationTools()
         pluginVerifier()
         zipSigner()
     }
diff --git a/gradle.properties b/gradle.properties
index ce50647..b085eb5 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -4,7 +4,7 @@ pluginGroup = com.joetr.modulemaker
 pluginName = ModuleMaker
 pluginRepositoryUrl = https://github.com/j-roskopf/ModuleMakerPlugin
 # SemVer format -> https://semver.org
-pluginVersion = 1.1.0
+pluginVersion = 1.1.1
 
 # Supported build number ranges and IntelliJ Platform versions -> https://plugins.jetbrains.com/docs/intellij/build-number-ranges.html
 pluginSinceBuild = 222
@@ -13,7 +13,7 @@ pluginSinceBuild = 222
 # IntelliJ Platform Properties -> https://plugins.jetbrains.com/docs/intellij/tools-gradle-intellij-plugin.html#configuration-intellij-extension
 platformType = AI
 # AS version and patch at the end
-platformVersion = 2024.1.2.1
+platformVersion = 2024.3.1.1
 
 # Example: platformBundledPlugins = com.intellij.java
 platformBundledPlugins = com.intellij.java
@@ -24,7 +24,7 @@ platformPlugins =
 
 # Gradle Releases -> https://github.com/gradle/gradle/releases
 # update gradle-wrapper.properties and run ./gradlew wrapper
-gradleVersion = 8.9
+gradleVersion = 8.13
 
 # Opt-out flag for bundling Kotlin standard library -> https://jb.gg/intellij-platform-kotlin-stdlib
 kotlin.stdlib.default.dependency = false
@@ -39,4 +39,4 @@ org.gradle.caching = true
 # Enable Gradle Kotlin DSL Lazy Property Assignment -> https://docs.gradle.org/current/userguide/kotlin_dsl.html#kotdsl:assignment
 systemProp.org.gradle.unsafe.kotlin.assignment = true
 
-compose.version=1.6.11
+compose.version=1.7.3
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index c07b610..5299255 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -2,9 +2,9 @@
 freemarker = "2.3.30"
 serialization = "1.5.1"
 jdk = "17"
-kotlin = "2.0.20"
+kotlin = "2.1.20"
 changelog = "2.0.0"
-gradleIntelliJPlugin = "2.0.1"
+gradleIntelliJPlugin = "2.4.0"
 spotless = "6.8.0"
 segment = "1.13.2"
 junit = "4.13.2"
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 09523c0..37f853b 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.9-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME