Merge pull request doki-theme#124 from doki-theme/2025.1

2025.1 Build Support

Author: Unthrottled

.github/workflows/build.yml

@@ -48,65 +48,27 @@ jobs:
       - name: Gradle Wrapper Validation
         uses: gradle/wrapper-validation-action@v1.0.6
 
-      # Setup Java 17 environment for the next steps
+      # Setup Java 21 environment for the next steps
       - name: Setup Java
         uses: actions/setup-java@v3
         with:
           distribution: zulu
-          java-version: 17
+          java-version: 21
 
       - name: Grant execute permission for scripts
         run: chmod +x getMasterThemes.sh
       - name: Pull down the Master Themes
         run: ./getMasterThemes.sh
 
-      # Set environment variables
-      - name: Export Properties
-        id: properties
-        shell: bash
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        run: |
-          PROPERTIES="$(./gradlew properties --console=plain -q)"
-          VERSION="$(echo "$PROPERTIES" | grep "^version:" | cut -f2- -d ' ')"
-          NAME="$(echo "$PROPERTIES" | grep "^pluginName:" | cut -f2- -d ' ')"
-
-          echo "::set-output name=version::$VERSION"
-          echo "::set-output name=name::$NAME"
-          echo "::set-output name=pluginVerifierHomeDir::~/.pluginVerifier"
-
-          ./gradlew listProductsReleases # prepare list of IDEs for Plugin Verifier
-
       - name: Perform QA
         env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           IS_CI: 'true'
         run: ./gradlew check
 
-      # Collect Tests Result of failed tests
-      - name: Collect Tests Result
-        if: ${{ failure() }}
-        uses: actions/upload-artifact@v3
-        with:
-          name: tests-result
-          path: ${{ github.workspace }}/build/reports/tests
-
-      # Cache Plugin Verifier IDEs
-      - name: Setup Plugin Verifier IDEs Cache
-        uses: actions/cache@v3
-        with:
-          path: ${{ steps.properties.outputs.pluginVerifierHomeDir }}/ides
-          key: plugin-verifier-${{ hashFiles('build/listProductsReleases.txt') }}
-
       # Run Verify Plugin task and IntelliJ Plugin Verifier tool
       - name: Run Plugin Verification tasks
         env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           IS_CI: 'true'
-        run: ./gradlew runPluginVerifier -Pplugin.verifier.home.dir=${{ steps.properties.outputs.pluginVerifierHomeDir }}
-
-      # Collect Plugin Verifier Result
-      - name: Collect Plugin Verifier Result
-        if: ${{ always() }}
-        uses: actions/upload-artifact@v3
-        with:
-          name: pluginVerifier-result
-          path: ${{ github.workspace }}/build/reports/pluginVerifier
+        run: ./gradlew verifyPlugin

.gitignore

@@ -31,4 +31,5 @@ masterThemes/
 build
 iconSource/
 iconSource
-tmp
+tmp
+.intellijPlatform/

CHANGELOG.md

@@ -4,6 +4,11 @@
 
 ## [Unreleased]
 
+#  88.5-1.6.0 [2025.1 Build Support]
+
+- Lowest supported version is now 2025.1
+- Compiles to the 2025.1 build
+
 #  88.5-1.5.0 [2024.3 Build Support]
 
 - Lowest supported version is now 2024.3

build.gradle.kts

@@ -1,41 +1,55 @@
-import org.jetbrains.changelog.markdownToHTML
+import org.jetbrains.intellij.platform.gradle.TestFrameworkType
 
-fun properties(key: String) = project.findProperty(key).toString()
+System.setProperty("HACK", "false")
 
 plugins {
   // Custom plugin for building all the themes
   id("doki-theme-plugin")
-  // Java support
-  id("java")
-  // Kotlin support
-  kotlin("jvm") version "2.0.0"
-  // Gradle IntelliJ Plugin
-  id("org.jetbrains.intellij") version "1.16.1"
-  // Gradle Changelog Plugin
-  id("org.jetbrains.changelog") version "2.0.0"
-  // Gradle Qodana Plugin
-  id("org.jetbrains.qodana") version "0.1.13"
-  // detekt linter - read more: https://detekt.github.io/detekt/gradle.html
-  id("io.gitlab.arturbosch.detekt") version "1.23.1"
-  // ktlint linter - read more: https://github.com/JLLeitschuh/ktlint-gradle
-  id("org.jlleitschuh.gradle.ktlint") version "12.0.3"
+  id("java") // Java support
+  alias(libs.plugins.kotlin) // Kotlin support
+  alias(libs.plugins.intelliJPlatform) // IntelliJ Platform Gradle Plugin
 }
 
-group = properties("pluginGroup")
-version = properties("pluginVersion")
+group = providers.gradleProperty("pluginGroup").get()
+version = providers.gradleProperty("pluginVersion").get()
+
+// Set the JVM language level used to build the project.
+kotlin {
+  jvmToolchain(21)
+}
 
 // Configure project's dependencies
 repositories {
   mavenCentral()
+
+  // IntelliJ Platform Gradle Plugin Repositories Extension - read more: https://plugins.jetbrains.com/docs/intellij/tools-intellij-platform-gradle-plugin-repositories-extension.html
+  intellijPlatform {
+    defaultRepositories()
+  }
 }
 
+// Dependencies are managed with Gradle version catalog - read more: https://docs.gradle.org/current/userguide/platforms.html#sub:version-catalog
 dependencies {
+  implementation("commons-io:commons-io:2.15.1")
   implementation("org.javassist:javassist:3.29.2-GA")
-  implementation("commons-io:commons-io:2.11.0")
-  implementation("io.sentry:sentry:6.18.1")
-  testImplementation("org.assertj:assertj-core:3.24.2")
-  testImplementation("io.mockk:mockk:1.13.5")
-  testImplementation("org.junit.jupiter:junit-jupiter:5.9.3")
+  implementation("io.sentry:sentry:6.28.0")
+  testImplementation("org.assertj:assertj-core:3.25.3")
+  testImplementation("io.mockk:mockk:1.13.8")
+  testImplementation(libs.junit)
+  testImplementation(libs.opentest4j)
+
+  // IntelliJ Platform Gradle Plugin Dependencies Extension - read more: https://plugins.jetbrains.com/docs/intellij/tools-intellij-platform-gradle-plugin-dependencies-extension.html
+  intellijPlatform {
+    create(providers.gradleProperty("platformType"), providers.gradleProperty("platformVersion"))
+
+    // Plugin Dependencies. Uses `platformBundledPlugins` property from the gradle.properties file for bundled IntelliJ Platform plugins.
+    bundledPlugins(providers.gradleProperty("platformBundledPlugins").map { it.split(',') })
+
+    // Plugin Dependencies. Uses `platformPlugins` property from the gradle.properties file for plugin from JetBrains Marketplace.
+    plugins(providers.gradleProperty("platformPlugins").map { it.split(',') })
+
+    testFramework(TestFrameworkType.Platform)
+  }
 }
 
 configurations {
@@ -46,131 +60,101 @@ configurations {
   }
 }
 
-repositories {
-  mavenCentral()
-}
+// Configure IntelliJ Platform Gradle Plugin - read more: https://plugins.jetbrains.com/docs/intellij/tools-intellij-platform-gradle-plugin-extension.html
+intellijPlatform {
+  pluginConfiguration {
+    name = providers.gradleProperty("pluginName")
+    version = providers.gradleProperty("pluginVersion")
 
-// Set the JVM language level used to compile sources and generate files - Java 11 is required since 2020.3
-kotlin {
-  jvmToolchain {
-    languageVersion.set(JavaLanguageVersion.of(17))
+    // Extract the <!-- Plugin description --> section from README.md and provide for the plugin's manifest
+//    description = providers.fileContents(layout.projectDirectory.file("README.md")).asText.map {
+//      val start = "<!-- Plugin description -->"
+//      val end = "<!-- Plugin description end -->"
+//
+//      with(it.lines()) {
+//        if (!containsAll(listOf(start, end))) {
+//          throw GradleException("Plugin description section not found in README.md:\n$start ... $end")
+//        }
+//        subList(indexOf(start) + 1, indexOf(end)).joinToString("\n").let(::markdownToHTML)
+//      }
+//    }
+
+//    val changelog = project.changelog // local variable for configuration cache compatibility
+//    // Get the latest available change notes from the changelog file
+//    changeNotes = providers.gradleProperty("pluginVersion").map { pluginVersion ->
+//      with(changelog) {
+//        renderItem(
+//          (getOrNull(pluginVersion) ?: getUnreleased())
+//            .withHeader(false)
+//            .withEmptySections(false),
+//          Changelog.OutputType.HTML,
+//        )
+//      }
+//    }
+
+    ideaVersion {
+      sinceBuild = providers.gradleProperty("pluginSinceBuild")
+      untilBuild = providers.gradleProperty("pluginUntilBuild")
+    }
   }
-}
 
-// Configure detekt plugin.
-// Read more: https://detekt.github.io/detekt/kotlindsl.html
-detekt {
-  config = files("./detekt-config.yml")
-  buildUponDefaultConfig = true
-  autoCorrect = true
-
-  reports {
-    html.enabled = false
-    xml.enabled = false
-    txt.enabled = false
+  signing {
+    certificateChain = providers.environmentVariable("CERTIFICATE_CHAIN")
+    privateKey = providers.environmentVariable("PRIVATE_KEY")
+    password = providers.environmentVariable("PRIVATE_KEY_PASSWORD")
   }
-}
 
-tasks {
-  buildSearchableOptions {
-    enabled = false
+  publishing {
+    token = providers.environmentVariable("PUBLISH_TOKEN")
+    // The pluginVersion is based on the SemVer (https://semver.org) and supports pre-release labels, like 2.1.7-alpha.3
+    // Specify pre-release label to publish the plugin in a custom Release Channel automatically. Read more:
+    // https://plugins.jetbrains.com/docs/intellij/deployment.html#specifying-a-release-channel
+    channels = providers.gradleProperty("pluginVersion").map { listOf(it.substringAfter('-', "").substringBefore('.').ifEmpty { "default" }) }
   }
-}
-
-// Configure Gradle IntelliJ Plugin - read more: https://plugins.jetbrains.com/docs/intellij/tools-gradle-intellij-plugin.html
-intellij {
-  pluginName.set(properties("pluginName"))
-  version.set(properties("platformVersion"))
-  type.set(properties("platformType"))
-
-  // Plugin Dependencies. Uses `platformPlugins` property from the gradle.properties file.
-  val activePlugins: MutableList<Any> =
-    properties("platformPlugins").split(',').map(String::trim).filter(String::isNotEmpty).toMutableList()
-
-//  activePlugins.add(
-//    project(":doki-theme")
-//  )
 
-  plugins.set(activePlugins)
-}
-
-// Configure Gradle Changelog Plugin - read more: https://github.com/JetBrains/gradle-changelog-plugin
-changelog {
-  version.set(properties("pluginVersion"))
-  groups.set(emptyList())
-}
-
-// Configure Gradle Qodana Plugin - read more: https://github.com/JetBrains/gradle-qodana-plugin
-qodana {
-  cachePath.set(projectDir.resolve(".qodana").canonicalPath)
-  reportPath.set(projectDir.resolve("build/reports/inspections").canonicalPath)
-  saveReport.set(true)
-  showReport.set(System.getenv("QODANA_SHOW_REPORT")?.toBoolean() ?: false)
+  pluginVerification {
+    ides {
+      recommended()
+    }
+  }
 }
 
 tasks {
   wrapper {
-    gradleVersion = properties("gradleVersion")
+    gradleVersion = providers.gradleProperty("gradleVersion").get()
   }
 
-  compileKotlin {
-    dependsOn("buildThemes")
+  buildSearchableOptions {
+    environment["DOKI_HACK"] = "false"
   }
 
   patchPluginXml {
-    version.set(properties("pluginVersion"))
-    sinceBuild.set(properties("pluginSinceBuild"))
-    untilBuild.set(properties("pluginUntilBuild"))
-
-    // Extract the <!-- Plugin description --> section from README.md and provide for the plugin's manifest
-    pluginDescription.set(
-      projectDir.resolve("README.md").readText().lines().run {
-        val start = "<!-- Plugin description -->"
-        val end = "<!-- Plugin description end -->"
-
-        if (!containsAll(listOf(start, end))) {
-          throw GradleException("Plugin description section not found in README.md:\n$start ... $end")
-        }
-        subList(indexOf(start) + 1, indexOf(end))
-      }.joinToString("\n").run { markdownToHTML(this) },
-    )
-
-    changeNotes.set(
-      projectDir.resolve("RELEASE-NOTES.md").readText().run { markdownToHTML(this) },
-    )
+    dependsOn("buildThemes")
   }
+//  publishPlugin {
+//    dependsOn(patchChangelog)
+//  }
+}
 
+intellijPlatformTesting {
   runIde {
-    maxHeapSize = "2g"
-    systemProperty("idea.ui.icons.svg.disk.cache", "false")
-    systemProperty("idea.platform.prefix", properties("idePrefix"))
-    val idePath = properties("idePath")
-    if (idePath.isNotEmpty()) {
-      ideDir.set(file(idePath))
-    }
-  }
-
-  // Configure UI tests plugin
-  // Read more: https://github.com/JetBrains/intellij-ui-test-robot
-  runIdeForUiTests {
-    systemProperty("robot-server.port", "8082")
-    systemProperty("ide.mac.message.dialogs.as.sheets", "false")
-    systemProperty("jb.privacy.policy.text", "<!--999.999-->")
-    systemProperty("jb.consents.confirmation.enabled", "false")
-  }
-
-  signPlugin {
-    certificateChain.set(System.getenv("CERTIFICATE_CHAIN"))
-    privateKey.set(System.getenv("PRIVATE_KEY"))
-    password.set(System.getenv("PRIVATE_KEY_PASSWORD"))
-  }
+//    maxHeapSize = "2g"
+//    systemProperty("idea.ui.icons.svg.disk.cache", "false")
+    register("runIdeForUiTests") {
+      task {
+        jvmArgumentProviders += CommandLineArgumentProvider {
+          listOf(
+            "-Drobot-server.port=8082",
+            "-Dide.mac.message.dialogs.as.sheets=false",
+            "-Djb.privacy.policy.text=<!--999.999-->",
+            "-Djb.consents.confirmation.enabled=false",
+          )
+        }
+      }
 
-  publishPlugin {
-    dependsOn("patchChangelog")
-    token.set(System.getenv("PUBLISH_TOKEN"))
-    // pluginVersion is based on the SemVer (https://semver.org) and supports pre-release labels, like 2.1.7-alpha.3
-    // Specify pre-release label to publish the plugin in a custom Release Channel automatically. Read more:
-    // https://plugins.jetbrains.com/docs/intellij/deployment.html#specifying-a-release-channel
-    channels.set(listOf(properties("pluginVersion").split('-').getOrElse(1) { "default" }.split('.').first()))
+      plugins {
+        robotServerPlugin()
+      }
+    }
   }
-}
+}