Skip to content

Commit 960a2a7

Browse files
committed
Merge branch 'master' into 'release'
Release 2.2.7 See merge request voltstro-studios/uwb/unitywebbrowser!31
2 parents e47c233 + 4124dd7 commit 960a2a7

File tree

27 files changed

+283
-267
lines changed

27 files changed

+283
-267
lines changed

CHANGELOG.md

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,17 @@ All notable changes to this project will be documented in this file.
44
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
55
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
66

7+
## [2.2.7] - 2025-07-19
8+
9+
### Changed
10+
11+
- Update CEF to 137.0.19
12+
- Bump deps
13+
14+
### Fixed
15+
16+
- Fix not all code paths return a value (#400)
17+
- Fix some key events not working (#412)
718

819
## [2.2.6] - 2025-02-23
920

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@ Unity 2021.3.x
2929

3030
### Install
3131

32-
1. Setup [VoltUPM](https://github.com/Voltstro/VoltstroUPM#setup)
33-
2. Define the additional scopes `org.nuget` and `com.cysharp.unitask` with VoltUPM
32+
1. Setup [VoltUPR](https://upr.voltstro.dev/-/web/about)
33+
2. Define the additional scopes `org.nuget` and `com.cysharp.unitask` with VoltUPR
3434
3. Install UnityWebBrowser packages
3535

3636
For a more in-depth installation guide, check out the [setup article](https://projects.voltstro.dev/UnityWebBrowser/latest/articles/user/setup/).

docs/articles/dev/publishing.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,13 +26,13 @@ A PR to the `release` branch should be created. Follow standard PR review proces
2626

2727
Once merged to the `release` branch, wait for CI to complete build. The CI will output the different packages compiled as artifacts. Downloads the artifacts as they will need to be pushed.
2828

29-
## Push to VoltUPM
29+
## Push to VoltUPR
3030

31-
Use npm to push to VoltUPM.
31+
Use npm to push to VoltUPR.
3232

3333
> [!NOTE]
3434
>
35-
> Cloudflare does not allow uploads of 100MB or larger. Some packages are larger. Add VoltUPM's server ip to `/etc/hosts`, then push. Ensure VoltUPM's server firewall has whitelisted IP from where push will be done.
35+
> Cloudflare does not allow uploads of 100MB or larger. Some packages are larger. Add VoltUPR's server ip to `/etc/hosts`, then push. Ensure VoltUPR's server firewall has whitelisted IP from where push will be done.
3636
3737
## Git Tagging
3838

docs/articles/user/setup.md

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -19,31 +19,31 @@ At a base level, UWB supports all major desktop platforms (Windows, Linux and Ma
1919
>
2020
> UWB does however support being code trimmed.
2121
22-
## VoltUPM Setup
22+
## VoltUPR Setup
2323

24-
VoltUPM is a Unity registry that we provide for hosting some of our packages, including all of UWB's packages. To use it, your project needs to be configured to use the VoltUPM registry.
24+
VoltUPR is a custom Unity registry that we provide for hosting some of our packages, including all of UWB's packages. To use it, your project needs to be configured to use the VoltUPR registry.
2525

26-
To setup the registry with your project, [see here](https://github.com/Voltstro/VoltstroUPM#setup). The VoltUPM page also lists some other info that you may be interested in.
26+
To setup the registry with your project, [see here](https://upr.voltstro.dev/-/web/about). The VoltUPR page also lists some other info that you may be interested in.
2727

2828
**HOWEVER**, an additional scope needs to be added. You need to make sure `com.cysharp.unitask` is added (more details are provided in the [UniTask part](#unitask)). Once you are done configuring your projects registries, your configuration should look like:
2929

3030
![Registry](~/assets/images/articles/user/setup/Registry.webp)
3131

3232
> [!NOTE]
33-
> If you are using [UnityNuGet](https://github.com/xoofx/UnityNuGet), and you choose not to use VoltUPM as a `org.nuget.*` scope mirror, then don't have the `org.nuget` scope defined for VoltUPM.
33+
> If you are using [UnityNuGet](https://github.com/bdovaz/UnityNuGet) already, and you choose not to use VoltUPR as a `org.nuget.*` scope mirror, then don't have the `org.nuget` scope defined for VoltUPR.
3434
3535
### UniTask
3636

37-
The reason why we need to add the additional `com.cysharp.unitask` scope to VoltUPM is because UWB depends on [UniTask](https://github.com/Cysharp/UniTask). VoltUPM does provide a mirror copy of UniTask (from OpenUPM),
37+
The reason why we need to add the additional `com.cysharp.unitask` scope to VoltUPR is because UWB depends on [UniTask](https://github.com/Cysharp/UniTask). VoltUPR does provide a mirror copy of UniTask (from OpenUPM),
3838
however you may already have UniTask installed either via [OpenUPM](https://openupm.com/packages/com.cysharp.unitask/), or via [Git](https://github.com/Cysharp/UniTask#install-via-git-url). If you do have it installed already,
39-
and you don't want to use VoltUPM's mirror of it, then DO NOT define the additional scope as apart of VoltUPM.
39+
and you don't want to use VoltUPR's mirror of it, then DO NOT define the additional scope as apart of VoltUPR.
4040

4141
> [!WARNING]
4242
> If you already have UniTask installed via Git, please make sure it is the latest version!
4343
4444
## Packages Installation
4545

46-
Once you have VoltUPM registry added to your project, you can install the packages via the Unity package manager GUI.
46+
Once you have VoltUPR registry added to your project, you can install the packages via the Unity package manager GUI.
4747

4848
![Packages](~/assets/images/articles/user/setup/Packages.webp)
4949

7.66 KB
Loading
3.03 KB
Loading
9.21 KB
Loading

renovate.json

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,9 @@
33
"assignees": ["voltstro"],
44
"ignorePaths": [
55
"src/Packages/**"
6+
],
7+
"timezone": "Australia/Brisbane",
8+
"schedule": [
9+
"* * 1 * *"
610
]
711
}

src/Packages/UnityWebBrowser.Communication.Pipes/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "dev.voltstro.unitywebbrowser.communication.pipes",
33
"displayName": "Unity Web Browser Pipes Communication",
44
"description": "Adds support to use pipes in UWB.",
5-
"version": "2.2.6",
5+
"version": "2.2.7",
66
"unity": "2021.3",
77
"author": {
88
"name": "Voltstro",
@@ -18,7 +18,7 @@
1818
"documentationUrl": "https://projects.voltstro.dev/UnityWebBrowser/latest/",
1919
"licensesUrl": "https://github.com/Voltstro-Studios/UnityWebBrowser/blob/master/LICENSE.md",
2020
"dependencies": {
21-
"dev.voltstro.unitywebbrowser": "2.2.6",
21+
"dev.voltstro.unitywebbrowser": "2.2.7",
2222
"org.nuget.voltrpc.communication.pipes": "3.1.0"
2323
}
2424
}

src/Packages/UnityWebBrowser.Engine.Cef.Linux-x64/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "dev.voltstro.unitywebbrowser.engine.cef.linux.x64",
33
"displayName": "Unity Web Browser CEF Engine (Linux x64)",
44
"description": "CEF engine for Unity Web Browser (Linux x64).",
5-
"version": "2.2.6",
5+
"version": "2.2.7",
66
"unity": "2021.3",
77
"author": {
88
"name": "Voltstro",
@@ -17,6 +17,6 @@
1717
"documentationUrl": "https://projects.voltstro.dev/UnityWebBrowser/latest/articles/user/engines/#cef-engine",
1818
"licensesUrl": "https://github.com/Voltstro-Studios/UnityWebBrowser/blob/master/LICENSE.md",
1919
"dependencies": {
20-
"dev.voltstro.unitywebbrowser.engine.cef": "2.2.6"
20+
"dev.voltstro.unitywebbrowser.engine.cef": "2.2.7"
2121
}
2222
}

0 commit comments

Comments
 (0)