Merge remote-tracking branch 'upstream/master' into 2009-merge

.github/workflows/build.yml

@@ -4,7 +4,7 @@ on: [pull_request, push]
 
 jobs:
   pr-lint:
-    name: Title linter
+    name: PR title
     runs-on: ubuntu-latest
     
     steps:
@@ -16,17 +16,14 @@ jobs:
 
   build:
     runs-on: windows-latest
-    strategy:
-      matrix:
-        java: [ 9, 11, 12 ]
-    name: Build (Java ${{ matrix.java }})
+    name: Build
 
     steps:
       - uses: actions/checkout@master
-      - name: Set up JDK ${{ matrix.java }}
+      - name: Set up JDK 11
         uses: actions/setup-java@master
         with:
-          java-version: ${{ matrix.java }}
+          java-version: 11
       - name: Assembling
         run: gradlew assemble --console=plain
       - name: Building
@@ -34,17 +31,14 @@ jobs:
 
   test:
     runs-on: windows-latest
-    strategy:
-      matrix:
-        java: [ 9, 11, 12 ]
-    name: Test (Java ${{ matrix.java }})
+    name: Test
 
     steps:
       - uses: actions/checkout@master
       - name: Set up JDK 11
         uses: actions/setup-java@master
         with:
-          java-version: ${{ matrix.java }}
+          java-version: 11
       - name: Assembling
         run: gradlew assemble --console=plain
       - name: Testing
@@ -74,5 +68,29 @@ jobs:
       - name: Approve pull request
         if: github.event_name == 'pull_request' && github.actor == 'OpenOSRS'
         uses: hmarr/auto-approve-action@master
+        with:
+          github-token: "${{ secrets.GITHUB_TOKEN }}"
+
+  merge:
+    name: Merge
+    needs: approve
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Merge pull request
+        if: github.event_name == 'pull_request' && github.actor == 'OpenOSRS'
+        uses: managedkaos/merge-pull-request@master
+        with:
+          github-token: "${{ secrets.GITHUB_TOKEN }}"
+
+  cleanup:
+    name: Cleanup
+    needs: merge
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Remove merged branch
+        if: github.event_name == 'pull_request' && github.actor == 'OpenOSRS'
+        uses: jessfraz/branch-cleanup-action@master
         with:
           github-token: "${{ secrets.GITHUB_TOKEN }}"

build.gradle

@@ -44,7 +44,7 @@ ext {
     hamcrest = '2.1'
     httpcore = '4.4.12'
     httpmime = '4.5.10'
-    javassist = '3.25.0-GA'
+    javassist = '3.26.0-GA'
     javax = '1.3.2'
     javaxInject = '1'
     jbsdiff = '1.0'
@@ -68,7 +68,7 @@ ext {
     mongodbDriverSync = '3.11.0'
     mysqlConnectorJava = '8.0.17'
     netty = '4.1.42.Final'
-    okhttp3 = '4.2.0'
+    okhttp3 = '4.2.1'
     orangeExtensions = '1.0'
     petitparser = '2.2.0'
     plexus = '3.2.1'
@@ -78,7 +78,7 @@ ext {
     sisu = '0.3.3'
     slf4j = '1.7.28'
     springJdbc = '5.2.0.RELEASE'
-    springboot = '2.1.8.RELEASE'
+    springboot = '2.1.9.RELEASE'
     sql2o = '1.6.0'
     substance = '8.0.02'
     trident = '1.5.00'