Merge branch '2020.2' into 2020.3

.github/workflows/publish.yml

@@ -0,0 +1,56 @@
+name: Publish Plugin
+on:
+  push:
+    tags:
+      - '[0-9].[0-9].[0-9]-[0-9][0-9][0-9][0-9].[1-3]'
+
+jobs:
+  publish:
+    name: Publish
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - uses: actions/setup-java@v1
+        with:
+          java-version: 11
+      - uses: actions/cache@v2
+        with:
+          path: |
+            ~/.gradle/caches
+            ~/.gradle/jdks
+            ~/.gradle/native
+            ~/.gradle/wrapper
+          key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*') }}-${{ hashFiles('gradle.properties') }}
+          restore-keys: |
+            ${{ runner.os }}-gradle-
+      - uses: gradle/wrapper-validation-action@v1
+      - name: Setup publish token
+        env:
+          JETBRAINS_TOKEN: ${{ secrets.JETBRAINS_TOKEN }}
+        shell: bash
+        run: |
+          mkdir -p ~/.gradle/
+          echo "GRADLE_USER_HOME=$HOME/.gradle" >> "$GITHUB_ENV"
+          echo "mcdev.deploy.token=${JETBRAINS_TOKEN}" > ~/.gradle/gradle.properties
+      - name: Publish plugin
+        run: ./gradlew clean publishPlugin --no-daemon --stacktrace
+      - name: Get tag name
+        id: get_tag
+        shell: bash
+        # Tag name is reversed from release name due to how IntelliJ parses plugin version numbers
+        run: |
+          tag_name="$(echo $GITHUB_REF | cut -d / -f 3)"
+          echo ::set-output name=tag::$tag_name
+          version_array=(${tag_name//-/ })
+          echo ::set-output name=release::${version_array[1]}-${version_array[0]}
+      - name: Create GitHub Release
+        uses: softprops/action-gh-release@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          tag_name: ${{ steps.get_tag.outputs.tag }}
+          name: 'Release ${{ steps.get_tag.outputs.release }}'
+          body: '## [View all plugin releases here.](https://plugins.jetbrains.com/plugin/8327-minecraft-development/versions/stable/)'
+          prerelease: false
+          draft: false
+          files: build/distributions/*.zip

.github/workflows/linux.yml → .github/workflows/test.yml

@@ -1,9 +1,20 @@
-name: Linux Build
-on: [push, pull_request]
+name: Test
+on:
+  push:
+    branches: ['*']
+  pull_request:
+    branches: ['*']
+
 jobs:
   build:
     name: Build
-    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        os:
+          - 'ubuntu-latest'
+          - 'macos-latest'
+          - 'windows-latest'
+    runs-on: ${{ matrix.os }}
     steps:
       - uses: actions/checkout@v2
       - uses: actions/setup-java@v1
@@ -13,6 +24,9 @@ jobs:
         with:
           path: |
             ~/.gradle/caches
+            ~/.gradle/jdks
+            ~/.gradle/native
+            ~/.gradle/wrapper
           key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*') }}-${{ hashFiles('gradle.properties') }}
           restore-keys: |
             ${{ runner.os }}-gradle-

build.gradle.kts

@@ -132,6 +132,10 @@ tasks.publishPlugin {
     channels(properties["mcdev.deploy.channel"] ?: "Stable")
 }
 
+tasks.runPluginVerifier {
+    ideVersions(listOf("IC-2020.1.3", "IC-2020.1.4"))
+}
+
 java {
     toolchain {
         languageVersion.set(JavaLanguageVersion.of(11))

gradle.properties

@@ -14,7 +14,7 @@ kotlin.code.style=official
 ideaVersion = 2020.3.2
 ideaVersionName = 2020.3
 
-coreVersion = 1.5.6
+coreVersion = 1.5.7
 downloadIdeaSources = true
 
 pluginTomlVersion = 0.2.140.3644-203

readme.md

@@ -29,23 +29,19 @@ Minecraft Development for IntelliJ
         <td align="left"><a href="https://ci.demonwav.com/viewType.html?buildTypeId=MinecraftDev_Nightly_20211"><img src="https://tc.demonwav.com/app/rest/builds/buildType:(id:MinecraftDev_Nightly_20211)/statusIcon.svg" alt="2021.1 EAP Nightly Status" /></a></td>
     </tr>
     <tr>
-        <td align="right" rowspan="3"><b>OS Tests</b></td>
+        <td align="right"><b>OS Tests</b></td>
         <td align="left" colspan="2">
-            <a href="https://github.com/minecraft-dev/MinecraftDev/actions?query=workflow%3A%22Linux+Build%22"><img src="https://github.com/minecraft-dev/MinecraftDev/workflows/Linux%20Build/badge.svg?branch=dev&event=push" alt="Linux GitHub Action Status" /></a>
-            <br/>
-            <a href="https://github.com/minecraft-dev/MinecraftDev/actions?query=workflow%3A%22macOS+Build%22"><img src="https://github.com/minecraft-dev/MinecraftDev/workflows/macOS%20Build/badge.svg?branch=dev&event=push" alt="macOS GitHub Action Status" /></a>
-            <br/>
-            <a href="https://github.com/minecraft-dev/MinecraftDev/actions?query=workflow%3A%22Windows+Build%22"><img src="https://github.com/minecraft-dev/MinecraftDev/workflows/Windows%20Build/badge.svg?branch=dev&event=push" alt="Windows GitHub Action Status" /></a>        
-        </td>
+            <a href="https://github.com/minecraft-dev/MinecraftDev/actions?query=workflow%3A%22Test%22"><img src="https://github.com/minecraft-dev/MinecraftDev/workflows/Test/badge.svg?branch=dev&event=push" alt="GitHub Action Status" /></a>
+         </td>
     </tr>
 </table>
 
-Info and Documentation [![Current Release](https://img.shields.io/badge/release-1.5.6-orange.svg?style=flat-square)](https://plugins.jetbrains.com/plugin/8327)
+Info and Documentation [![Current Release](https://img.shields.io/badge/release-1.5.7-orange.svg?style=flat-square)](https://plugins.jetbrains.com/plugin/8327)
 ----------------------
 
 <a href="https://discord.gg/j6UNcfr"><img src="https://i.imgur.com/JXu9C1G.png" height="48px"></img></a>
 
-Visit [https://minecraftdev.org](https://minecraftdev.org) for a little information about the project.
+Visit [https://minecraftdev.org](https://minecraftdev.org) for some information about the project.
 
 
 Installation
@@ -60,8 +56,6 @@ box, simply search for `Minecraft`. You can install it from there and restart In
 Building
 --------
 
-JDK 8 is required.
-
 Build the plugin with:
 
 `./gradlew build`