Skip to content

Commit 6225803

Browse files
cssxshcssxsh
committed
build: 2.3.0
1 parent 1d9e8e7 commit 6225803

File tree

8 files changed

+78
-25
lines changed

8 files changed

+78
-25
lines changed

‎.github/workflows/setup.yml

+26-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: Setup
1+
name: Setup and Build
22
on: [ push, pull_request ]
33

44
jobs:
@@ -43,4 +43,28 @@ jobs:
4343
- name: EChartsTest
4444
env:
4545
GITHUB_TOKEN: ${{ github.token }}
46-
run: ./gradlew test --tests "xyz.cssxsh.selenium.EChartsTest" --scan --info
46+
run: ./gradlew test --tests "xyz.cssxsh.selenium.EChartsTest" --scan --info
47+
build:
48+
needs: [setup-selenium]
49+
runs-on: ubuntu-latest
50+
steps:
51+
- name: Checkout
52+
uses: actions/checkout@v3
53+
54+
- name: Setup JDK 11
55+
uses: actions/setup-java@v3
56+
with:
57+
distribution: 'adopt'
58+
java-version: '11'
59+
60+
- name: chmod -R 777 *
61+
run: chmod -R 777 *
62+
63+
- name: Build Plugin
64+
run: ./gradlew buildPlugin
65+
66+
- name: Upload
67+
uses: actions/upload-artifact@v3
68+
with:
69+
name: build-${{ github.run_id }}
70+
path: build/mirai/*

‎CHANGELOG.md

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
# 2.3.0 (23/03/16)
2+
3+
1. update: selenium-java 4.8.1

‎build.gradle.kts

+6-7
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@ plugins {
22
kotlin("jvm") version "1.7.22"
33
kotlin("plugin.serialization") version "1.7.22"
44

5-
id("net.mamoe.mirai-console") version "2.14.0-RC"
5+
id("net.mamoe.mirai-console") version "2.14.0"
66
id("me.him188.maven-central-publish") version "1.0.0-dev-3"
7-
id("me.him188.kotlin-jvm-blocking-bridge") version "2.2.0-172.1"
7+
id("me.him188.kotlin-jvm-blocking-bridge") version "2.2.0-180.1"
88
}
99

1010
group = "xyz.cssxsh.mirai"
11-
version = "2.2.5"
11+
version = "2.3.0"
1212

1313
mavenCentralPublish {
1414
useCentralS01()
@@ -28,12 +28,11 @@ repositories {
2828

2929
dependencies {
3030
api("com.github.jknack:handlebars:4.3.1")
31-
api("org.seleniumhq.selenium:selenium-java:4.8.0")
31+
api("org.seleniumhq.selenium:selenium-java:4.8.1")
3232
testImplementation(kotlin("test"))
3333
testImplementation("org.icepear.echarts:echarts-java:1.0.7")
34-
testCompileOnly("org.projectlombok:lombok:1.18.24")
3534
//
36-
implementation(platform("net.mamoe:mirai-bom:2.14.0-RC"))
35+
implementation(platform("net.mamoe:mirai-bom:2.14.0"))
3736
testImplementation("net.mamoe:mirai-logging-slf4j")
3837
testImplementation("net.mamoe:mirai-console-compiler-common")
3938
//
@@ -42,7 +41,7 @@ dependencies {
4241
testImplementation("org.slf4j:jcl-over-slf4j:2.0.6")
4342
testImplementation("org.slf4j:jul-to-slf4j:2.0.6")
4443
//
45-
implementation(platform("io.netty:netty-bom:4.1.87.Final"))
44+
implementation(platform("io.netty:netty-bom:4.1.90.Final"))
4645
}
4746

4847
kotlin {

‎src/main/kotlin/xyz/cssxsh/mirai/selenium/MiraiSeleniumPlugin.kt

+2-2
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ public object MiraiSeleniumPlugin : KotlinPlugin(
2121
JvmPluginDescription(
2222
id = "xyz.cssxsh.mirai.plugin.mirai-selenium-plugin",
2323
name = "mirai-selenium-plugin",
24-
version = "2.2.5",
24+
version = "2.3.0",
2525
) {
2626
author("cssxsh")
2727
}
@@ -143,7 +143,7 @@ public object MiraiSeleniumPlugin : KotlinPlugin(
143143
if ("root" == System.getProperty("user.name")) {
144144
logger.error { "由于浏览器的运行特性，root 用户下将无法保证插件运行正常" }
145145
}
146-
logger.info { "如果要在 Linux 下使用 headless (无窗户后台模式)浏览器, 请安装 xvfb, 并启用 xvfb 服务" }
146+
logger.info { "如果要在 Linux 下使用 headless (无窗户后台模式)浏览器, 请关闭X转发" }
147147
}
148148

149149
MiraiSeleniumConfig.reload()

‎src/test/kotlin/xyz/cssxsh/selenium/EChartsTest.kt

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
package xyz.cssxsh.selenium
22

33
import org.icepear.echarts.*
4-
import org.icepear.echarts.components.coord.cartesian.ValueAxis
4+
import org.icepear.echarts.components.coord.cartesian.*
55
import org.icepear.echarts.serializer.*
6-
import org.junit.jupiter.api.Test
7-
import org.openqa.selenium.OutputType
6+
import org.junit.jupiter.api.*
7+
import org.openqa.selenium.*
88

99
internal class EChartsTest : SeleniumTest() {
1010

‎src/test/kotlin/xyz/cssxsh/selenium/SeleniumDevToolsKtTest.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package xyz.cssxsh.selenium
22

3-
import org.junit.jupiter.api.Test
3+
import org.junit.jupiter.api.*
44

55
internal class SeleniumDevToolsKtTest : SeleniumTest() {
66

‎src/test/kotlin/xyz/cssxsh/selenium/SeleniumTest.kt

+36-9
Original file line numberDiff line numberDiff line change
@@ -32,21 +32,48 @@ internal abstract class SeleniumTest {
3232
when {
3333
platform.`is`(Platform.WIN10) -> listOf("Edge", "Chrome", "Firefox")
3434
platform.`is`(Platform.WINDOWS) -> {
35-
System.setProperty(EdgeDriverService.EDGE_DRIVER_EXE_PROPERTY, System.getenv("EDGEWEBDRIVER") + "/msedgedriver.exe")
36-
System.setProperty(ChromeDriverService.CHROME_DRIVER_EXE_PROPERTY, System.getenv("CHROMEWEBDRIVER") + "/chromedriver.exe")
37-
System.setProperty(GeckoDriverService.GECKO_DRIVER_EXE_PROPERTY, System.getenv("GECKOWEBDRIVER") + "/geckodriver.exe")
35+
System.setProperty(
36+
EdgeDriverService.EDGE_DRIVER_EXE_PROPERTY,
37+
System.getenv("EDGEWEBDRIVER") + "/msedgedriver.exe"
38+
)
39+
System.setProperty(
40+
ChromeDriverService.CHROME_DRIVER_EXE_PROPERTY,
41+
System.getenv("CHROMEWEBDRIVER") + "/chromedriver.exe"
42+
)
43+
System.setProperty(
44+
GeckoDriverService.GECKO_DRIVER_EXE_PROPERTY,
45+
System.getenv("GECKOWEBDRIVER") + "/geckodriver.exe"
46+
)
3847
listOf("Edge", "Chromium", "Firefox")
3948
}
4049
platform.`is`(Platform.LINUX) -> {
41-
System.setProperty(EdgeDriverService.EDGE_DRIVER_EXE_PROPERTY, System.getenv("EDGEWEBDRIVER") + "/msedgedriver")
42-
System.setProperty(ChromeDriverService.CHROME_DRIVER_EXE_PROPERTY, System.getenv("CHROMEWEBDRIVER") + "/chromedriver")
43-
System.setProperty(GeckoDriverService.GECKO_DRIVER_EXE_PROPERTY, System.getenv("GECKOWEBDRIVER") + "/geckodriver")
50+
System.setProperty(
51+
EdgeDriverService.EDGE_DRIVER_EXE_PROPERTY,
52+
System.getenv("EDGEWEBDRIVER") + "/msedgedriver"
53+
)
54+
System.setProperty(
55+
ChromeDriverService.CHROME_DRIVER_EXE_PROPERTY,
56+
System.getenv("CHROMEWEBDRIVER") + "/chromedriver"
57+
)
58+
System.setProperty(
59+
GeckoDriverService.GECKO_DRIVER_EXE_PROPERTY,
60+
System.getenv("GECKOWEBDRIVER") + "/geckodriver"
61+
)
4462
listOf("Edge", "Chromium", "Firefox")
4563
}
4664
platform.`is`(Platform.MAC) -> {
47-
System.setProperty(EdgeDriverService.EDGE_DRIVER_EXE_PROPERTY, System.getenv("EDGEWEBDRIVER") + "/msedgedriver")
48-
System.setProperty(ChromeDriverService.CHROME_DRIVER_EXE_PROPERTY, System.getenv("CHROMEWEBDRIVER") + "/chromedriver")
49-
System.setProperty(GeckoDriverService.GECKO_DRIVER_EXE_PROPERTY, System.getenv("GECKOWEBDRIVER") + "/geckodriver")
65+
System.setProperty(
66+
EdgeDriverService.EDGE_DRIVER_EXE_PROPERTY,
67+
System.getenv("EDGEWEBDRIVER") + "/msedgedriver"
68+
)
69+
System.setProperty(
70+
ChromeDriverService.CHROME_DRIVER_EXE_PROPERTY,
71+
System.getenv("CHROMEWEBDRIVER") + "/chromedriver"
72+
)
73+
System.setProperty(
74+
GeckoDriverService.GECKO_DRIVER_EXE_PROPERTY,
75+
System.getenv("GECKOWEBDRIVER") + "/geckodriver"
76+
)
5077
listOf("Edge", "Chromium", "Firefox")
5178
}
5279
else -> throw UnsupportedOperationException("不受支持的平台 $platform")

‎src/test/kotlin/xyz/cssxsh/selenium/SeleniumToolKtTest.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ internal class SeleniumToolKtTest : SeleniumTest() {
1010
@Timeout(value = 5, unit = TimeUnit.MINUTES)
1111
fun screenshot(): Unit = testRemoteWebDriver { browser, driver ->
1212

13-
val url = "https://t.bilibili.com/h5/dynamic/detail/450055453856015371"
13+
val url = "https://t.bilibili.com/761278379279253527"
1414

1515
val hide = arrayOf(".open-app", ".launch-app-btn", ".unlogin-popover", ".no-login")
1616

0 commit comments

Comments
 (0)