updated build scripts according to few changes in plugin template

Evolveum · Dec 7, 2023 · f7db4a6 · f7db4a6
1 parent 2dd6d2b
commit f7db4a6
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 7 deletions.
diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -8,6 +8,10 @@ pluginManagement {
     }
 }
 
+plugins {
+    id("org.gradle.toolchains.foojay-resolver-convention") version "0.7.0"
+}
+
 dependencyResolutionManagement {
     versionCatalogs {
         create("libs") {

diff --git a/studio-idea-plugin/build.gradle.kts b/studio-idea-plugin/build.gradle.kts
@@ -133,7 +133,11 @@ if (customSandboxDir == null || customSandboxDir.isBlank()) {
 }
 
 kotlin {
-    jvmToolchain(17)
+    @Suppress("UnstableApiUsage")
+    jvmToolchain {
+        languageVersion = JavaLanguageVersion.of(17)
+        vendor = JvmVendorSpec.JETBRAINS
+    }
 }
 
 // Configure gradle-intellij-plugin plugin.

diff --git a/studio-idea-plugin/gradle.properties b/studio-idea-plugin/gradle.properties
@@ -15,20 +15,28 @@ pluginUntilBuild = 233.*
 pluginVerifierIdeVersions = IC-2023.1.5, IC-2023.2.2, IC-2023.3
 
 platformType = IC
-#platformVersion = LATEST-EAP-SNAPSHOT
+platformVersion = 2023.3
 #platformVersion = 2023.2.2
-platformVersion = 2023.1.5
+#platformVersion = 2023.1.5
 platformDownloadSources = true
 # Plugin Dependencies -> https://plugins.jetbrains.com/docs/intellij/plugin-dependencies.html
 # Example: platformPlugins = com.intellij.java, com.jetbrains.php:203.4449.22
-#platformPlugins = java, Groovy, maven, PsiViewer:233.2, com.jetbrains.hackathon.indices.viewer:1.25
+platformPlugins = java, Groovy, maven, PsiViewer:233.2, com.jetbrains.hackathon.indices.viewer:1.25
 #platformPlugins = java, Groovy, maven, PsiViewer:232.2-SNAPSHOT, com.jetbrains.hackathon.indices.viewer:1.23
-platformPlugins = java, Groovy, maven, PsiViewer:231-SNAPSHOT, com.jetbrains.hackathon.indices.viewer:1.23
+#platformPlugins = java, Groovy, maven, PsiViewer:231-SNAPSHOT, com.jetbrains.hackathon.indices.viewer:1.23
 
-# Opt-out flag for bundling Kotlin standard library.
-# See https://kotlinlang.org/docs/reference/using-gradle.html#dependency-on-the-standard-library for details.
+# Opt-out flag for bundling Kotlin standard library -> https://jb.gg/intellij-platform-kotlin-stdlib
 kotlin.stdlib.default.dependency = false
 
+# Enable Gradle Configuration Cache -> https://docs.gradle.org/current/userguide/configuration_cache.html
+org.gradle.configuration-cache = true
+
+# Enable Gradle Build Cache -> https://docs.gradle.org/current/userguide/build_cache.html
+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
+
 buildNumber=0
 publishChannel=
 gitLocalBranch=