Merge branch 'master' into 'release'

Fix version number issue

See merge request voltstro-studios/uwb/unitywebbrowser!18

Author: Voltstro

CHANGELOG.md

@@ -20,7 +20,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Fixed
 
 - Fixed Unity 6 showing engine packages as "pre-release" (#387)
-    - 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>`
+    - Engine packages are now version as `x.x.x`, instead of `x.x.x-<cef-major>.<cef-minor>.<cef-patch>`
 - Fixed non-json logs causing errors by adding `ignoreLogProcessJsonErrors` option (#395)
 
 ## [2.2.5] - 2024-11-13

src/DevScripts/sync_info.py

@@ -14,15 +14,13 @@ def write_json_to_file(content: Any, file_path: str) -> None:
     with open(file_path, 'w', encoding='utf-8') as f:
         json.dump(content, f, ensure_ascii=False, indent=2)
 
-def sync_package(package: str, version: str, sub_version: str, license_path: str) -> None:
+def sync_package(package: str, version: str, license_path: str) -> None:
     package_path = path.abspath(path.join(__file__, '../../Packages/{0}/'.format(package)))
     package_json_path = path.join(package_path, 'package.json')
 
     package_json = read_json_from_file(package_json_path)
 
     new_package_version = version
-    if sub_version:
-        new_package_version += '+{0}'.format(sub_version)
 
     # Set new package version
     package_json['version'] = new_package_version
@@ -55,33 +53,19 @@ def sync_package(package: str, version: str, sub_version: str, license_path: str
 version = version_json['version']
 license_path = path.abspath(path.join(__file__, '../../../LICENSE.md'))
 
-# Sync CEF Engine version.json  
-cef_engine_version_json_path = path.abspath(path.join(__file__, '../../UnityWebBrowser.Engine.Cef/version.json'))
-cef_engine_version_json = read_json_from_file(cef_engine_version_json_path)
-cef_engine_versions = cef_engine_version_json['version'].split('+')
-
-cef_engine_versions[0] = version
-
-cef_engine_version = '+'.join(cef_engine_versions)
-cef_engine_version_json['version'] = cef_engine_version
-write_json_to_file(cef_engine_version_json, cef_engine_version_json_path)
-
-cef_version = cef_engine_versions[1]
-
 # Package Name - Sub Version
-packages = {
-    'UnityWebBrowser': None,
-    'UnityWebBrowser.Communication.Pipes': None,
-    'UnityWebBrowser.Engine.Cef': cef_version,
-    'UnityWebBrowser.Engine.Cef.Win-x64': cef_version,
-    'UnityWebBrowser.Engine.Cef.Linux-x64': cef_version,
-    'UnityWebBrowser.Engine.Cef.MacOS-x64': cef_version,
-    'UnityWebBrowser.Engine.Cef.MacOS-arm64': cef_version,
-}
+packages = [
+    'UnityWebBrowser',
+    'UnityWebBrowser.Communication.Pipes',
+    'UnityWebBrowser.Engine.Cef',
+    'UnityWebBrowser.Engine.Cef.Win-x64',
+    'UnityWebBrowser.Engine.Cef.Linux-x64',
+    'UnityWebBrowser.Engine.Cef.MacOS-x64',
+    'UnityWebBrowser.Engine.Cef.MacOS-arm64'
+]
 
 for package in packages:
-    sub_version = packages[package]
-    sync_package(package, version, sub_version, license_path)
+    sync_package(package, version, license_path)
 
 # Update assembly info
 assembly_info_path = path.abspath(path.join(__file__, '../../Packages/UnityWebBrowser/Runtime/AssemblyInfo.cs'))

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

@@ -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.6+13342",
+  "version": "2.2.6",
   "unity": "2021.3",
   "author": {
     "name": "Voltstro",
@@ -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.6+13342"
+    "dev.voltstro.unitywebbrowser.engine.cef": "2.2.6"
   }
 }

src/Packages/UnityWebBrowser.Engine.Cef.MacOS-arm64/package.json

@@ -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.6+13342",
+  "version": "2.2.6",
   "unity": "2021.2",
   "author": {
     "name": "Voltstro",
@@ -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.6+13342"
+    "dev.voltstro.unitywebbrowser.engine.cef": "2.2.6"
   }
 }

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

@@ -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.6+13342",
+  "version": "2.2.6",
   "unity": "2021.2",
   "author": {
     "name": "Voltstro",
@@ -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.6+13342"
+    "dev.voltstro.unitywebbrowser.engine.cef": "2.2.6"
   }
 }

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

@@ -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.6+13342",
+  "version": "2.2.6",
   "unity": "2021.2",
   "author": {
     "name": "Voltstro",
@@ -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.6+13342"
+    "dev.voltstro.unitywebbrowser.engine.cef": "2.2.6"
   }
 }

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

@@ -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.6+13342",
+  "version": "2.2.6",
   "unity": "2021.3",
   "author": {
     "name": "Voltstro",