diff --git a/app/desktop/src/test/resources/screenshots/windows/00-transfer.png b/app/desktop/src/test/resources/screenshots/windows/00-transfer.png index ff3e7bb..dfef7bc 100644 Binary files a/app/desktop/src/test/resources/screenshots/windows/00-transfer.png and b/app/desktop/src/test/resources/screenshots/windows/00-transfer.png differ diff --git a/app/desktop/src/test/resources/screenshots/windows/01-connect.png b/app/desktop/src/test/resources/screenshots/windows/01-connect.png index e936b9d..2e8bc04 100644 Binary files a/app/desktop/src/test/resources/screenshots/windows/01-connect.png and b/app/desktop/src/test/resources/screenshots/windows/01-connect.png differ diff --git a/app/desktop/src/test/resources/screenshots/windows/02-sync.png b/app/desktop/src/test/resources/screenshots/windows/02-sync.png index 3dd1fd8..4a8bdd7 100644 Binary files a/app/desktop/src/test/resources/screenshots/windows/02-sync.png and b/app/desktop/src/test/resources/screenshots/windows/02-sync.png differ diff --git a/app/desktop/src/test/resources/screenshots/windows/03-jobs.png b/app/desktop/src/test/resources/screenshots/windows/03-jobs.png index ee79d21..d2f351f 100644 Binary files a/app/desktop/src/test/resources/screenshots/windows/03-jobs.png and b/app/desktop/src/test/resources/screenshots/windows/03-jobs.png differ diff --git a/app/desktop/src/test/resources/screenshots/windows/04-job-detail.png b/app/desktop/src/test/resources/screenshots/windows/04-job-detail.png index 2103292..27e38be 100644 Binary files a/app/desktop/src/test/resources/screenshots/windows/04-job-detail.png and b/app/desktop/src/test/resources/screenshots/windows/04-job-detail.png differ diff --git a/app/desktop/src/test/resources/screenshots/windows/05-logs.png b/app/desktop/src/test/resources/screenshots/windows/05-logs.png index 9d58df2..5b9048d 100644 Binary files a/app/desktop/src/test/resources/screenshots/windows/05-logs.png and b/app/desktop/src/test/resources/screenshots/windows/05-logs.png differ diff --git a/app/desktop/src/test/resources/screenshots/windows/06-settings.png b/app/desktop/src/test/resources/screenshots/windows/06-settings.png index b38b4c7..70ca358 100644 Binary files a/app/desktop/src/test/resources/screenshots/windows/06-settings.png and b/app/desktop/src/test/resources/screenshots/windows/06-settings.png differ diff --git a/app/desktop/src/test/resources/screenshots/windows/07-transfer-light.png b/app/desktop/src/test/resources/screenshots/windows/07-transfer-light.png index 7dcf5ef..6b2797c 100644 Binary files a/app/desktop/src/test/resources/screenshots/windows/07-transfer-light.png and b/app/desktop/src/test/resources/screenshots/windows/07-transfer-light.png differ diff --git a/app/desktop/src/test/resources/screenshots/windows/08-transfer-compare.png b/app/desktop/src/test/resources/screenshots/windows/08-transfer-compare.png index a271cae..066dfea 100644 Binary files a/app/desktop/src/test/resources/screenshots/windows/08-transfer-compare.png and b/app/desktop/src/test/resources/screenshots/windows/08-transfer-compare.png differ diff --git a/app/desktop/src/test/resources/screenshots/windows/09-transfer-card.png b/app/desktop/src/test/resources/screenshots/windows/09-transfer-card.png index c85901c..3b124d8 100644 Binary files a/app/desktop/src/test/resources/screenshots/windows/09-transfer-card.png and b/app/desktop/src/test/resources/screenshots/windows/09-transfer-card.png differ diff --git a/app/desktop/src/test/resources/screenshots/windows/10-transfer-viewmenu.png b/app/desktop/src/test/resources/screenshots/windows/10-transfer-viewmenu.png index eeb1a37..b9bc022 100644 Binary files a/app/desktop/src/test/resources/screenshots/windows/10-transfer-viewmenu.png and b/app/desktop/src/test/resources/screenshots/windows/10-transfer-viewmenu.png differ diff --git a/app/desktop/src/test/resources/screenshots/windows/11-transfer-compact.png b/app/desktop/src/test/resources/screenshots/windows/11-transfer-compact.png index 9969a0b..95c06e5 100644 Binary files a/app/desktop/src/test/resources/screenshots/windows/11-transfer-compact.png and b/app/desktop/src/test/resources/screenshots/windows/11-transfer-compact.png differ diff --git a/app/desktop/src/test/resources/screenshots/windows/12-transfer-thumb.png b/app/desktop/src/test/resources/screenshots/windows/12-transfer-thumb.png index 0e7064a..37dadb9 100644 Binary files a/app/desktop/src/test/resources/screenshots/windows/12-transfer-thumb.png and b/app/desktop/src/test/resources/screenshots/windows/12-transfer-thumb.png differ diff --git a/docs/RELEASING.md b/docs/RELEASING.md index 2285640..ca5c8e5 100644 --- a/docs/RELEASING.md +++ b/docs/RELEASING.md @@ -133,3 +133,22 @@ If `Protocol.VERSION` changes: meaningful again, and the downgrade path needs a real test. - Both ends must be able to keep talking at the lower version, or the release notes have to say plainly that they cannot. + +## 版本与验证(2026-10-25 定) + +**没通过验证的改动,不升版本号。** 版本号是「这一份包给川验证」的标签,不是每次提交的计数器。 + +| 阶段 | 做法 | +|---|---| +| 改一处、要给他看 | 版本号**不动**,改动累积在当前未通过的版本上 | +| 要重新出包 | 重打**同一个** tag;draft 未 publish 时允许,资产 `--clobber` 覆盖 | +| 他验证通过 | 才把版本号 +1,写 `docs/releases/v<新版本>.md`,打新 tag 出 draft | +| draft 已 publish | tag 与资产**冻结**,只能发下一版 | + +重打 tag 只对未发布的 draft 有效。已 publish 的版本再重打,等于改历史:别人下载过的东西和仓库对不上。 + +**每条改动走 PR,不绕过规则。** `main` 上的 `Changes must be made through a pull request` 是给所有人(包括维护者)定的;`Repository admin` 的 bypass 只在修 CI 自身、且 PR 无法验证时用,用过就在提交信息里写一句为什么。 + +**本地先出包,再等 CI。** `脚本/local-release.py` 两分钟出 `发布/win64/`(含 APK),要验证的永远是这一份;CI 负责正式签名的 draft,不该成为验证的等待点。 + +**截图基线跟着版本号走。** 状态栏与设置页都画版本号,所以升版本会改动全部桌面基线:先 `CUBSYNC_SCREENSHOTS=update` 收基线,再提交。若是重打同一个版本(版本号没变),基线不该变——变了说明界面真的动了。 diff --git a/docs/releases/v0.3.15.md b/docs/releases/v0.3.15.md index 2a6b0f6..08f34aa 100644 --- a/docs/releases/v0.3.15.md +++ b/docs/releases/v0.3.15.md @@ -15,6 +15,8 @@ **USB-ADB 不再是"已留位"。** 插上数据线,在「连接方式」里就能看到设备并发起连接:电脑端用 `adb forward` 把设备端口映射到本机,之后走的是和局域网完全一样的连接。手机端那一行现在是纯展示 —— 转发在电脑上做,手机只需要保持共享开启。 +**手机端「USB_ADB」这一行点了有回应。** 数据线变成通道,是在电脑上跑 `adb forward` 完成的;手机本来就在监听同一个端口,所以这一端没有可开关的东西 —— 点它会这么说,而不是没反应。 + **协议协商**:没连上远端时,「远端版本」显示 `—`,不再显示 `0`(那个 0 读起来像协议之前的构建)。 #### 注意 @@ -42,6 +44,8 @@ **USB-ADB is no longer "reserved".** Plug in a cable and the device appears under 连接方式 and can be connected: the desktop runs `adb forward` to map the device's port onto this machine, and what follows is the same connection the local network uses. On the phone that row is a view rather than a switch — forwarding happens on the host, and the phone only has to keep sharing on. +**The phone's `USB_ADB` row answers.** The cable becomes a channel when the desktop runs `adb forward`; the phone is already listening on that same port, so there is nothing to switch on this end — tapping says so instead of doing nothing. + **Protocol negotiation**: with no peer, the remote version reads `—` instead of `0`, which looked like a build from before the protocol existed. #### Notes diff --git a/docs/releases/v0.3.16.md b/docs/releases/v0.3.16.md deleted file mode 100644 index d9c244c..0000000 --- a/docs/releases/v0.3.16.md +++ /dev/null @@ -1,49 +0,0 @@ -
-

中文说明

- -#### 下载 - -| 平台 | 文件 | -|---|---| -| Windows 安装 | `CubSync-0.3.16.msi` | -| Windows 绿色 | `CubSync-v0.3.16-windows-x64.zip` | -| Android | `CubSync-v0.3.16.apk` | - -#### 这一版改了什么 - -**手机端「USB_ADB」这一行点了有回应了。** 上一版把它改成了点了什么也不做,是错的。现在的行为说明了它是怎么回事:数据线变成通道,是在电脑上跑 `adb forward` 完成的;手机本来就在监听同一个端口,所以这一端没有可开关的东西 —— 点它会这么告诉你,而不是没反应。 - -其余与 0.3.15 相同:深色模式的可读性修复、桌面端 USB-ADB 插线即连、未连接时远端版本显示 `—`。 - -#### 注意 - -- 桌面端插线连接:装好 platform-tools,`adb devices` 能看到设备,再在「连接方式」里点它。 -- 手机端不需要开任何东西;保持共享开启即可。 -- 两端请保持同一协议版本(v1)。 - -
- -
-

English

- -#### Download - -| Platform | File | -|---|---| -| Windows installer | `CubSync-0.3.16.msi` | -| Windows portable | `CubSync-v0.3.16-windows-x64.zip` | -| Android | `CubSync-v0.3.16.apk` | - -#### What changed - -**The phone's `USB_ADB` row answers again.** The previous build made it do nothing when tapped, which was wrong. It now explains what it is: the cable becomes a channel when the desktop runs `adb forward`, and the phone is already listening on that same port, so there is nothing to switch on this end. - -Everything else is 0.3.15: readable dark mode, USB-ADB connecting over the cable from the desktop, and `—` instead of `0` for a remote version that does not exist. - -#### Notes - -- Connecting over the cable on the desktop needs platform-tools on the PATH; `adb devices` should list the phone before 「连接方式」 shows it. -- Nothing needs switching on the phone — keep sharing on. -- Keep both ends on the same protocol version (v1). - -
diff --git a/gradle.properties b/gradle.properties index e613713..097a082 100644 --- a/gradle.properties +++ b/gradle.properties @@ -3,7 +3,7 @@ # The project version lives here so that build scripts, packaging and CI all read # a single value. See docs/VERSIONING.md for the versioning policy. -cubsync.version=0.3.16 +cubsync.version=0.3.15 org.gradle.jvmargs=-Xmx3g -XX:MaxMetaspaceSize=768m -Dfile.encoding=UTF-8 org.gradle.parallel=true