diff --git a/.gitignore b/.gitignore index a832ba46..179f2027 100644 --- a/.gitignore +++ b/.gitignore @@ -23,4 +23,4 @@ classes/ *.icls src/test/resources/ -masterThemes/ \ No newline at end of file +masterThemes/ diff --git a/CHANGELOG.md b/CHANGELOG.md index 28e5614d..8e5f8b02 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,13 @@ # AMII Changelog +## [0.15.0] + +### Added + +- 2022.2 Build Support + + ## [0.14.1] ### Fixed diff --git a/build.gradle.kts b/build.gradle.kts index 37dd979e..f929b30f 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -9,7 +9,7 @@ plugins { // Kotlin support id("org.jetbrains.kotlin.jvm") version "1.6.0" // gradle-intellij-plugin - read more: https://github.com/JetBrains/gradle-intellij-plugin - id("org.jetbrains.intellij") version "1.2.0" + id("org.jetbrains.intellij") version "1.6.0" // gradle-changelog-plugin - read more: https://github.com/JetBrains/gradle-changelog-plugin id("org.jetbrains.changelog") version "1.1.2" // detekt linter - read more: https://detekt.github.io/detekt/gradle.html @@ -43,12 +43,14 @@ repositories { jcenter() } dependencies { - detektPlugins("io.gitlab.arturbosch.detekt:detekt-formatting:1.16.0") + // todo: remove once doki supports 2022.2 + compileOnly(files("lib/doki-theme-jetbrains-84.1-1.2.1.jar")) + detektPlugins("io.gitlab.arturbosch.detekt:detekt-formatting:1.20.0") implementation("commons-io:commons-io:2.6") implementation("com.googlecode.soundlibs:mp3spi:1.9.5.4") implementation("io.sentry:sentry:4.3.0") - testImplementation("org.assertj:assertj-core:3.19.0") - testImplementation("io.mockk:mockk:1.11.0") + testImplementation("org.assertj:assertj-core:3.22.0") + testImplementation("io.mockk:mockk:1.12.4") } configurations { @@ -69,11 +71,11 @@ intellij { updateSinceUntilBuild.set(true) // Plugin Dependencies. Uses `platformPlugins` property from the gradle.properties file. - plugins.set( - platformPlugins.split(',') - .map(String::trim) - .filter(String::isNotEmpty) - ) +// plugins.set( +// platformPlugins.split(',') +// .map(String::trim) +// .filter(String::isNotEmpty) +// ) } // Configure detekt plugin. diff --git a/docs/RELEASE-NOTES.md b/docs/RELEASE-NOTES.md index e144155e..01c466eb 100644 --- a/docs/RELEASE-NOTES.md +++ b/docs/RELEASE-NOTES.md @@ -1,10 +1,3 @@ ### Added -- 2022.1 Build Support -- The ability to right-click a meme view to the meme's asset source page on https://amii-assets.unthrottled.io/ - -### Fixed - -- Images not showing up for users with an `'` in their file path. -- Issue with dimension capping of assets. -- Spelling mistake in the `Dimension Cap` settings. +- 2022.2 Build Support diff --git a/gradle.properties b/gradle.properties index 040dedb3..3c66b225 100644 --- a/gradle.properties +++ b/gradle.properties @@ -3,15 +3,15 @@ pluginGroup = io.unthrottled pluginName_ = Anime Memes -pluginVersion = 0.14.1 +pluginVersion = 0.15.0 pluginSinceBuild = 203.7148.57 -pluginUntilBuild = 221.* +pluginUntilBuild = 222.* # 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 = 2020.3.2,2021.1,2021.2 +pluginVerifierIdeVersions = 2020.3.2,2021.1,2021.2,2022.1 platformType = IU -platformVersion = LATEST-EAP-SNAPSHOT +platformVersion = 2022.1.2 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 @@ -20,3 +20,8 @@ platformPlugins = io.acari.DDLCTheme:74.1-1.0.2 idePath= #idePath=/home/alex/.local/share/JetBrains/Toolbox/apps/AndroidStudio/ch-0/203.7321754 #idePath=/home/alex/.local/share/JetBrains/Toolbox/apps/PyCharm-P/ch-0/211.6085.15 + +# 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" +kotlin.stdlib.default.dependency = false diff --git a/lib/doki-theme-jetbrains-84.1-1.2.1.jar b/lib/doki-theme-jetbrains-84.1-1.2.1.jar new file mode 100644 index 00000000..b69427e4 Binary files /dev/null and b/lib/doki-theme-jetbrains-84.1-1.2.1.jar differ diff --git a/src/main/kotlin/io/unthrottled/amii/listeners/TestEventListener.kt b/src/main/kotlin/io/unthrottled/amii/listeners/TestEventListener.kt index 64a77d83..b8ab687a 100644 --- a/src/main/kotlin/io/unthrottled/amii/listeners/TestEventListener.kt +++ b/src/main/kotlin/io/unthrottled/amii/listeners/TestEventListener.kt @@ -42,7 +42,8 @@ class TestEventListener(private val project: Project) : SMTRunnerEventsAdapter() } private fun isSuccess(testsRoot: SMRootTestProxy): Boolean = - testsRoot.isPassed || isSuccessWithIgnoredTests(testsRoot) + (testsRoot.isPassed || isSuccessWithIgnoredTests(testsRoot)) && + testsRoot.handler.exitCode == 0 private fun isSuccessWithIgnoredTests(testsRoot: SMRootTestProxy): Boolean = TestStateInfo.Magnitude.IGNORED_INDEX == testsRoot.magnitudeInfo diff --git a/src/main/kotlin/io/unthrottled/amii/onboarding/UpdateNotification.kt b/src/main/kotlin/io/unthrottled/amii/onboarding/UpdateNotification.kt index dc294a85..03f63c84 100644 --- a/src/main/kotlin/io/unthrottled/amii/onboarding/UpdateNotification.kt +++ b/src/main/kotlin/io/unthrottled/amii/onboarding/UpdateNotification.kt @@ -22,11 +22,7 @@ private fun buildUpdateMessage(updateAsset: String): String = """ What's New?

See the documentation for features, usages, and configurations.
The changelog is available for more details.