Merge branch 'dev' into dependabot/gradle/org.slf4j-slf4j-simple-2.0.6

# Conflicts: # build.gradle
Ultraviolet-Ninja · Dec 20, 2022 · 82accf0 · 82accf0
2 parents d4cc7c2 + ae63999
commit 82accf0
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 6 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -21,10 +21,16 @@ updates:
     ignore:
       - dependency-name: "com.jfoenix:jfoenix"
       - dependency-name: "io.github.palexdev:materialfx"
+    branches:
+      only:
+        - dev
 
   - package-ecosystem: "github-actions"
     directory: "/"
     schedule:
       interval: "monthly"
     allow:
-      - dependency-type: "all"
+      - dependency-type: "all"
+    branches:
+      only:
+        - dev
diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
@@ -42,7 +42,7 @@ jobs:
           # queries: security-extended,security-and-quality
 
       - name: Set up JDK 17
-        uses: actions/setup-java@v2
+        uses: actions/setup-java@v3
         with:
           java-version: 17
           distribution: 'adopt'

diff --git a/.github/workflows/publish_executables.yml b/.github/workflows/publish_executables.yml
@@ -17,7 +17,7 @@ jobs:
       - uses: actions/checkout@v3
 
       - name: Set up JDK 17
-        uses: actions/setup-java@v2
+        uses: actions/setup-java@v3
         with:
           java-version: 17
           distribution: 'adopt'
@@ -60,7 +60,7 @@ jobs:
       - uses: actions/checkout@v2
 
       - name: Set up JDK 17
-        uses: actions/setup-java@v2
+        uses: actions/setup-java@v3
         with:
           java-version: 17
           distribution: 'adopt'
@@ -90,7 +90,7 @@ jobs:
       - uses: actions/checkout@v2
 
       - name: Set up JDK 17
-        uses: actions/setup-java@v2
+        uses: actions/setup-java@v3
         with:
           java-version: 17
           distribution: 'adopt'

diff --git a/build.gradle b/build.gradle
@@ -58,7 +58,7 @@ dependencies {
     }
 
     testImplementation 'org.testng:testng:7.7.0'
-    testImplementation 'org.slf4j:slf4j-api:2.0.5'
+    testImplementation 'org.slf4j:slf4j-api:2.0.6'
     testImplementation 'org.slf4j:slf4j-simple:2.0.6'
     testImplementation 'nl.jqno.equalsverifier:equalsverifier:3.12.2'
 }