Skip to content

Commit e47c233

Browse files
VoltstroVoltstro
committed
Merge branch 'master' into 'release'
Fix version number issue See merge request voltstro-studios/uwb/unitywebbrowser!18
2 parents adef534 + 76b76f6 commit e47c233

File tree

7 files changed

+21
-37
lines changed

7 files changed

+21
-37
lines changed

‎CHANGELOG.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
2020
### Fixed
2121

2222
- Fixed Unity 6 showing engine packages as "pre-release" (#387)
23-
- Engine packages are now version as `x.x.x+<cef-major><cef-minor><cef-patch>`, instead of `x.x.x-<cef-major>.<cef-minor>.<cef-patch>`
23+
- Engine packages are now version as `x.x.x`, instead of `x.x.x-<cef-major>.<cef-minor>.<cef-patch>`
2424
- Fixed non-json logs causing errors by adding `ignoreLogProcessJsonErrors` option (#395)
2525

2626
## [2.2.5] - 2024-11-13

‎src/DevScripts/sync_info.py‎

Lines changed: 11 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -14,15 +14,13 @@ def write_json_to_file(content: Any, file_path: str) -> None:
1414
with open(file_path, 'w', encoding='utf-8') as f:
1515
json.dump(content, f, ensure_ascii=False, indent=2)
1616

17-
def sync_package(package: str, version: str, sub_version: str, license_path: str) -> None:
17+
def sync_package(package: str, version: str, license_path: str) -> None:
1818
package_path = path.abspath(path.join(__file__, '../../Packages/{0}/'.format(package)))
1919
package_json_path = path.join(package_path, 'package.json')
2020

2121
package_json = read_json_from_file(package_json_path)
2222

2323
new_package_version = version
24-
if sub_version:
25-
new_package_version += '+{0}'.format(sub_version)
2624

2725
# Set new package version
2826
package_json['version'] = new_package_version
@@ -55,33 +53,19 @@ def sync_package(package: str, version: str, sub_version: str, license_path: str
5553
version = version_json['version']
5654
license_path = path.abspath(path.join(__file__, '../../../LICENSE.md'))
5755

58-
# Sync CEF Engine version.json
59-
cef_engine_version_json_path = path.abspath(path.join(__file__, '../../UnityWebBrowser.Engine.Cef/version.json'))
60-
cef_engine_version_json = read_json_from_file(cef_engine_version_json_path)
61-
cef_engine_versions = cef_engine_version_json['version'].split('+')
62-
63-
cef_engine_versions[0] = version
64-
65-
cef_engine_version = '+'.join(cef_engine_versions)
66-
cef_engine_version_json['version'] = cef_engine_version
67-
write_json_to_file(cef_engine_version_json, cef_engine_version_json_path)
68-
69-
cef_version = cef_engine_versions[1]
70-
7156
# Package Name - Sub Version
72-
packages = {
73-
'UnityWebBrowser': None,
74-
'UnityWebBrowser.Communication.Pipes': None,
75-
'UnityWebBrowser.Engine.Cef': cef_version,
76-
'UnityWebBrowser.Engine.Cef.Win-x64': cef_version,
77-
'UnityWebBrowser.Engine.Cef.Linux-x64': cef_version,
78-
'UnityWebBrowser.Engine.Cef.MacOS-x64': cef_version,
79-
'UnityWebBrowser.Engine.Cef.MacOS-arm64': cef_version,
80-
}
57+
packages = [
58+
'UnityWebBrowser',
59+
'UnityWebBrowser.Communication.Pipes',
60+
'UnityWebBrowser.Engine.Cef',
61+
'UnityWebBrowser.Engine.Cef.Win-x64',
62+
'UnityWebBrowser.Engine.Cef.Linux-x64',
63+
'UnityWebBrowser.Engine.Cef.MacOS-x64',
64+
'UnityWebBrowser.Engine.Cef.MacOS-arm64'
65+
]
8166

8267
for package in packages:
83-
sub_version = packages[package]
84-
sync_package(package, version, sub_version, license_path)
68+
sync_package(package, version, license_path)
8569

8670
# Update assembly info
8771
assembly_info_path = path.abspath(path.join(__file__, '../../Packages/UnityWebBrowser/Runtime/AssemblyInfo.cs'))

‎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+13342",
5+
"version": "2.2.6",
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+13342"
20+
"dev.voltstro.unitywebbrowser.engine.cef": "2.2.6"
2121
}
2222
}

‎src/Packages/UnityWebBrowser.Engine.Cef.MacOS-arm64/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.macos.arm64",
33
"displayName": "Unity Web Browser CEF Engine (MacOS arm64)",
44
"description": "CEF engine for Unity Web Browser (MacOS arm64).",
5-
"version": "2.2.6+13342",
5+
"version": "2.2.6",
66
"unity": "2021.2",
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+13342"
20+
"dev.voltstro.unitywebbrowser.engine.cef": "2.2.6"
2121
}
2222
}

‎src/Packages/UnityWebBrowser.Engine.Cef.MacOS-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.macos.x64",
33
"displayName": "Unity Web Browser CEF Engine (MacOS x64)",
44
"description": "CEF engine for Unity Web Browser (MacOS x64).",
5-
"version": "2.2.6+13342",
5+
"version": "2.2.6",
66
"unity": "2021.2",
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+13342"
20+
"dev.voltstro.unitywebbrowser.engine.cef": "2.2.6"
2121
}
2222
}

‎src/Packages/UnityWebBrowser.Engine.Cef.Win-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.win.x64",
33
"displayName": "Unity Web Browser CEF Engine (Win x64)",
44
"description": "CEF engine for Unity Web Browser (Win x64).",
5-
"version": "2.2.6+13342",
5+
"version": "2.2.6",
66
"unity": "2021.2",
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+13342"
20+
"dev.voltstro.unitywebbrowser.engine.cef": "2.2.6"
2121
}
2222
}

‎src/Packages/UnityWebBrowser.Engine.Cef/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "dev.voltstro.unitywebbrowser.engine.cef",
33
"displayName": "Unity Web Browser CEF Engine",
44
"description": "CEF engine for Unity Web Browser.",
5-
"version": "2.2.6+13342",
5+
"version": "2.2.6",
66
"unity": "2021.3",
77
"author": {
88
"name": "Voltstro",

0 commit comments

Comments
 (0)