Skip to content

Commit

Permalink
Merge branch 'master' into release
Browse files Browse the repository at this point in the history
  • Loading branch information
Voltstro committed Nov 13, 2024
2 parents 2c57a1d + 11f413e commit a42098f
Show file tree
Hide file tree
Showing 9 changed files with 15 additions and 15 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "dev.voltstro.unitywebbrowser.engine.cef.linux.x64",
"displayName": "Unity Web Browser CEF Engine (Linux x64)",
"description": "CEF engine for Unity Web Browser (Linux x64).",
"version": "2.2.3-130.1.2",
"version": "2.2.5-130.1.16",
"unity": "2021.3",
"author": {
"name": "Voltstro",
Expand All @@ -17,6 +17,6 @@
"documentationUrl": "https://projects.voltstro.dev/UnityWebBrowser/latest/articles/user/engines/#cef-engine",
"licensesUrl": "https://github.com/Voltstro-Studios/UnityWebBrowser/blob/master/LICENSE.md",
"dependencies": {
"dev.voltstro.unitywebbrowser.engine.cef": "2.2.3-130.1.2"
"dev.voltstro.unitywebbrowser.engine.cef": "2.2.5-130.1.16"
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "dev.voltstro.unitywebbrowser.engine.cef.macos.arm64",
"displayName": "Unity Web Browser CEF Engine (MacOS arm64)",
"description": "CEF engine for Unity Web Browser (MacOS arm64).",
"version": "2.2.3-130.1.2",
"version": "2.2.5-130.1.16",
"unity": "2021.2",
"author": {
"name": "Voltstro",
Expand All @@ -17,6 +17,6 @@
"documentationUrl": "https://projects.voltstro.dev/UnityWebBrowser/latest/articles/user/engines/#cef-engine",
"licensesUrl": "https://github.com/Voltstro-Studios/UnityWebBrowser/blob/master/LICENSE.md",
"dependencies": {
"dev.voltstro.unitywebbrowser.engine.cef": "2.2.3-130.1.2"
"dev.voltstro.unitywebbrowser.engine.cef": "2.2.5-130.1.16"
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "dev.voltstro.unitywebbrowser.engine.cef.macos.x64",
"displayName": "Unity Web Browser CEF Engine (MacOS x64)",
"description": "CEF engine for Unity Web Browser (MacOS x64).",
"version": "2.2.3-130.1.2",
"version": "2.2.5-130.1.16",
"unity": "2021.2",
"author": {
"name": "Voltstro",
Expand All @@ -17,6 +17,6 @@
"documentationUrl": "https://projects.voltstro.dev/UnityWebBrowser/latest/articles/user/engines/#cef-engine",
"licensesUrl": "https://github.com/Voltstro-Studios/UnityWebBrowser/blob/master/LICENSE.md",
"dependencies": {
"dev.voltstro.unitywebbrowser.engine.cef": "2.2.3-130.1.2"
"dev.voltstro.unitywebbrowser.engine.cef": "2.2.5-130.1.16"
}
}
4 changes: 2 additions & 2 deletions src/Packages/UnityWebBrowser.Engine.Cef.Win-x64/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "dev.voltstro.unitywebbrowser.engine.cef.win.x64",
"displayName": "Unity Web Browser CEF Engine (Win x64)",
"description": "CEF engine for Unity Web Browser (Win x64).",
"version": "2.2.3-130.1.2",
"version": "2.2.5-130.1.16",
"unity": "2021.2",
"author": {
"name": "Voltstro",
Expand All @@ -17,6 +17,6 @@
"documentationUrl": "https://projects.voltstro.dev/UnityWebBrowser/latest/articles/user/engines/#cef-engine",
"licensesUrl": "https://github.com/Voltstro-Studios/UnityWebBrowser/blob/master/LICENSE.md",
"dependencies": {
"dev.voltstro.unitywebbrowser.engine.cef": "2.2.3-130.1.2"
"dev.voltstro.unitywebbrowser.engine.cef": "2.2.5-130.1.16"
}
}
4 changes: 2 additions & 2 deletions src/Packages/UnityWebBrowser.Engine.Cef/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "dev.voltstro.unitywebbrowser.engine.cef",
"displayName": "Unity Web Browser CEF Engine",
"description": "CEF engine for Unity Web Browser.",
"version": "2.2.3-130.1.2",
"version": "2.2.5-130.1.16",
"unity": "2021.3",
"author": {
"name": "Voltstro",
Expand All @@ -18,6 +18,6 @@
"documentationUrl": "https://projects.voltstro.dev/UnityWebBrowser/latest/articles/user/engines/#cef-engine",
"licensesUrl": "https://github.com/Voltstro-Studios/UnityWebBrowser/blob/master/LICENSE.md",
"dependencies": {
"dev.voltstro.unitywebbrowser": "2.2.3"
"dev.voltstro.unitywebbrowser": "2.2.5"
}
}
4 changes: 2 additions & 2 deletions src/Packages/UnityWebBrowser/Runtime/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,8 @@
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("2.2.4")]
[assembly: AssemblyFileVersion("2.2.4")]
[assembly: AssemblyVersion("2.2.5")]
[assembly: AssemblyFileVersion("2.2.5")]

[assembly: InternalsVisibleTo("VoltstroStudios.UnityWebBrowser.Prj")]
[assembly: InternalsVisibleTo("VoltstroStudios.UnityWebBrowser.Editor")]
Expand Down
2 changes: 1 addition & 1 deletion src/Packages/UnityWebBrowser/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "dev.voltstro.unitywebbrowser",
"displayName": "Unity Web Browser",
"description": "Unity Web Browser (UWB) is a Unity package that allows displaying and interacting with the web from within Unity.",
"version": "2.2.4",
"version": "2.2.5",
"unity": "2021.3",
"author": {
"name": "Voltstro",
Expand Down
2 changes: 1 addition & 1 deletion src/UnityWebBrowser.Engine.Cef/version.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
"version": "2.2.3-130.1.16",
"version": "2.2.5-130.1.16",
"publicReleaseRefSpec": [
"^refs/heads/master$"
],
Expand Down
2 changes: 1 addition & 1 deletion src/version.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
"version": "2.2.4",
"version": "2.2.5",
"publicReleaseRefSpec": [
"^refs/heads/release$"
],
Expand Down

0 comments on commit a42098f

Please sign in to comment.