diff --git a/CHANGELOG.md b/CHANGELOG.md index 086096c..18ce5c7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,13 @@ # AMII Changelog +## [1.5.0] + +### Added + +- Lowest supported version is now 2024.3 +- Compiles to the 2024.3 build + ## [1.4.0] ### Added diff --git a/build.gradle.kts b/build.gradle.kts index 04a5405..91ac549 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -7,7 +7,7 @@ fun properties(key: String) = project.findProperty(key).toString() plugins { // Kotlin support - kotlin("jvm") version "1.8.10" + 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 diff --git a/gradle.properties b/gradle.properties index a66149c..c1266ba 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,11 +4,11 @@ pluginGroup = io.unthrottled pluginName_ = Anime Memes pluginVersion = 1.4.0 -pluginSinceBuild = 241 -pluginUntilBuild = 242.* +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.1,2024.2 +pluginVerifierIdeVersions = 2024.3 platformType = IU platformVersion = 2024.1 @@ -16,11 +16,10 @@ 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 idePath= -#idePath=/Users/alexsimons/Library/Application Support/JetBrains/Toolbox/apps/Rider/ch-0/231.8109.48/Rider EAP.app/Contents -#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 +#idePath=/Users/alexsimons/Applications/WebStorm.app/Contents # Opt-out flag for bundling Kotlin standard library. # See https://plugins.jetbrains.com/docs/intellij/kotlin.html#kotlin-standard-library for details. diff --git a/src/main/kotlin/io/unthrottled/amii/assets/AssetAPI.kt b/src/main/kotlin/io/unthrottled/amii/assets/AssetAPI.kt index fdc89c6..1f5790f 100644 --- a/src/main/kotlin/io/unthrottled/amii/assets/AssetAPI.kt +++ b/src/main/kotlin/io/unthrottled/amii/assets/AssetAPI.kt @@ -12,7 +12,7 @@ object AssetAPI { "https://amii.api.unthrottled.io/public/" ) - fun getAsset( + fun getAsset( path: String, bodyExtractor: (InputStream) -> T ): Optional = diff --git a/src/main/kotlin/io/unthrottled/amii/integrations/RestClient.kt b/src/main/kotlin/io/unthrottled/amii/integrations/RestClient.kt index b8d8d58..c1985c1 100644 --- a/src/main/kotlin/io/unthrottled/amii/integrations/RestClient.kt +++ b/src/main/kotlin/io/unthrottled/amii/integrations/RestClient.kt @@ -33,7 +33,7 @@ object RestClient : Logging { object RestTools { private val log = Logger.getInstance(this::class.java) - fun performRequest( + fun performRequest( url: String, bodyExtractor: (InputStream) -> T ): Optional { diff --git a/src/main/kotlin/io/unthrottled/amii/memes/MemePanel.kt b/src/main/kotlin/io/unthrottled/amii/memes/MemePanel.kt index 84225b8..9b4eb80 100644 --- a/src/main/kotlin/io/unthrottled/amii/memes/MemePanel.kt +++ b/src/main/kotlin/io/unthrottled/amii/memes/MemePanel.kt @@ -450,13 +450,15 @@ class MemePanel( */ private fun runAnimation(runForwards: Boolean = true) { val self = this - val animator = object : Animator( - "Meme Machine", - TOTAL_FRAMES, - CYCLE_DURATION, - false, - runForwards - ) { + val animator = object : + Animator( + "Meme Machine", + TOTAL_FRAMES, + CYCLE_DURATION, + false, + runForwards + ), + Disposable { override fun paintNow(frame: Int, totalFrames: Int, cycle: Int) { alpha = frame.toFloat() / totalFrames paintImmediately(0, 0, width, height) diff --git a/src/main/kotlin/io/unthrottled/amii/onboarding/UpdateNotification.kt b/src/main/kotlin/io/unthrottled/amii/onboarding/UpdateNotification.kt index 6038ab5..ead40e8 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.1 build support
  • +
  • Added 2024.3 build support

See the documentation for features, usages, and configurations.
The changelog is available for more details. diff --git a/src/main/kotlin/io/unthrottled/amii/tools/ProbabilityTools.kt b/src/main/kotlin/io/unthrottled/amii/tools/ProbabilityTools.kt index a3d26dd..d775570 100644 --- a/src/main/kotlin/io/unthrottled/amii/tools/ProbabilityTools.kt +++ b/src/main/kotlin/io/unthrottled/amii/tools/ProbabilityTools.kt @@ -32,7 +32,7 @@ class ProbabilityTools( ).orElseGet { weightedEmotions.first().first } } - fun pickFromWeightedList(weightedList: List>): Optional { + fun pickFromWeightedList(weightedList: List>): Optional { val totalWeight = weightedList.sumOf { it.second } return pickFromWeightedList( random.nextLong(1, if (totalWeight <= 1) 2 else totalWeight), @@ -53,7 +53,7 @@ class ProbabilityTools( .shuffled>() } - private fun pickFromWeightedList( + private fun pickFromWeightedList( weightChosen: Long, weightedEmotions: List> ): Optional {