Skip to content

Commit 383e674

Browse files
Merge branch 'main' into dependabot/github_actions/actions/checkout-5
2 parents f380bd1 + 4d11509 commit 383e674

4 files changed

Lines changed: 22 additions & 16 deletions

File tree

.github/workflows/gradle.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
runs-on: ubuntu-latest
1111
strategy:
1212
matrix:
13-
java-version: ['11', '17']
13+
java-version: ['17', '21']
1414

1515
steps:
1616
- uses: actions/checkout@v5
@@ -22,4 +22,4 @@ jobs:
2222
- name: Lint
2323
run: gradle spotlessCheck
2424
- name: Build & Test
25-
run: gradle test -x spotlessApply
25+
run: gradle test -x spotlessApply --info

.github/workflows/mvn.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
runs-on: ubuntu-latest
1111
strategy:
1212
matrix:
13-
java-version: ['11', '17']
13+
java-version: ['11', '17', '21']
1414

1515
steps:
1616
- uses: actions/checkout@v5

build.gradle

Lines changed: 15 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
plugins {
22
id 'application'
33
id "com.diffplug.spotless" version "7.2.1"
4+
id 'jvm-test-suite'
45
}
56

67
java {
7-
sourceCompatibility = JavaVersion.VERSION_11
8-
targetCompatibility = JavaVersion.VERSION_11
8+
sourceCompatibility = JavaVersion.VERSION_17
9+
targetCompatibility = JavaVersion.VERSION_17
910
}
1011

1112
repositories {
@@ -15,23 +16,28 @@ repositories {
1516
dependencies {
1617
implementation("ch.qos.logback:logback-classic:1.5.18")
1718
// ***** SOCKET MODE DEPENDENCIES ***** -->
18-
implementation("com.slack.api:bolt:1.45.3")
19-
implementation("com.slack.api:bolt-socket-mode:1.45.3")
19+
implementation("com.slack.api:bolt:1.45.4")
20+
implementation("com.slack.api:bolt-socket-mode:1.45.4")
2021
implementation("javax.websocket:javax.websocket-api:1.1")
2122
implementation("org.glassfish.tyrus.bundles:tyrus-standalone-client:(,1.19]")
2223
// ***** OAUTH DEPENDENCIES *****
23-
implementation("com.slack.api:bolt-jetty:1.45.3")
24+
implementation("com.slack.api:bolt-jetty:1.45.4")
2425
// ***** TEST DEPENDENCIES *****
25-
testImplementation('org.junit.jupiter:junit-jupiter-engine:5.13.4')
26-
testImplementation('org.mockito:mockito-core:5.18.0')
26+
testImplementation('org.junit.jupiter:junit-jupiter-api:5.13.4')
27+
testRuntimeOnly('org.junit.jupiter:junit-jupiter-engine:5.13.4')
28+
testImplementation('org.mockito:mockito-core:5.19.0')
2729
}
2830

2931
application {
3032
mainClass = 'Main'
3133
}
3234

33-
tasks.named('test') {
34-
useJUnit()
35+
testing {
36+
suites {
37+
test {
38+
useJUnitJupiter()
39+
}
40+
}
3541
}
3642

3743
spotless {

pom.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -72,12 +72,12 @@
7272
<dependency>
7373
<groupId>com.slack.api</groupId>
7474
<artifactId>bolt</artifactId>
75-
<version>1.45.3</version>
75+
<version>1.45.4</version>
7676
</dependency>
7777
<dependency>
7878
<groupId>com.slack.api</groupId>
7979
<artifactId>bolt-socket-mode</artifactId>
80-
<version>1.45.3</version>
80+
<version>1.45.4</version>
8181
</dependency>
8282
<dependency>
8383
<groupId>javax.websocket</groupId>
@@ -93,7 +93,7 @@
9393
<dependency>
9494
<groupId>com.slack.api</groupId>
9595
<artifactId>bolt-jetty</artifactId>
96-
<version>1.45.3</version>
96+
<version>1.45.4</version>
9797
</dependency>
9898
<!-- ***** TEST DEPENDENCIES ***** -->
9999
<dependency>
@@ -105,7 +105,7 @@
105105
<dependency>
106106
<groupId>org.mockito</groupId>
107107
<artifactId>mockito-core</artifactId>
108-
<version>5.18.0</version>
108+
<version>5.19.0</version>
109109
<scope>test</scope>
110110
</dependency>
111111
</dependencies>

0 commit comments

Comments
 (0)