Merge branch 'master' into nimak/update-javaparser

ucr-riple · Oct 3, 2024 · 7edc984 · 7edc984
2 parents 7e4dfb1 + 9b53333
commit 7edc984
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml
@@ -43,9 +43,9 @@ jobs:
   build-with-upload-artifact:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - name: Set up JDK 11
-        uses: actions/setup-java@v2
+        uses: actions/setup-java@v4
         with:
           java-version: 11
           distribution: 'temurin'

diff --git a/.gitignore b/.gitignore
@@ -3,6 +3,7 @@
 build/
 **/build/
 build
+bin/
 /.idea/
 *.iml
 local.properties
-Original file line number
+Diff line change
@@ Expand Up / @@ -3,6 +3,7 @@ @@
     build/
     **/build/
     build
+    bin/
     /.idea/
     *.iml
     local.properties
@@ Expand Down @@