Merge pull request #155 from Faless/bump/libdatachannel_0.22.2

Update to libdatachannel 0.22.2

.github/workflows/build_release.yml

@@ -64,13 +64,13 @@ jobs:
             arch: 'x86_64'
             gdnative_flags: 'ios_arch=x86_64'
             sconsflags: 'ios_simulator=true'
-            os: 'macos-12'
+            os: 'macos-latest'
             cache-name: ios-x86_64-simulator
           - platform: ios
             arch: 'arm64'
             gdnative_flags: 'ios_arch=arm64'
             sconsflags: ''
-            os: 'macos-12'
+            os: 'macos-latest'
             cache-name: ios-arm64
 
           # Linux
@@ -108,7 +108,7 @@ jobs:
             arch: 'universal'
             gdnative_flags: 'macos_arch=universal bits=64'
             sconsflags: ''
-            os: 'macos-12'
+            os: 'macos-latest'
             cache-name: macos-universal
 
           # Windows

SConstruct

@@ -41,7 +41,7 @@ opts.Update(env)
 
 # Minimum target platform versions.
 if "ios_min_version" not in ARGUMENTS:
-    ARGUMENTS["ios_min_version"] = "11.0"
+    ARGUMENTS["ios_min_version"] = "12.0"
 if "macos_deployment_target" not in ARGUMENTS:
     ARGUMENTS["macos_deployment_target"] = "11.0"
 if "android_api_level" not in ARGUMENTS:
@@ -61,8 +61,8 @@ if env["godot_version"] == "3":
     replace_flags(
         cpp_env["CCFLAGS"],
         {
-            "-mios-simulator-version-min=10.0": "-mios-simulator-version-min=11.0",
-            "-miphoneos-version-min=10.0": "-miphoneos-version-min=11.0",
+            "-mios-simulator-version-min=10.0": "-mios-simulator-version-min=12.0",
+            "-miphoneos-version-min=10.0": "-miphoneos-version-min=12.0",
             "/std:c++14": "/std:c++17",
             "-std=c++14": "-std=c++17",
         },
@@ -82,7 +82,7 @@ if env["godot_version"] == "3":
         env["CC"] = "clang"  # CC is not set in 3.x and can result in it being "gcc".
 
     if env["platform"] == "ios":
-        env["ios_min_version"] = "11.0"
+        env["ios_min_version"] = "12.0"
 
     # Normalize suffix
     if env["platform"] in ["windows", "linux"]:

thirdparty/README.md

@@ -19,7 +19,7 @@ Module location:
 ## libdatachannel
 
 - Upstream: https://github.com/paullouisageneau/libdatachannel
-- Version: 0.22.1 (f8ffbe37e6c06e4838b41c2c018ccc3a8028a1c8, 2024)
+- Version: 0.22.2 (3c33ea0f49fff2630be080b2043052b4d3de5786, 2024)
 - License: MPL 2.0
 
 Module location:

tools/openssl.py

@@ -32,8 +32,8 @@ def ssl_platform_target(env):
     elif platform == "ios":
         if env["ios_simulator"]:
             targets = {
-                "x86_64": "iossimulator-xcrun",
-                "arm64": "iossimulator-xcrun",
+                "x86_64": "iossimulator-x86_64-xcrun",
+                "arm64": "iossimulator-arm64-xcrun",
             }
         else:
             targets = {