Merge pull request #53 from kagof/release/1.6.0

Release/1.6.0

Author: kagof

.github/workflows/deploy.yml

@@ -18,6 +18,10 @@ jobs:
           java-version: 1.8
       - name: Grant execute permission for gradlew
         run: chmod +x gradlew
+      - name: Set the plugin version env var
+        run: echo "PLUGIN_VERSION=$(./gradlew properties --no-daemon --console=plain -q | grep "^version:" | awk '{printf $2}')" >> $GITHUB_ENV
+      - name: Set the change notes env var
+        run: echo "CHANGE_NOTES=$(sed -n "/<\!\-\-${{ env.PLUGIN_VERSION }}-->/,/<\!\-\-\/${{ env.PLUGIN_VERSION }}-->/p" changenotes.html | tr -d '\n')" >> $GITHUB_ENV
       - name: Build & deploy with Gradle
         env:
           PLUGIN_DEPLOYMENT_CHANNEL: ${{ github.event.inputs.channel }}
@@ -32,7 +36,14 @@ jobs:
           aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
           aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
           aws-region: us-east-1
-
       - name: Copy plugin version to s3 bucket
         run: |
           aws s3 cp ./build/distributions s3://${{ secrets.S3_BUCKET_NAME }}/dist --recursive
+      - name: Create Release
+        uses: ncipollo/release-action@v1.8.6
+        with:
+          artifacts: "./build/distributions/*.zip"
+          tag: "${{ env.PLUGIN_VERSION }}"
+          body: "${{ env.CHANGE_NOTES }}"
+          commit: ${{ env.GITHUB_SHA }}
+          token: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/verify.yml

@@ -32,12 +32,12 @@ jobs:
 
       - name: Verify against IntelliJ builds
         id: verify
-        uses: ChrisCarini/intellij-platform-plugin-verifier-action@v1.0.4
+        uses: ChrisCarini/intellij-platform-plugin-verifier-action@v1.0.7
         with:
           ide-versions: |
             ideaIC:2019.3.5
-            ideaIU:2019.3.5
             ideaIC:2020.3
+            ideaIC:2021.2
             ideaIC:LATEST-EAP-SNAPSHOT
 
       - name: Sync master branch verification results to gist

CONTRIBUTING.md

@@ -71,5 +71,5 @@ Preferably you should be using [signed commits](https://help.github.com/en/artic
 * if adding a new Pokémon:
     * please maintain numerical ordering in the [Readme](README.md), [plugin.xml](src/main/resources/META-INF/plugin.xml), and [Pokemon.java](src/main/java/com/kagof/intellij/plugins/pokeprogress/Pokemon.java)
     * [editSprite.sh](editSprite.sh) can be used to generate the required gifs from existing png images
-    * [DocumentGenerator.java](src/test/java/com/kagof/intellij/plugins/pokeprogress/DocumentationGenerator.java) can be used to generate the new lines in [`description.html`](./description.html) and [`README.md`](README.md)
+    * [DocumentGenerator.java](src/test/java/com/kagof/intellij/plugins/pokeprogress/DocumentationGenerator.java) can be used to generate the new lines in [`README.md`](README.md), and update the [family photo](eg/family.gif) used in both the README and [`description.html`](./description.html). Simply run the `updateReadme()` and `updateFamilyPicture()` tests to do so.
     * [TestProgressBar.java](src/test/java/com/kagof/intellij/plugins/pokeprogress/TestProgressBar.java)) is very useful when tweaking sprite positioning & sizing (Thanks to @Paola351 for the initial implementation of this!)

README.md

@@ -7,6 +7,8 @@
 
 ![](eg/example.gif)
 
+![All](eg/family.gif)
+
 This is [a plugin](https://plugins.jetbrains.com/plugin/15090-pokemon-progress/versions) for [JetBrains IntelliJ IDEA](https://www.jetbrains.com/idea/) (And other compatible IDEs), which replaces your progress bars with a (random) Pokémon. The color of the progress bar fill is based on that Pokémon's type(s).
 
 ## Included Pokémon
@@ -24,7 +26,11 @@ This is [a plugin](https://plugins.jetbrains.com/plugin/15090-pokemon-progress/v
 * ![Nidoqueen (#031)](src/main/resources/com/kagof/intellij/plugins/pokeprogress/sprites/nidoqueen.gif) Nidoqueen (#031) ![Nidoqueen (#031)](src/main/resources/com/kagof/intellij/plugins/pokeprogress/sprites/nidoqueen_r.gif)
 * ![Nidoking (#034)](src/main/resources/com/kagof/intellij/plugins/pokeprogress/sprites/nidoking.gif) Nidoking (#034) ![Nidoking (#034)](src/main/resources/com/kagof/intellij/plugins/pokeprogress/sprites/nidoking_r.gif)
 * ![Jigglypuff (#039)](src/main/resources/com/kagof/intellij/plugins/pokeprogress/sprites/jigglypuff.gif) Jigglypuff (#039) ![Jigglypuff (#039)](src/main/resources/com/kagof/intellij/plugins/pokeprogress/sprites/jigglypuff_r.gif)
+* ![Diglett (#050)](src/main/resources/com/kagof/intellij/plugins/pokeprogress/sprites/diglett.gif) Diglett (#050) ![Diglett (#050)](src/main/resources/com/kagof/intellij/plugins/pokeprogress/sprites/diglett_r.gif)
+* ![Dugtrio (#051)](src/main/resources/com/kagof/intellij/plugins/pokeprogress/sprites/dugtrio.gif) Dugtrio (#051) ![Dugtrio (#051)](src/main/resources/com/kagof/intellij/plugins/pokeprogress/sprites/dugtrio_r.gif)
 * ![Meowth (#052)](src/main/resources/com/kagof/intellij/plugins/pokeprogress/sprites/meowth.gif) Meowth (#052) ![Meowth (#052)](src/main/resources/com/kagof/intellij/plugins/pokeprogress/sprites/meowth_r.gif)
+* ![Psyduck (#054)](src/main/resources/com/kagof/intellij/plugins/pokeprogress/sprites/psyduck.gif) Psyduck (#054) ![Psyduck (#054)](src/main/resources/com/kagof/intellij/plugins/pokeprogress/sprites/psyduck_r.gif)
+* ![Golduck (#055)](src/main/resources/com/kagof/intellij/plugins/pokeprogress/sprites/golduck.gif) Golduck (#055) ![Golduck (#055)](src/main/resources/com/kagof/intellij/plugins/pokeprogress/sprites/golduck_r.gif)
 * ![Alakazam (#065)](src/main/resources/com/kagof/intellij/plugins/pokeprogress/sprites/alakazam.gif) Alakazam (#065) ![Alakazam (#065)](src/main/resources/com/kagof/intellij/plugins/pokeprogress/sprites/alakazam_r.gif)
 * ![Machamp (#068)](src/main/resources/com/kagof/intellij/plugins/pokeprogress/sprites/machamp.gif) Machamp (#068) ![Machamp (#068)](src/main/resources/com/kagof/intellij/plugins/pokeprogress/sprites/machamp_r.gif)
 * ![Slowpoke (#079)](src/main/resources/com/kagof/intellij/plugins/pokeprogress/sprites/slowpoke.gif) Slowpoke (#079) ![Slowpoke (#079)](src/main/resources/com/kagof/intellij/plugins/pokeprogress/sprites/slowpoke_r.gif)
@@ -74,6 +80,8 @@ This is [a plugin](https://plugins.jetbrains.com/plugin/15090-pokemon-progress/v
 * ![Swampert (#260)](src/main/resources/com/kagof/intellij/plugins/pokeprogress/sprites/swampert.gif) Swampert (#260) ![Swampert (#260)](src/main/resources/com/kagof/intellij/plugins/pokeprogress/sprites/swampert_r.gif)
 * ![Wailmer (#320)](src/main/resources/com/kagof/intellij/plugins/pokeprogress/sprites/wailmer.gif) Wailmer (#320) ![Wailmer (#320)](src/main/resources/com/kagof/intellij/plugins/pokeprogress/sprites/wailmer_r.gif)
 * ![Wailord (#321)](src/main/resources/com/kagof/intellij/plugins/pokeprogress/sprites/wailord.gif) Wailord (#321) ![Wailord (#321)](src/main/resources/com/kagof/intellij/plugins/pokeprogress/sprites/wailord_r.gif)
+* ![Latias (#380)](src/main/resources/com/kagof/intellij/plugins/pokeprogress/sprites/latias.gif) Latias (#380) ![Latias (#380)](src/main/resources/com/kagof/intellij/plugins/pokeprogress/sprites/latias_r.gif)
+* ![Latios (#381)](src/main/resources/com/kagof/intellij/plugins/pokeprogress/sprites/latios.gif) Latios (#381) ![Latios (#381)](src/main/resources/com/kagof/intellij/plugins/pokeprogress/sprites/latios_r.gif)
 * ![Kyogre (#382)](src/main/resources/com/kagof/intellij/plugins/pokeprogress/sprites/kyogre.gif) Kyogre (#382) ![Kyogre (#382)](src/main/resources/com/kagof/intellij/plugins/pokeprogress/sprites/kyogre_r.gif)
 * ![Groudon (#383)](src/main/resources/com/kagof/intellij/plugins/pokeprogress/sprites/groudon.gif) Groudon (#383) ![Groudon (#383)](src/main/resources/com/kagof/intellij/plugins/pokeprogress/sprites/groudon_r.gif)
 * ![Rayquaza (#384)](src/main/resources/com/kagof/intellij/plugins/pokeprogress/sprites/rayquaza.gif) Rayquaza (#384) ![Rayquaza (#384)](src/main/resources/com/kagof/intellij/plugins/pokeprogress/sprites/rayquaza_r.gif)
@@ -132,6 +140,8 @@ This is [a plugin](https://plugins.jetbrains.com/plugin/15090-pokemon-progress/v
 * ![Zacian (#888)](src/main/resources/com/kagof/intellij/plugins/pokeprogress/sprites/zacian.gif) Zacian (#888) ![Zacian (#888)](src/main/resources/com/kagof/intellij/plugins/pokeprogress/sprites/zacian_r.gif)
 * ![Zamazenta (#889)](src/main/resources/com/kagof/intellij/plugins/pokeprogress/sprites/zamazenta.gif) Zamazenta (#889) ![Zamazenta (#889)](src/main/resources/com/kagof/intellij/plugins/pokeprogress/sprites/zamazenta_r.gif)
 
+[comment]: <> (end-included-pokemon)
+
 ## Contributing
 
 Contributions are very welcome on this project! Please see our [contributing guidelines](CONTRIBUTING.md) and [code of conduct](CODE_OF_CONDUCT.md) to get started.
@@ -166,8 +176,9 @@ Contributions are very welcome on this project! Please see our [contributing gui
 
 ### Misc
 
-* Gif editing done with [ImageMagick](https://imagemagick.org/script/index.php) (using [this](./editSprite.sh) script)
+* Sprite Gif editing done with [ImageMagick](https://imagemagick.org/script/index.php) (using [this](./editSprite.sh) script)
 * Types, names, numbers, & info mainly gathered from [Bulbapedia](https://bulbapedia.bulbagarden.net)
 * Type colours taken from [Bulbapedia's Type color templates](https://bulbapedia.bulbagarden.net/wiki/Category:Type_color_templates)
 * The idea for this plugin came from [KikiManjaro's Pokemon Trainer Progress Bar](https://plugins.jetbrains.com/plugin/14609-pokemon-trainer-progress-bar)
-* The Pokémon Company, for creating Pokémon
+* Family photo generated using [Scrimage](https://github.com/sksamuel/scrimage) for GIF reading & writing
+* The Pokémon Company, for creating Pokémon

build.gradle.kts

@@ -4,19 +4,20 @@ plugins {
 }
 
 group = "com.kagof"
-version = "1.5.0"
+version = "1.6.0"
 
 repositories {
     mavenCentral()
 }
 
 dependencies {
     testImplementation("junit", "junit", "4.12")
+    testImplementation("com.sksamuel.scrimage", "scrimage-core", "4.0.22")
 }
 
 // See https://github.com/JetBrains/gradle-intellij-plugin/
 intellij {
-    version = "2019.3"
+    version = "2020.1"
 }
 
 tasks.getByName<org.jetbrains.intellij.tasks.PublishTask>("publishPlugin") {

changenotes.html

@@ -1,22 +1,40 @@
 <ul>
+    <li><b><a href="https://github.com/kagof/intellij-pokemon-progress/releases/tag/1.6.0">1.6.0</a></b>
+        <!--1.6.0-->
+        <ul>
+            <li>Removes deprecated API usage</li>
+            <li>Updates IntelliJ minimum version to 2020.1, to aid with dynamic loading</li>
+            <li>Generates a single gif for the plugin description</li>
+            <li>new Gen I: Diglett, Dugtrio, Psyduck, Golduck</li>
+            <li>new Gen III: Latias, Latios</li>
+        </ul>
+        <!--/1.6.0-->
+    </li>
     <li><b><a href="https://github.com/kagof/intellij-pokemon-progress/releases/tag/1.5.0">1.5.0</a></b>
+        <!--1.5.0-->
         <ul>
             <li>Fixes resource loading to work with IntelliJ 2021.1</li>
             <li>Adds configurable transparent tails (on by default for indeterminate)</li>
             <li>adds preview panel to the configuration menu</li>
         </ul>
+        <!--/1.5.0-->
     </li>
     <li><b><a href="https://github.com/kagof/intellij-pokemon-progress/releases/tag/1.4.2">1.4.2</a></b>
+        <!--1.4.2-->
         <ul>
             <li>Yet another fix for configuration state persistence</li>
         </ul>
+        <!--/1.4.2-->
     </li>
     <li><b><a href="https://github.com/kagof/intellij-pokemon-progress/releases/tag/1.4.1">1.4.1</a></b>
+        <!--1.4.1-->
         <ul>
             <li>Fixes issue with config state deserialization (thanks @TheFreezingChicken for the bug report)</li>
         </ul>
+        <!--/1.4.1-->
     </li>
     <li><b><a href="https://github.com/kagof/intellij-pokemon-progress/releases/tag/1.4.0">1.4.0</a></b>
+        <!--1.4.0-->
         Happy new year! Starter Pokémon from all 8 generations are now in the plugin.
         <ul>
             <li>slows the acceleration of the indeterminate progress bar, and makes it configurable</li>
@@ -25,13 +43,17 @@
             <li>new Gen VI: Chespin, Chesnaught, Fennekin, Delphox, Froakie, Greninja</li>
             <li>new Gen VII: Rowlet, Decidueye, Litten, Incineroar, Popplio, Primarina</li>
         </ul>
+        <!--/1.4.0-->
     </li>
     <li><b><a href="https://github.com/kagof/intellij-pokemon-progress/releases/tag/1.3.1">1.3.1</a></b>
+        <!--1.3.1-->
         <ul>
             <li>reverts Java version to 8 so plugin works with Android Studio</li>
         </ul>
+        <!--/1.3.1-->
     </li>
     <li><b><a href="https://github.com/kagof/intellij-pokemon-progress/releases/tag/1.3.0">1.3.0</a></b>
+        <!--1.3.0-->
         <ul>
             <li>new Gen II: Raikou, Entei, Suicune, Lugia, Ho-Oh, Celebi (thanks @marcodenisi)</li>
             <li>new Gen III: Kyogre, Groudon, Rayquaza, Jirachi, Deoxys (thanks @Paola351)</li>
@@ -41,20 +63,26 @@
             <li>stores an instance of the icons on the PokemonProgressBarUi, for (hopefully) better performance</li>
             <li>plugin logo rasterized to look better</li>
         </ul>
+        <!--/1.3.0-->
     </li>
     <li><b><a href="https://github.com/kagof/intellij-pokemon-progress/releases/tag/1.2.2">1.2.2</a></b>
+        <!--1.2.2-->
         <ul>
             <li>Fixes since-build and until-build to indicate compatibility with IntelliJ &ge; 2019.3. This should mean
                 updates are not necessary for major versions of IntelliJ unless there actually are breaking changes.
             </li>
         </ul>
+        <!--/1.2.2-->
     </li>
     <li><b><a href="https://github.com/kagof/intellij-pokemon-progress/releases/tag/1.2.1">1.2.1</a></b>
+        <!--1.2.1-->
         <ul>
             <li>Updates plugin to work with IntelliJ 2020.3</li>
         </ul>
+        <!--/1.2.1-->
     </li>
     <li><b><a href="https://github.com/kagof/intellij-pokemon-progress/releases/tag/1.2.0">1.2.0</a></b>
+        <!--1.2.0-->
         <ul>
             <li>New Gen I: Nidoqueen, Nidoking, Jigglypuff, Alakazam, Machamp, Magnemite, Scyther, Dragonite</li>
             <li>New Gen II: Chikorita, Meganium, Cyndaquil, Typhlosion, Totodile, Feraligatr</li>
@@ -65,8 +93,10 @@
             <li>Fixes Mew sprite on Retina screens</li>
             <li>Fixes colour gradients</li>
         </ul>
+        <!--/1.2.0-->
     </li>
     <li><b><a href="https://github.com/kagof/intellij-pokemon-progress/releases/tag/1.1.0">1.1.0</a></b>
+        <!--1.1.0-->
         <ul>
             <li>New Gen I: Butterfree, Meowth, Slowpoke, Gengar, Koffing, Gyarados, Snorlax, Articuno, Zapdos, Moltres,
                 Mewtwo, Mew
@@ -78,23 +108,30 @@
             <li>Lazy loads Pokémon icons</li>
             <li>Plugin is now dynamically reloadable (uses Listeners instead of Component)</li>
         </ul>
+        <!--/1.1.0-->
     </li>
     <li><b><a href="https://github.com/kagof/intellij-pokemon-progress/releases/tag/1.0.2">1.0.2</a></b>
+        <!--1.0.2-->
         <ul>
             <li>fixes icon compatibility with Retina screens</li>
         </ul>
+        <!--/1.0.2-->
     </li>
     <li><b><a href="https://github.com/kagof/intellij-pokemon-progress/releases/tag/1.0.1">1.0.1</a></b>
+        <!--1.0.1-->
         <ul>
             <li>backwards compatibility with IntelliJ 2019.3.5</li>
             <li>fixes display issue when progress bar goes from indeterminate to determinate</li>
         </ul>
+        <!--/1.0.1-->
     </li>
     <li><b><a href="https://github.com/kagof/intellij-pokemon-progress/releases/tag/1.0.0">1.0.0</a></b>
+        <!--1.0.0-->
         <ul>
             <li>Initial release</li>
             <li>New Gen I: Bulbasaur, Venusaur, Charmander, Charizard, Squirtle, Blastoise, Pikachu, Eevee</li>
             <li>New Gen VII: Mimikyu</li>
         </ul>
+        <!--/1.0.0-->
     </li>
 </ul>