Skip to content

Commit 7e78dad

Browse files
committed
update: dependency
1 parent 1ff35c9 commit 7e78dad

File tree

3 files changed

+17
-18
lines changed

3 files changed

+17
-18
lines changed

.github/workflows/test.yml

+9-9
Original file line numberDiff line numberDiff line change
@@ -58,10 +58,10 @@ jobs:
5858
sc start MySQL
5959
6060
- name: Checkout
61-
uses: actions/checkout@v3
61+
uses: actions/checkout@v4
6262

6363
- name: Setup JDK 11
64-
uses: actions/setup-java@v3
64+
uses: actions/setup-java@v4
6565
with:
6666
distribution: 'adopt'
6767
java-version: '11'
@@ -120,10 +120,10 @@ jobs:
120120
brew services restart mysql -v
121121
122122
- name: Checkout
123-
uses: actions/checkout@v3
123+
uses: actions/checkout@v4
124124

125125
- name: Setup JDK 11
126-
uses: actions/setup-java@v3
126+
uses: actions/setup-java@v4
127127
with:
128128
distribution: 'adopt'
129129
java-version: '11'
@@ -179,10 +179,10 @@ jobs:
179179
mysqladmin -u root -proot create mirai
180180
181181
- name: Checkout
182-
uses: actions/checkout@v3
182+
uses: actions/checkout@v4
183183

184184
- name: Setup JDK 11
185-
uses: actions/setup-java@v3
185+
uses: actions/setup-java@v4
186186
with:
187187
distribution: 'adopt'
188188
java-version: '11'
@@ -216,10 +216,10 @@ jobs:
216216
runs-on: ubuntu-latest
217217
steps:
218218
- name: Checkout
219-
uses: actions/checkout@v3
219+
uses: actions/checkout@v4
220220

221221
- name: Setup JDK 11
222-
uses: actions/setup-java@v3
222+
uses: actions/setup-java@v4
223223
with:
224224
distribution: 'adopt'
225225
java-version: '11'
@@ -231,7 +231,7 @@ jobs:
231231
run: ./gradlew buildPlugin
232232

233233
- name: Upload
234-
uses: actions/upload-artifact@v3
234+
uses: actions/upload-artifact@v4
235235
with:
236236
name: build-${{ github.run_id }}
237237
path: build/mirai/*

build.gradle.kts

+4-4
Original file line numberDiff line numberDiff line change
@@ -29,14 +29,14 @@ repositories {
2929
dependencies {
3030
api("com.zaxxer:HikariCP:5.1.0")
3131
api("com.h2database:h2:2.2.224")
32-
api("org.xerial:sqlite-jdbc:3.45.1.0")
32+
api("org.xerial:sqlite-jdbc:3.45.3.0")
3333
api("com.mysql:mysql-connector-j:8.3.0")
3434
api("org.mariadb.jdbc:mariadb-java-client:3.3.3")
35-
api("org.postgresql:postgresql:42.7.2")
35+
api("org.postgresql:postgresql:42.7.3")
3636
api("org.reflections:reflections:0.10.2")
3737
compileOnly("xyz.cssxsh.mirai:mirai-administrator:1.4.0")
3838
testImplementation(kotlin("test"))
39-
testImplementation("com.microsoft.sqlserver:mssql-jdbc:12.6.1.jre11")
39+
testImplementation("com.microsoft.sqlserver:mssql-jdbc:12.7.0")
4040
//
4141
implementation(platform("net.mamoe:mirai-bom:2.16.0"))
4242
compileOnly("net.mamoe:mirai-core")
@@ -51,7 +51,7 @@ dependencies {
5151
api("org.hibernate.orm:hibernate-hikaricp")
5252
api("org.hibernate.orm:hibernate-community-dialects")
5353
//
54-
implementation(platform("org.slf4j:slf4j-parent:2.0.12"))
54+
implementation(platform("org.slf4j:slf4j-parent:2.0.13"))
5555
testImplementation("org.slf4j:slf4j-simple")
5656
}
5757

src/main/kotlin/xyz/cssxsh/mirai/hibernate/MiraiHibernateUtils.kt

+4-5
Original file line numberDiff line numberDiff line change
@@ -54,17 +54,16 @@ public fun dialects(): Set<Class<out Dialect>> {
5454

5555
/**
5656
* 获取 MSSQL 驱动 artifact id
57-
*
58-
* version by Property xyz.cssxsh.mirai.hibernate.mssql.version
5957
*/
6058
@PublishedApi
6159
internal fun mssql(): String {
6260
val java = System.getProperty("java.version")
6361
// val version = System.getProperty("xyz.cssxsh.mirai.hibernate.mssql.version", "11.2.3")
6462
return when {
65-
java.startsWith("17") -> "com.microsoft.sqlserver:mssql-jdbc:12.6.1.jre11"
66-
java.startsWith("11") -> "com.microsoft.sqlserver:mssql-jdbc:12.6.1.jre11"
67-
else -> "com.microsoft.sqlserver:mssql-jdbc:12.4.2.jre8"
63+
java.startsWith("17") -> "com.microsoft.sqlserver:mssql-jdbc:12.7.0.jre11-preview"
64+
java.startsWith("11") -> "com.microsoft.sqlserver:mssql-jdbc:12.7.0.jre11-preview"
65+
java.startsWith("8") -> "com.microsoft.sqlserver:mssql-jdbc:12.7.0.jre8-preview"
66+
else -> "com.microsoft.sqlserver:mssql-jdbc:12.7.0"
6867
}
6968
}
7069

0 commit comments

Comments
 (0)