diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 279cfa6..9751d16 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -28,9 +28,6 @@ jobs: - name: Fetch Sources uses: actions/checkout@v2 - - name: Gradle Wrapper Validation - uses: gradle/wrapper-validation-action@v1.0.3 - # Run verifyPlugin and test Gradle tasks test: name: Test @@ -41,24 +38,12 @@ jobs: - name: Setup Java uses: actions/setup-java@v2 with: - java-version: 17 + java-version: 21 distribution: 'zulu' - name: Fetch Sources uses: actions/checkout@v2 - - name: Setup Gradle Dependencies Cache - uses: actions/cache@v2.1.4 - with: - path: ~/.gradle/caches - key: ${{ runner.os }}-gradle-caches-${{ hashFiles('**/*.gradle', '**/*.gradle.kts', 'gradle.properties') }} - - - name: Setup Gradle Wrapper Cache - uses: actions/cache@v2.1.4 - with: - path: ~/.gradle/wrapper - key: ${{ runner.os }}-gradle-wrapper-${{ hashFiles('**/gradle/wrapper/gradle-wrapper.properties') }} - - name: Run Linters and Test run: ./gradlew check @@ -80,94 +65,12 @@ jobs: - name: Setup Java uses: actions/setup-java@v2 with: - java-version: 17 + java-version: 21 distribution: 'zulu' - name: Fetch Sources uses: actions/checkout@v2 - - name: Setup Gradle Dependencies Cache - uses: actions/cache@v2.1.4 - with: - path: ~/.gradle/caches - key: ${{ runner.os }}-gradle-caches-${{ hashFiles('**/*.gradle', '**/*.gradle.kts', 'gradle.properties') }} - - - name: Setup Gradle Wrapper Cache - uses: actions/cache@v2.1.4 - with: - path: ~/.gradle/wrapper - key: ${{ runner.os }}-gradle-wrapper-${{ hashFiles('**/gradle/wrapper/gradle-wrapper.properties') }} - - - name: Set environment variables - id: properties - shell: bash - run: | - PROPERTIES="$(./gradlew properties --console=plain -q)" - VERSION="$(echo "$PROPERTIES" | grep "^version:" | cut -f2- -d ' ')" - NAME="$(echo "$PROPERTIES" | grep "^pluginName_:" | cut -f2- -d ' ')" - ARTIFACT="${NAME}-${VERSION}.zip" - - echo "::set-output name=version::$VERSION" - echo "::set-output name=name::$NAME" - echo "::set-output name=artifact::$ARTIFACT" - - name: Build Plugin run: ./gradlew buildPlugin - # Upload plugin artifact to make it available in the next jobs - - name: Upload artifact - uses: actions/upload-artifact@v2.2.3 - with: - name: plugin-artifact - path: ./build/distributions/${{ needs.build.outputs.artifact }} - - # Verify built plugin using IntelliJ Plugin Verifier tool - # Requires build job to be passed - verify: - name: Verify - needs: build - runs-on: ubuntu-latest - steps: - - - name: Setup Java - uses: actions/setup-java@v2 - with: - java-version: 17 - distribution: 'zulu' - - - name: Fetch Sources - uses: actions/checkout@v2 - - - name: Setup Gradle Dependencies Cache - uses: actions/cache@v2.1.4 - with: - path: ~/.gradle/caches - key: ${{ runner.os }}-gradle-caches-${{ hashFiles('**/*.gradle', '**/*.gradle.kts', 'gradle.properties') }} - - - name: Setup Gradle Wrapper Cache - uses: actions/cache@v2.1.4 - with: - path: ~/.gradle/wrapper - key: ${{ runner.os }}-gradle-wrapper-${{ hashFiles('**/gradle/wrapper/gradle-wrapper.properties') }} - - # Set environment variables - - name: Export Properties - id: properties - shell: bash - run: | - PROPERTIES="$(./gradlew properties --console=plain -q)" - IDE_VERSIONS="$(echo "$PROPERTIES" | grep "^pluginVerifierIdeVersions:" | base64)" - - echo "::set-output name=ideVersions::$IDE_VERSIONS" - echo "::set-output name=pluginVerifierHomeDir::~/.pluginVerifier" - - # Cache Plugin Verifier IDEs - - name: Setup Plugin Verifier IDEs Cache - uses: actions/cache@v2.1.4 - with: - path: ${{ steps.properties.outputs.pluginVerifierHomeDir }}/ides - key: ${{ runner.os }}-plugin-verifier-${{ steps.properties.outputs.ideVersions }} - - # Run IntelliJ Plugin Verifier action using GitHub Action - - name: Verify Plugin - run: ./gradlew runPluginVerifier -Pplugin.verifier.home.dir=${{ steps.properties.outputs.pluginVerifierHomeDir }} diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 641c597..8b3a138 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -8,29 +8,6 @@ on: jobs: - # Prepare and publish the plugin to the Marketplace repository -# release: -# name: Publish Plugin -# runs-on: ubuntu-latest -# steps: -# -# - name: Setup Java -# uses: actions/setup-java@v2 -# with: -# java-version: 17 -# distribution: 'zulu' -# -# - name: Fetch Sources -# uses: actions/checkout@v2 -# with: -# ref: ${{ github.event.release.tag_name }} -# -# - name: Publish Plugin -# env: -# PUBLISH_TOKEN: ${{ secrets.PUBLISH_TOKEN }} -# run: ./gradlew publishPlugin - - build: name: Build runs-on: ubuntu-latest @@ -39,37 +16,12 @@ jobs: - name: Setup Java uses: actions/setup-java@v2 with: - java-version: 17 + java-version: 21 distribution: 'zulu' - name: Fetch Sources uses: actions/checkout@v2 - - name: Setup Gradle Dependencies Cache - uses: actions/cache@v2.1.4 - with: - path: ~/.gradle/caches - key: ${{ runner.os }}-gradle-caches-${{ hashFiles('**/*.gradle', '**/*.gradle.kts', 'gradle.properties') }} - - - name: Setup Gradle Wrapper Cache - uses: actions/cache@v2.1.4 - with: - path: ~/.gradle/wrapper - key: ${{ runner.os }}-gradle-wrapper-${{ hashFiles('**/gradle/wrapper/gradle-wrapper.properties') }} - - - name: Set environment variables - id: properties - shell: bash - run: | - PROPERTIES="$(./gradlew properties --console=plain -q)" - VERSION="$(echo "$PROPERTIES" | grep "^version:" | cut -f2- -d ' ')" - NAME="$(echo "$PROPERTIES" | grep "^pluginName_:" | cut -f2- -d ' ')" - ARTIFACT="${NAME}-${VERSION}.zip" - - echo "::set-output name=version::$VERSION" - echo "::set-output name=name::$NAME" - echo "::set-output name=artifact::$ARTIFACT" - - name: Build Plugin run: ./gradlew buildPlugin diff --git a/.gitignore b/.gitignore index 179f202..92e99a7 100644 --- a/.gitignore +++ b/.gitignore @@ -24,3 +24,4 @@ classes/ src/test/resources/ masterThemes/ +.intellijPlatform/ diff --git a/build.gradle.kts b/build.gradle.kts index 91ac549..867828c 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,55 +1,53 @@ -import io.gitlab.arturbosch.detekt.Detekt -import org.jetbrains.changelog.markdownToHTML -import org.jetbrains.intellij.tasks.RunPluginVerifierTask.FailureLevel -import org.jetbrains.kotlin.gradle.tasks.KotlinCompile - -fun properties(key: String) = project.findProperty(key).toString() +import org.jetbrains.intellij.platform.gradle.TestFrameworkType plugins { - // Kotlin support - kotlin("jvm") version "2.0.0" - // gradle-intellij-plugin - read more: https://github.com/JetBrains/gradle-intellij-plugin - id("org.jetbrains.intellij") version "1.13.3" - // gradle-changelog-plugin - read more: https://github.com/JetBrains/gradle-changelog-plugin - id("org.jetbrains.changelog") version "2.0.0" - // detekt linter - read more: https://detekt.github.io/detekt/gradle.html - id("io.gitlab.arturbosch.detekt") version "1.22.0" - // ktlint linter - read more: https://github.com/JLLeitschuh/ktlint-gradle - id("org.jlleitschuh.gradle.ktlint") version "11.3.2" + id("java") // Java support + alias(libs.plugins.kotlin) // Kotlin support + alias(libs.plugins.intelliJPlatform) // IntelliJ Platform Gradle Plugin } -// Import variables from gradle.properties file -val pluginGroup: String by project -// `pluginName_` variable ends with `_` because of the collision with Kotlin magic getter in the `intellij` closure. -// Read more about the issue: https://github.com/JetBrains/intellij-platform-plugin-template/issues/29 -val pluginName_: String by project -val pluginVersion: String by project -val pluginSinceBuild: String by project -val pluginUntilBuild: String by project -val pluginVerifierIdeVersions: String by project - -val platformType: String by project -val platformVersion: String by project -val platformPlugins: String by project -val platformDownloadSources: String by project -val idePath: String by project - -group = pluginGroup -version = 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() - maven("https://maven.pkg.jetbrains.space/public/p/kotlinx-html/maven") + + // 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 { - detektPlugins("io.gitlab.arturbosch.detekt:detekt-formatting:1.21.0") - implementation("commons-io:commons-io:2.11.0") + implementation("commons-io:commons-io:2.15.1") + implementation("org.javassist:javassist:3.29.2-GA") implementation("com.googlecode.soundlibs:mp3spi:1.9.5.4") - implementation("io.sentry:sentry:6.4.2") + implementation("io.sentry:sentry:6.28.0") + testImplementation("org.assertj:assertj-core:3.25.3") + testImplementation("io.mockk:mockk:1.13.8") compileOnly(files("lib/instrumented-doki-theme-jetbrains-88.5-1.11.0.jar")) - testImplementation("org.assertj:assertj-core:3.23.1") - testImplementation("io.mockk:mockk:1.12.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 { @@ -60,93 +58,66 @@ configurations { } } -// Configure gradle-intellij-plugin plugin. -// Read more: https://github.com/JetBrains/gradle-intellij-plugin -intellij { - pluginName.set(pluginName_) - version.set(platformVersion) - type.set(platformType) - downloadSources.set(platformDownloadSources.toBoolean()) - updateSinceUntilBuild.set(true) - - // Plugin Dependencies. Uses `platformPlugins` property from the gradle.properties file. - plugins.set( - platformPlugins.split(',') - .map(String::trim) - .filter(String::isNotEmpty) - ) -} +// 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") -// 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 + ideaVersion { + sinceBuild = providers.gradleProperty("pluginSinceBuild") + untilBuild = providers.gradleProperty("pluginUntilBuild") + } } -} -tasks { - withType { - sourceCompatibility = "17" - targetCompatibility = "17" - } - withType { - kotlinOptions.jvmTarget = "17" + signing { + certificateChain = providers.environmentVariable("CERTIFICATE_CHAIN") + privateKey = providers.environmentVariable("PRIVATE_KEY") + password = providers.environmentVariable("PRIVATE_KEY_PASSWORD") } - withType { - jvmTarget = "17" + 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" }) } } - runIde { - maxHeapSize = "2g" - autoReloadPlugins.set(false) - enabled = environment.getOrDefault("SHOULD_DOKI_THEME_RUN", "true") == "true" - val idePath = properties("idePath") - if (idePath.isNotEmpty()) { - ideDir.set(file(idePath)) + pluginVerification { + ides { + recommended() } } +} + +tasks { + wrapper { + gradleVersion = providers.gradleProperty("gradleVersion").get() + } buildSearchableOptions { - enabled = true + enabled = false } +} - patchPluginXml { - version.set(pluginVersion) - sinceBuild.set(pluginSinceBuild) - untilBuild.set(pluginUntilBuild) - - // Extract the section from README.md and provide for the plugin's manifest - pluginDescription.set( - provider { - File("${project.projectDir}/README.md").readText().lines().run { - val start = "" - val 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) } +intellijPlatformTesting { + runIde { + register("runIdeForUiTests") { + task { + jvmArgumentProviders += CommandLineArgumentProvider { + listOf( + "-Drobot-server.port=8082", + "-Dide.mac.message.dialogs.as.sheets=false", + "-Djb.privacy.policy.text=", + "-Djb.consents.confirmation.enabled=false", + ) + } } - ) - changeNotes.set( - provider { - markdownToHTML(File("${project.projectDir}/docs/RELEASE-NOTES.md").readText()) + plugins { + robotServerPlugin() } - ) - } - - runPluginVerifier { - failureLevel.set(listOf(FailureLevel.COMPATIBILITY_PROBLEMS)) - ideVersions.set(pluginVerifierIdeVersions.split(",").filter { it.isNotEmpty() }) + } } } diff --git a/gradle.properties b/gradle.properties index f585a99..8d1d306 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,27 +1,28 @@ -# IntelliJ Platform Artifacts Repositories -# -> https://www.jetbrains.org/intellij/sdk/docs/reference_guide/intellij_artifacts.html +# IntelliJ Platform Artifacts Repositories -> https://plugins.jetbrains.com/docs/intellij/intellij-artifacts.html -pluginGroup = io.unthrottled -pluginName_ = Anime Memes -pluginVersion = 1.5.0 -pluginSinceBuild = 243 -pluginUntilBuild = 243.* -# Plugin Verifier integration -> https://github.com/JetBrains/gradle-intellij-plugin#plugin-verifier-dsl -# See https://jb.gg/intellij-platform-builds-list for available build versions -pluginVerifierIdeVersions = 2024.3 +pluginGroup=io.unthrottled +pluginVersion=1.6.0 +pluginSinceBuild=251 +pluginUntilBuild=251.* +# IntelliJ Platform Properties -> https://plugins.jetbrains.com/docs/intellij/tools-gradle-intellij-plugin.html#configuration-intellij-extension platformType = IU -platformVersion = 2024.1 -platformDownloadSources = true -# Plugin Dependencies -> https://www.jetbrains.org/intellij/sdk/docs/basics/plugin_structure/plugin_dependencies.html -# Example: platformPlugins = com.intellij.java,com.jetbrains.php:203.4449.22 -platformPlugins = NodeJS,Dart:241.15845,io.flutter:79.0.3 -#platformPlugins = NodeJS,Dart:243.22562.3,io.flutter:82.2.4 +platformVersion = 2025.1 -idePath= -#idePath=/Users/alexsimons/Applications/WebStorm.app/Contents +# 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 +platformPlugins = Dart:251.23774.318,io.flutter:85.2.4 +# Example: platformBundledPlugins = com.intellij.java +platformBundledPlugins = NodeJS -# Opt-out flag for bundling Kotlin standard library. -# See https://plugins.jetbrains.com/docs/intellij/kotlin.html#kotlin-standard-library for details. -# suppress inspection "UnusedProperty" +# Gradle Releases -> https://github.com/gradle/gradle/releases +gradleVersion = 8.13 + +# 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 = false + +# Enable Gradle Build Cache -> https://docs.gradle.org/current/userguide/build_cache.html +org.gradle.caching = false diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml new file mode 100644 index 0000000..8a437e0 --- /dev/null +++ b/gradle/libs.versions.toml @@ -0,0 +1,16 @@ +[versions] +# libraries +junit = "4.13.2" +opentest4j = "1.3.0" + +# plugins +intelliJPlatform = "2.5.0" +kotlin = "2.1.20" + +[libraries] +junit = { group = "junit", name = "junit", version.ref = "junit" } +opentest4j = { group = "org.opentest4j", name = "opentest4j", version.ref = "opentest4j" } + +[plugins] +intelliJPlatform = { id = "org.jetbrains.intellij.platform", version.ref = "intelliJPlatform" } +kotlin = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" } \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index e708b1c..9bbc975 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 ae04661..37f853b 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,7 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip +networkTimeout=10000 +validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew index 4f906e0..faf9300 100755 --- a/gradlew +++ b/gradlew @@ -1,7 +1,7 @@ -#!/usr/bin/env sh +#!/bin/sh # -# Copyright 2015 the original author or authors. +# Copyright © 2015-2021 the original authors. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -15,69 +15,103 @@ # See the License for the specific language governing permissions and # limitations under the License. # +# SPDX-License-Identifier: Apache-2.0 +# ############################################################################## -## -## Gradle start up script for UN*X -## +# +# Gradle start up script for POSIX generated by Gradle. +# +# Important for running: +# +# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is +# noncompliant, but you have some other compliant shell such as ksh or +# bash, then to run this script, type that shell name before the whole +# command line, like: +# +# ksh Gradle +# +# Busybox and similar reduced shells will NOT work, because this script +# requires all of these POSIX shell features: +# * functions; +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». +# +# Important for patching: +# +# (2) This script targets any POSIX shell, so it avoids extensions provided +# by Bash, Ksh, etc; in particular arrays are avoided. +# +# The "traditional" practice of packing multiple parameters into a +# space-separated string is a well documented source of bugs and security +# problems, so this is (mostly) avoided, by progressively accumulating +# options in "$@", and eventually passing that to Java. +# +# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, +# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; +# see the in-line comments for details. +# +# There are tweaks for specific operating systems such as AIX, CygWin, +# Darwin, MinGW, and NonStop. +# +# (3) This script is generated from the Groovy template +# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# within the Gradle project. +# +# You can find Gradle at https://github.com/gradle/gradle/. +# ############################################################################## # Attempt to set APP_HOME + # Resolve links: $0 may be a link -PRG="$0" -# Need this for relative symlinks. -while [ -h "$PRG" ] ; do - ls=`ls -ld "$PRG"` - link=`expr "$ls" : '.*-> \(.*\)$'` - if expr "$link" : '/.*' > /dev/null; then - PRG="$link" - else - PRG=`dirname "$PRG"`"/$link" - fi +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac done -SAVED="`pwd`" -cd "`dirname \"$PRG\"`/" >/dev/null -APP_HOME="`pwd -P`" -cd "$SAVED" >/dev/null -APP_NAME="Gradle" -APP_BASE_NAME=`basename "$0"` - -# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' +# This is normally unused +# shellcheck disable=SC2034 +APP_BASE_NAME=${0##*/} +# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) +APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit # Use the maximum available, or set MAX_FD != -1 to use that value. -MAX_FD="maximum" +MAX_FD=maximum warn () { echo "$*" -} +} >&2 die () { echo echo "$*" echo exit 1 -} +} >&2 # OS specific support (must be 'true' or 'false'). cygwin=false msys=false darwin=false nonstop=false -case "`uname`" in - CYGWIN* ) - cygwin=true - ;; - Darwin* ) - darwin=true - ;; - MINGW* ) - msys=true - ;; - NONSTOP* ) - nonstop=true - ;; +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; esac CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar @@ -87,9 +121,9 @@ CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar if [ -n "$JAVA_HOME" ] ; then if [ -x "$JAVA_HOME/jre/sh/java" ] ; then # IBM's JDK on AIX uses strange locations for the executables - JAVACMD="$JAVA_HOME/jre/sh/java" + JAVACMD=$JAVA_HOME/jre/sh/java else - JAVACMD="$JAVA_HOME/bin/java" + JAVACMD=$JAVA_HOME/bin/java fi if [ ! -x "$JAVACMD" ] ; then die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME @@ -98,88 +132,120 @@ Please set the JAVA_HOME variable in your environment to match the location of your Java installation." fi else - JAVACMD="java" - which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + JAVACMD=java + if ! command -v java >/dev/null 2>&1 + then + die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. Please set the JAVA_HOME variable in your environment to match the location of your Java installation." + fi fi # Increase the maximum file descriptors if we can. -if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then - MAX_FD_LIMIT=`ulimit -H -n` - if [ $? -eq 0 ] ; then - if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then - MAX_FD="$MAX_FD_LIMIT" - fi - ulimit -n $MAX_FD - if [ $? -ne 0 ] ; then - warn "Could not set maximum file descriptor limit: $MAX_FD" - fi - else - warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" - fi +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac fi -# For Darwin, add options to specify how the application appears in the dock -if $darwin; then - GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" -fi +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. # For Cygwin or MSYS, switch paths to Windows format before running java -if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then - APP_HOME=`cygpath --path --mixed "$APP_HOME"` - CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` - - JAVACMD=`cygpath --unix "$JAVACMD"` - - # We build the pattern for arguments to be converted via cygpath - ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` - SEP="" - for dir in $ROOTDIRSRAW ; do - ROOTDIRS="$ROOTDIRS$SEP$dir" - SEP="|" - done - OURCYGPATTERN="(^($ROOTDIRS))" - # Add a user-defined pattern to the cygpath arguments - if [ "$GRADLE_CYGPATTERN" != "" ] ; then - OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" - fi +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + # Now convert the arguments - kludge to limit ourselves to /bin/sh - i=0 - for arg in "$@" ; do - CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` - CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option - - if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition - eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` - else - eval `echo args$i`="\"$arg\"" + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) fi - i=`expr $i + 1` + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg done - case $i in - 0) set -- ;; - 1) set -- "$args0" ;; - 2) set -- "$args0" "$args1" ;; - 3) set -- "$args0" "$args1" "$args2" ;; - 4) set -- "$args0" "$args1" "$args2" "$args3" ;; - 5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; - 6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; - 7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; - 8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; - 9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; - esac fi -# Escape application args -save () { - for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done - echo " " -} -APP_ARGS=`save "$@"` -# Collect all arguments for the java command, following the shell quoting and substitution rules -eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Collect all arguments for the java command: +# * 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. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" +fi + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat index 107acd3..9d21a21 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -13,8 +13,10 @@ @rem See the License for the specific language governing permissions and @rem limitations under the License. @rem +@rem SPDX-License-Identifier: Apache-2.0 +@rem -@if "%DEBUG%" == "" @echo off +@if "%DEBUG%"=="" @echo off @rem ########################################################################## @rem @rem Gradle startup script for Windows @@ -25,7 +27,8 @@ if "%OS%"=="Windows_NT" setlocal set DIRNAME=%~dp0 -if "%DIRNAME%" == "" set DIRNAME=. +if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused set APP_BASE_NAME=%~n0 set APP_HOME=%DIRNAME% @@ -40,13 +43,13 @@ if defined JAVA_HOME goto findJavaFromJavaHome set JAVA_EXE=java.exe %JAVA_EXE% -version >NUL 2>&1 -if "%ERRORLEVEL%" == "0" goto execute +if %ERRORLEVEL% equ 0 goto execute -echo. -echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. +echo. 1>&2 +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 goto fail @@ -56,11 +59,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe if exist "%JAVA_EXE%" goto execute -echo. -echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. +echo. 1>&2 +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 goto fail @@ -75,13 +78,15 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar :end @rem End local scope for the variables with windows NT shell -if "%ERRORLEVEL%"=="0" goto mainEnd +if %ERRORLEVEL% equ 0 goto mainEnd :fail rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of rem the _cmd.exe /c_ return code! -if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 -exit /b 1 +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% :mainEnd if "%OS%"=="Windows_NT" endlocal diff --git a/src/main/kotlin/io/unthrottled/amii/config/ui/PreferredCharacterTree.kt b/src/main/kotlin/io/unthrottled/amii/config/ui/PreferredCharacterTree.kt index b63402a..14e4cdd 100644 --- a/src/main/kotlin/io/unthrottled/amii/config/ui/PreferredCharacterTree.kt +++ b/src/main/kotlin/io/unthrottled/amii/config/ui/PreferredCharacterTree.kt @@ -43,19 +43,19 @@ class PreferredCharacterTree( ) { private val characterCheckStatus: MutableMap = HashMap() val component: JComponent = JPanel(BorderLayout()) - private val myTree: CheckboxTree = createTree() + private val myTree: Lazy = lazy { createTree() } private val myFilter: FilterComponent = MyFilterComponent() private val toolbarPanel: JPanel = JPanel(BorderLayout()) private fun initTree() { - val scrollPane = ScrollPaneFactory.createScrollPane(myTree) + val scrollPane = ScrollPaneFactory.createScrollPane(myTree.value) toolbarPanel.add(myFilter, BorderLayout.CENTER) toolbarPanel.border = JBUI.Borders.emptyBottom(2) val group = DefaultActionGroup() val actionManager = CommonActionsManager.getInstance() - val treeExpander: TreeExpander = DefaultTreeExpander(myTree) - group.add(actionManager.createExpandAllAction(treeExpander, myTree)) - group.add(actionManager.createCollapseAllAction(treeExpander, myTree)) + val treeExpander: TreeExpander = DefaultTreeExpander(myTree.value) + group.add(actionManager.createExpandAllAction(treeExpander, myTree.value)) + group.add(actionManager.createCollapseAllAction(treeExpander, myTree.value)) toolbarPanel.add( ActionManager.getInstance().createActionToolbar("PreferredCharacterTree", group, true).component, BorderLayout.WEST @@ -128,7 +128,7 @@ class PreferredCharacterTree( } fun filter(intentionsToShow: List) { - refreshCheckStatus(myTree.model.root as CheckedTreeNode) + refreshCheckStatus(myTree.value.model.root as CheckedTreeNode) reset(copyAndSort(intentionsToShow)) } @@ -149,7 +149,7 @@ class PreferredCharacterTree( } val root = CheckedTreeNode(null) - val treeModel = myTree.model as DefaultTreeModel + val treeModel = myTree.value.model as DefaultTreeModel sortedCharacterData.forEach { characterData -> val animeRoot = CheckedTreeNode(characterData.anime) characterData.characters.forEach { character -> @@ -162,12 +162,12 @@ class PreferredCharacterTree( } treeModel.setRoot(root) treeModel.nodeChanged(root) - TreeUtil.expandAll(myTree) - myTree.setSelectionRow(0) + TreeUtil.expandAll(myTree.value) + myTree.value.setSelectionRow(0) } private val root: CheckedTreeNode - get() = myTree.model.root as CheckedTreeNode + get() = myTree.value.model.root as CheckedTreeNode fun getSelected(): List = getSelectedCharacters(root) @@ -201,7 +201,7 @@ class PreferredCharacterTree( "CHARACTER_FILTER_HISTORY", HISTORY_LENGTH ) { - private val myExpansionMonitor = TreeExpansionMonitor.install(myTree) + private val myExpansionMonitor = TreeExpansionMonitor.install(myTree.value) override fun filter() { val filter = filter if (filter.isNullOrEmpty().not() && !myExpansionMonitor.isFreeze) { @@ -209,22 +209,22 @@ class PreferredCharacterTree( } this@PreferredCharacterTree.filter(filterModel(filter, true)) val expandedPaths = TreeUtil.collectExpandedPaths( - myTree + myTree.value ) - (myTree.model as DefaultTreeModel).reload() - TreeUtil.restoreExpandedPaths(myTree, expandedPaths) + (myTree.value.model as DefaultTreeModel).reload() + TreeUtil.restoreExpandedPaths(myTree.value, expandedPaths) SwingUtilities.invokeLater { - myTree.setSelectionRow(0) + myTree.value.setSelectionRow(0) IdeFocusManager.getGlobalInstance().doWhenFocusSettlesDown { IdeFocusManager.getGlobalInstance().requestFocus( - myTree, + myTree.value, true ) } } - TreeUtil.expandAll(myTree) + TreeUtil.expandAll(myTree.value) if (filter.isNullOrEmpty()) { - TreeUtil.collapseAll(myTree, 0) + TreeUtil.collapseAll(myTree.value, 0) myExpansionMonitor.restore() } } @@ -237,9 +237,9 @@ class PreferredCharacterTree( } } this@PreferredCharacterTree.filter(filterModel(filter, true)) - TreeUtil.expandAll(myTree) + TreeUtil.expandAll(myTree.value) if (filter == null || filter.isEmpty()) { - TreeUtil.collapseAll(myTree, 0) + TreeUtil.collapseAll(myTree.value, 0) myExpansionMonitor.restore() } } diff --git a/src/main/kotlin/io/unthrottled/amii/listeners/OrphanReaper.kt b/src/main/kotlin/io/unthrottled/amii/listeners/OrphanReaper.kt index d04108c..d3364ad 100644 --- a/src/main/kotlin/io/unthrottled/amii/listeners/OrphanReaper.kt +++ b/src/main/kotlin/io/unthrottled/amii/listeners/OrphanReaper.kt @@ -31,7 +31,7 @@ class OrphanReaper : APIAssetListener, Logging { private fun harvestOrphans(apiPath: String) { ApplicationManager.getApplication() .executeOnPooledThread { - when (apiPath.substringAfterLast("/").toLowerCase()) { + when (apiPath.substringAfterLast("/").lowercase()) { VISUALS.category -> VISUALS.toOptional() AUDIBLE.category -> AUDIBLE.toOptional() else -> Optional.empty() diff --git a/src/main/kotlin/io/unthrottled/amii/onboarding/UpdateNotification.kt b/src/main/kotlin/io/unthrottled/amii/onboarding/UpdateNotification.kt index ead40e8..603e3d3 100644 --- a/src/main/kotlin/io/unthrottled/amii/onboarding/UpdateNotification.kt +++ b/src/main/kotlin/io/unthrottled/amii/onboarding/UpdateNotification.kt @@ -22,7 +22,7 @@ private fun buildUpdateMessage(updateAsset: String): String = """ What's New?
    -
  • Added 2024.3 build support
    • +
  • Added 2025.1 build support

See the documentation for features, usages, and configurations.
The changelog is available for more details. diff --git a/src/main/resources/META-INF/plugin.xml b/src/main/resources/META-INF/plugin.xml index e1ce813..732f43d 100644 --- a/src/main/resources/META-INF/plugin.xml +++ b/src/main/resources/META-INF/plugin.xml @@ -2,6 +2,15 @@ io.unthrottled.amii Anime Memes Unthrottled + + + Give your IDE more personality and have <emphasis>more</emphasis> fun programming with the Anime Meme IDE + Integration! (AMII)<br/><br/> + Upon installation, our Meme Inference Knowledge Unit (or MIKU for short) + will begin interact with you as you build code. MIKU knows when your programs fail to run or tests pass/fail. Your new + companion has the ability to react to these events. Which will most likely take the form of an anime meme of your: + waifu, husbando, and/or favorite character(s)!<br/><br/> +