Skip to content

Commit

Permalink
2022.2 Support (#146)
Browse files Browse the repository at this point in the history
* Initial 2022.2 Build Support.

* Making sure test success happens only on exit code 0.

* Doki Theme is only need for compile.
  • Loading branch information
Unthrottled authored Jun 3, 2022
1 parent 9dafd53 commit 5acea08
Show file tree
Hide file tree
Showing 8 changed files with 32 additions and 28 deletions.
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -23,4 +23,4 @@ classes/
*.icls
src/test/resources/

masterThemes/
masterThemes/
7 changes: 7 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,13 @@

# AMII Changelog

## [0.15.0]

### Added

- 2022.2 Build Support


## [0.14.1]

### Fixed
Expand Down
20 changes: 11 additions & 9 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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 {
Expand All @@ -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.
Expand Down
9 changes: 1 addition & 8 deletions docs/RELEASE-NOTES.md
Original file line number Diff line number Diff line change
@@ -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
13 changes: 9 additions & 4 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Binary file added lib/doki-theme-jetbrains-84.1-1.2.1.jar
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,7 @@ private fun buildUpdateMessage(updateAsset: String): String =
"""
What's New?<br>
<ul>
<li>2022.1 Build Support.</li>
<li>Right-click an active meme to view asset manager source.</li>
<li>Added support for users with an ' in their path</li>
<li>Fixed issue with dimension capping of assets.</li>
<li>Fixed spelling issue in <code>Dimension Cap</code> settings.</li>
<li>2022.2 Build Support.</li>
</ul>
<br>See the <a href="https://github.com/ani-memes/AMII#documentation">documentation</a> for features, usages, and configurations.
<br>The <a href="https://github.com/ani-memes/AMII/blob/master/CHANGELOG.md">changelog</a> is available for more details.
Expand Down

0 comments on commit 5acea08

Please sign in to comment.