Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

XCode15, NDK 25, up v8 and jsc #59

Closed
wants to merge 41 commits into from
Closed
Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
41 commits
Select commit Hold shift + click to select a range
8bbb91a
XCode15 for iOS qnd NDK version parameter
CedricGuillemet Oct 4, 2023
ea33a7d
swap macos/ios
CedricGuillemet Oct 4, 2023
68f7904
iphone simulator and ndk25
CedricGuillemet Oct 4, 2023
acdaf77
up asio
CedricGuillemet Oct 4, 2023
59ec6db
disable deprecated warning for asio
CedricGuillemet Oct 4, 2023
fa7fcf7
Apply suggestions from code review
CedricGuillemet Oct 5, 2023
76dc80b
Merge branch 'main' of /~https://github.com/BabylonJS/JsRuntimeHost int…
CedricGuillemet Nov 6, 2023
02e13e9
newer v8-android package
CedricGuillemet Nov 7, 2023
db0c19c
kick build
CedricGuillemet Nov 8, 2023
158c16e
jsc-android update
CedricGuillemet Nov 8, 2023
269a97f
ndk 23.2.8568313
CedricGuillemet Nov 9, 2023
55fb54d
back to 21.4.7075529
CedricGuillemet Nov 9, 2023
d68c462
22.1.7171670
CedricGuillemet Nov 9, 2023
8364ad5
up
CedricGuillemet Nov 9, 2023
61a48bb
v8 8.80.1
CedricGuillemet Nov 9, 2023
a7bd11d
back to 21
CedricGuillemet Nov 9, 2023
6685882
pointer compression
CedricGuillemet Nov 9, 2023
4085261
pointer compression
CedricGuillemet Nov 9, 2023
d1d2d37
v8 9.93.0
CedricGuillemet Nov 9, 2023
45aa1e7
v8 9.88.0
CedricGuillemet Nov 9, 2023
9fa6703
9.92.0
CedricGuillemet Nov 9, 2023
ac4142c
another set of update
CedricGuillemet Nov 9, 2023
994968b
ndk 23.2.8568313
CedricGuillemet Nov 9, 2023
d5dac2b
24.0.8215888
CedricGuillemet Nov 9, 2023
7125670
25.2.9519653
CedricGuillemet Nov 9, 2023
e4aade0
test snapshot
CedricGuillemet Nov 13, 2023
f1c3e27
missing binary blob
CedricGuillemet Nov 13, 2023
3063257
v8 win32
CedricGuillemet Nov 13, 2023
e9f22ec
v142 and snapshot assets
CedricGuillemet Nov 14, 2023
fd69829
package version
CedricGuillemet Nov 14, 2023
7ac6aec
up v8
CedricGuillemet Nov 14, 2023
96d4984
V8_ENABLE_SANDBOX
CedricGuillemet Nov 14, 2023
4a35a8c
Merge branch 'main' of /~https://github.com/BabylonJS/JsRuntimeHost int…
CedricGuillemet Dec 5, 2023
ed82fd5
revert android snapshot
CedricGuillemet Jan 26, 2024
254bd7b
Merge branch 'main' of /~https://github.com/BabylonJS/JsRuntimeHost int…
CedricGuillemet Jan 26, 2024
49e7173
v8-android-jit-nointl-nosnapshot
CedricGuillemet Jan 26, 2024
020777a
up gradle
CedricGuillemet Jan 26, 2024
c8efc0a
gradle again
CedricGuillemet Jan 26, 2024
90f1999
v8 package name
CedricGuillemet Jan 26, 2024
b3267c5
v8 package name
CedricGuillemet Jan 26, 2024
a07d11b
jsc package name
CedricGuillemet Jan 26, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 16 additions & 0 deletions .github/azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,10 @@ trigger:
pr:
- main

variables:
- name: NDK_VERSION
CedricGuillemet marked this conversation as resolved.
Show resolved Hide resolved
value: 25.2.9519653

jobs:
# WIN32
- template: jobs/win32.yml
Expand Down Expand Up @@ -65,6 +69,18 @@ jobs:

# iOS
- template: jobs/ios.yml
parameters:
name: 'iOS_Xcode142'
vmImage: 'macOS-latest'
xCodeVersion: 14.2
simulator: 'iPhone 11'

- template: jobs/ios.yml
parameters:
name: 'iOS_Xcode150'
vmImage: 'macOS-13'
xCodeVersion: 15.0
simulator: 'iPhone 14'

# Linux
- template: jobs/linux.yml
2 changes: 1 addition & 1 deletion .github/jobs/android.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ jobs:
inputs:
gradleWrapperFile: 'Tests/UnitTests/Android/gradlew'
workingDirectory: 'Tests/UnitTests/Android'
options: '-PabiFilters=x86_64 -PjsEngine=${{parameters.jsEngine}}'
options: '-PabiFilters=x86_64 -PjsEngine=${{parameters.jsEngine}} -PNDK_VERSION=$(NDK_VERSION)'
CedricGuillemet marked this conversation as resolved.
Show resolved Hide resolved
tasks: 'connectedAndroidTest'
jdkVersionOption: 1.11
displayName: 'Run Connected Android Test'
Expand Down
16 changes: 11 additions & 5 deletions .github/jobs/ios.yml
Original file line number Diff line number Diff line change
@@ -1,14 +1,20 @@
parameters:
name: ''
vmImage: ''
xCodeVersion: ''
simulator: ''

jobs:
- job: iOS
- job: ${{ parameters.name }}
CedricGuillemet marked this conversation as resolved.
Show resolved Hide resolved
timeoutInMinutes: 15

pool:
vmImage: macos-latest
vmImage: ${{ parameters.vmImage }}

steps:
- script: |
sudo xcode-select --switch /Applications/Xcode_14.0.app/Contents/Developer
displayName: 'Select XCode 14.0'
sudo xcode-select --switch /Applications/Xcode_${{ parameters.xCodeVersion }}.app/Contents/Developer
displayName: 'Select XCode ${{ parameters.xCodeVersion }}'

- script: |
cmake -B Build/iOS -G Xcode -D IOS=ON
Expand All @@ -25,7 +31,7 @@ jobs:

- script: |
echo Boot iOS Simulator
xcrun simctl boot "iPhone 11"
xcrun simctl boot "${{ parameters.simulator }}"
echo Install UnitTests app
xcrun simctl install booted "Build/iOS/Tests/UnitTests/Debug-iphonesimulator/UnitTests.app"
echo Launch UnitTests app
Expand Down
7 changes: 7 additions & 0 deletions Core/AppRuntime/V8Inspector/Source/V8InspectorTCP.h
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,13 @@
// This code is based on the old node inspector implementation. See NOTICE.md for Node.js' project license details
#pragma once

// 'allocator<void>' is deprecated
// Android with NDK25
// 23/10/04 : allocator still present in latest asio main branch
#if defined(__clang__)
#pragma clang diagnostic ignored "-Wdeprecated-declarations"
#endif
Comment on lines +6 to +11
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maybe we should submit a fix to asio. @ryantrem and I did some simple replacements locally to fix this.


#include <asio.hpp>

namespace Babylon
Expand Down
4 changes: 4 additions & 0 deletions Tests/UnitTests/Android/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,10 @@ android {
namespace 'com.jsruntimehost.unittests'
compileSdk 33
ndkVersion = "21.4.7075529"
if (project.hasProperty("NDK_VERSION")) {
def NDKVersion = project.property("NDK_VERSION")
ndkVersion "${NDK_VERSION}"
}
CedricGuillemet marked this conversation as resolved.
Show resolved Hide resolved

defaultConfig {
applicationId "com.jsruntimehost.unittests"
Expand Down