From 432a985d47cf431ec19666ca7ca6d57414084d5b Mon Sep 17 00:00:00 2001 From: Sam Cao Date: Mon, 25 Oct 2021 13:54:13 +0800 Subject: [PATCH] =?UTF-8?q?=F0=9F=93=B1=20Javet=20v1.0.2=20(#109)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Supported Android (arm, arm64, x86 and x86_64) ABI >= 26 * Upgraded Node.js to `v16.12.0` ([2021-10-20](https://github.com/nodejs/node/blob/master/doc/changelogs/CHANGELOG_V16.md#16.12.0)) * Upgraded V8 to `v9.5.172.22` ([2021-10-20](https://v8.dev/blog/v8-release-95)) * Added `V8Internal` * Cleaned up `V8Runtime` internal API * Removed `MethodHandle` for Android compatibility --- .dockerignore | 2 +- .github/workflows/android_build.yml | 36 + README.rst | 31 +- android/.gitignore | 15 + android/build.gradle.kts | 30 + android/gradle.properties | 19 + android/gradle/wrapper/gradle-wrapper.jar | Bin 0 -> 59203 bytes .../gradle/wrapper/gradle-wrapper.properties | 6 + android/gradlew | 185 ++ android/gradlew.bat | 89 + android/javet-android/.gitignore | 2 + android/javet-android/build.gradle.kts | 72 + android/javet-android/consumer-rules.pro | 0 android/javet-android/proguard-rules.pro | 21 + .../java/com/caoccao/javet/TestPackage.java | 43 + .../src/main/AndroidManifest.xml | 8 + .../lang/management/ManagementFactory.java | 42 + .../management/MemoryNotificationInfo.java | 9 + .../lang/management/MemoryPoolMXBean.java | 13 + .../java/java/lang/management/MemoryType.java | 5 + .../java/lang/management/MemoryUsage.java | 7 + .../java/lang/management/RuntimeMXBean.java | 7 + .../management/ListenerNotFoundException.java | 4 + .../java/javax/management/Notification.java | 7 + .../javax/management/NotificationEmitter.java | 10 + .../management/NotificationListener.java | 5 + .../java/com/caoccao/javet/TestDummy.java | 34 + android/settings.gradle.kts | 26 + build.gradle.kts | 6 +- cpp/CMakeLists.txt | 86 +- cpp/build-android.sh | 19 + cpp/build-linux.sh | 8 +- cpp/build-macos.sh | 4 +- cpp/build-windows.cmd | 4 +- .../com_caoccao_javet_interop_V8Native.cpp | 6 +- cpp/jni/com_caoccao_javet_interop_V8Native.h | 12 +- cpp/jni/javet_monitor.cpp | 81 +- cpp/jni/javet_monitor.h | 17 +- cpp/jni/javet_native.cpp | 7 +- cpp/jni/javet_native.h | 8 +- cpp/jni/javet_resource_node.rc | 12 +- cpp/jni/javet_resource_v8.rc | 12 +- docker/android/base.Dockerfile | 109 ++ docker/android/build.Dockerfile | 40 + docker/linux-x86_64/base.Dockerfile | 11 +- docker/linux-x86_64/build.Dockerfile | 2 +- docker/windows-x86_64/base.Dockerfile | 4 +- docs/_static/documentation_options.js | 2 +- docs/conf.py | 2 +- docs/development/build.html | 96 +- docs/development/build.rst | 54 + .../development/build_javet_from_scratch.html | 129 +- docs/development/build_javet_from_scratch.rst | 100 +- docs/development/build_javet_with_docker.html | 60 +- docs/development/build_javet_with_docker.rst | 47 +- .../build_javet_with_pre_built_binaries.html | 169 +- .../build_javet_with_pre_built_binaries.rst | 106 +- .../debug_with_chrome_developer_tools.html | 6 +- docs/development/design.html | 6 +- docs/development/index.html | 7 +- docs/development/test.html | 6 +- docs/development/tools.html | 6 +- docs/faq/background/history_with_j2v8.html | 6 +- docs/faq/background/index.html | 6 +- .../background/what_is_the_motivation.html | 6 +- .../development/how_to_think_in_javet.html | 6 +- docs/faq/development/index.html | 6 +- .../where_are_es6_api_in_v8_mode.html | 6 +- .../development/where_are_the_examples.html | 6 +- ...he_inspector_disabled_in_node_js_mode.html | 6 +- .../can_javet_support_legacy_linux.html | 6 +- .../environment/can_javet_support_mac.html | 6 +- docs/faq/environment/index.html | 6 +- docs/faq/index.html | 6 +- ...ary_dll_initialization_routine_failed.html | 6 +- ...can_i_debug_javet_in_chrome_dev_tools.html | 6 +- docs/faq/troubleshooting/index.html | 6 +- ...why_node_js_crashes_when_being_closed.html | 6 +- docs/genindex.html | 6 +- docs/index.html | 33 +- docs/index.rst | 2 +- docs/reference/index.html | 6 +- docs/reference/javadoc/allclasses-frame.html | 3 +- .../reference/javadoc/allclasses-noframe.html | 3 +- .../javet/annotations/CheckReturnValue.html | 4 +- .../caoccao/javet/annotations/NodeModule.html | 4 +- .../javet/annotations/V8BindingEnabler.html | 4 +- .../caoccao/javet/annotations/V8Function.html | 4 +- .../caoccao/javet/annotations/V8Property.html | 4 +- .../javet/annotations/V8RuntimeSetter.html | 4 +- .../javet/annotations/package-frame.html | 2 +- .../javet/annotations/package-summary.html | 4 +- .../javet/annotations/package-tree.html | 10 +- .../javet/entities/JavetEntityFunction.html | 4 +- .../javet/entities/JavetEntityMap.html | 4 +- .../javet/entities/JavetEntitySymbol.html | 4 +- .../caoccao/javet/entities/package-frame.html | 2 +- .../javet/entities/package-summary.html | 4 +- .../caoccao/javet/entities/package-tree.html | 4 +- .../caoccao/javet/enums/JSFunctionType.html | 4 +- .../caoccao/javet/enums/JSRuntimeType.html | 4 +- .../com/caoccao/javet/enums/JSScopeType.html | 4 +- .../caoccao/javet/enums/JavetErrorType.html | 4 +- .../javet/enums/JavetPromiseRejectEvent.html | 4 +- .../javet/enums/V8ValueInternalType.html | 4 +- .../javet/enums/V8ValueReferenceType.html | 4 +- .../javet/enums/V8ValueSymbolType.html | 4 +- .../caoccao/javet/enums/package-frame.html | 2 +- .../caoccao/javet/enums/package-summary.html | 4 +- .../com/caoccao/javet/enums/package-tree.html | 10 +- .../BaseJavetScriptingException.html | 4 +- .../exceptions/JavetCompilationException.html | 4 +- .../exceptions/JavetConverterException.html | 4 +- .../caoccao/javet/exceptions/JavetError.html | 4 +- .../javet/exceptions/JavetException.html | 4 +- .../exceptions/JavetExecutionException.html | 4 +- .../javet/exceptions/JavetScriptingError.html | 4 +- .../exceptions/JavetTerminatedException.html | 4 +- .../javet/exceptions/package-frame.html | 2 +- .../javet/exceptions/package-summary.html | 4 +- .../javet/exceptions/package-tree.html | 4 +- .../interception/BaseJavetInterceptor.html | 4 +- .../logging/BaseJavetConsoleInterceptor.html | 4 +- .../JavetStandardConsoleInterceptor.html | 4 +- .../interception/logging/package-frame.html | 2 +- .../interception/logging/package-summary.html | 4 +- .../interception/logging/package-tree.html | 4 +- .../javet/interception/package-frame.html | 2 +- .../javet/interception/package-summary.html | 4 +- .../javet/interception/package-tree.html | 4 +- .../javet/interfaces/IJavetAnonymous.html | 4 +- .../javet/interfaces/IJavetBiConsumer.html | 4 +- .../interfaces/IJavetBiIndexedConsumer.html | 4 +- .../javet/interfaces/IJavetClosable.html | 4 +- .../interfaces/IJavetEntityFunction.html | 4 +- .../javet/interfaces/IJavetEntityMap.html | 4 +- .../javet/interfaces/IJavetInterceptor.html | 4 +- .../javet/interfaces/IJavetLogger.html | 4 +- .../javet/interfaces/IJavetMappable.html | 4 +- .../IJavetPromiseRejectCallback.html | 4 +- .../javet/interfaces/IJavetResettable.html | 4 +- .../javet/interfaces/IJavetSupplier.html | 4 +- .../javet/interfaces/IJavetUniConsumer.html | 4 +- .../interfaces/IJavetUniIndexedConsumer.html | 4 +- .../javet/interfaces/IV8ModuleResolver.html | 4 +- .../javet/interfaces/package-frame.html | 2 +- .../javet/interfaces/package-summary.html | 4 +- .../javet/interfaces/package-tree.html | 4 +- .../caoccao/javet/interop/INodeNative.html | 4 +- .../caoccao/javet/interop/IV8Cloneable.html | 4 +- .../caoccao/javet/interop/IV8Convertible.html | 4 +- .../caoccao/javet/interop/IV8Creatable.html | 4 +- .../caoccao/javet/interop/IV8Executable.html | 4 +- .../javet/interop/IV8InspectorListener.html | 4 +- .../com/caoccao/javet/interop/IV8Native.html | 18 +- .../caoccao/javet/interop/NodeRuntime.html | 52 +- .../com/caoccao/javet/interop/V8Flags.html | 4 +- .../com/caoccao/javet/interop/V8Host.html | 4 +- .../caoccao/javet/interop/V8Inspector.html | 8 +- .../com/caoccao/javet/interop/V8Internal.html | 1347 ++++++++++++++ .../com/caoccao/javet/interop/V8Locker.html | 8 +- .../com/caoccao/javet/interop/V8Notifier.html | 4 +- .../com/caoccao/javet/interop/V8Runtime.html | 1597 ++--------------- .../com/caoccao/javet/interop/V8Scope.html | 4 +- .../caoccao/javet/interop/V8ScriptOrigin.html | 4 +- .../javet/interop/binding/BindingContext.html | 4 +- .../interop/binding/MethodDescriptor.html | 4 +- .../javet/interop/binding/package-frame.html | 2 +- .../interop/binding/package-summary.html | 4 +- .../javet/interop/binding/package-tree.html | 4 +- .../callback/JavetCallbackContext.html | 4 +- .../interop/callback/V8FunctionCallback.html | 4 +- .../javet/interop/callback/package-frame.html | 2 +- .../interop/callback/package-summary.html | 4 +- .../javet/interop/callback/package-tree.html | 4 +- .../interop/converters/IJavetConverter.html | 4 +- .../converters/JavetConverterConfig.html | 4 +- .../converters/JavetObjectConverter.html | 74 +- .../converters/JavetPrimitiveConverter.html | 4 +- .../converters/JavetProxyConverter.html | 6 +- .../interop/converters/package-frame.html | 2 +- .../interop/converters/package-summary.html | 4 +- .../interop/converters/package-tree.html | 4 +- .../javet/interop/engine/IJavetEngine.html | 4 +- .../interop/engine/IJavetEngineGuard.html | 4 +- .../interop/engine/IJavetEnginePool.html | 4 +- .../javet/interop/engine/JavetEngine.html | 4 +- .../interop/engine/JavetEngineConfig.html | 4 +- .../interop/engine/JavetEngineGuard.html | 4 +- .../javet/interop/engine/JavetEnginePool.html | 4 +- .../interop/engine/JavetEngineUsage.html | 4 +- .../javet/interop/engine/package-frame.html | 2 +- .../javet/interop/engine/package-summary.html | 4 +- .../javet/interop/engine/package-tree.html | 4 +- .../interop/executors/BaseV8Executor.html | 4 +- .../javet/interop/executors/IV8Executor.html | 4 +- .../interop/executors/V8PathExecutor.html | 4 +- .../interop/executors/V8StringExecutor.html | 4 +- .../interop/executors/package-frame.html | 2 +- .../interop/executors/package-summary.html | 4 +- .../javet/interop/executors/package-tree.html | 4 +- .../loader/IJavetLibLoadingListener.html | 4 +- .../javet/interop/loader/JavetLibLoader.html | 4 +- .../loader/JavetLibLoadingListener.html | 65 +- .../javet/interop/loader/package-frame.html | 2 +- .../javet/interop/loader/package-summary.html | 4 +- .../javet/interop/loader/package-tree.html | 4 +- ...V8HeapSpaceStatistics.AllocationSpace.html | 4 +- .../monitoring/V8HeapSpaceStatistics.html | 110 +- .../interop/monitoring/V8HeapStatistics.html | 55 +- .../monitoring/V8SharedMemoryStatistics.html | 55 +- .../interop/monitoring/package-frame.html | 2 +- .../interop/monitoring/package-summary.html | 4 +- .../interop/monitoring/package-tree.html | 4 +- .../interop/options/NodeRuntimeOptions.html | 4 +- .../javet/interop/options/RuntimeOptions.html | 4 +- .../interop/options/V8RuntimeOptions.html | 4 +- .../javet/interop/options/package-frame.html | 2 +- .../interop/options/package-summary.html | 4 +- .../javet/interop/options/package-tree.html | 4 +- .../caoccao/javet/interop/package-frame.html | 3 +- .../javet/interop/package-summary.html | 16 +- .../caoccao/javet/interop/package-tree.html | 5 +- .../interop/proxy/BaseJavetProxyHandler.html | 4 +- ...ProxyV8ValueFunctionInvocationHandler.html | 4 +- ...icProxyV8ValueObjectInvocationHandler.html | 4 +- .../interop/proxy/IJavetProxyHandler.html | 4 +- ...roxyHandler.JavetUniversalInterceptor.html | 4 +- ...niversalProxyHandler.ScoredExecutable.html | 4 +- .../proxy/JavetUniversalProxyHandler.html | 4 +- .../javet/interop/proxy/package-frame.html | 2 +- .../javet/interop/proxy/package-summary.html | 4 +- .../javet/interop/proxy/package-tree.html | 4 +- .../javet/node/modules/BaseNodeModule.html | 4 +- .../javet/node/modules/INodeModule.html | 4 +- .../javet/node/modules/NodeModuleAny.html | 4 +- .../javet/node/modules/NodeModuleModule.html | 4 +- .../javet/node/modules/NodeModuleProcess.html | 4 +- .../javet/node/modules/package-frame.html | 2 +- .../javet/node/modules/package-summary.html | 4 +- .../javet/node/modules/package-tree.html | 4 +- .../javet/utils/JavetDateTimeUtils.html | 4 +- .../javet/utils/JavetDefaultLogger.html | 4 +- .../com/caoccao/javet/utils/JavetOSUtils.html | 105 +- .../utils/JavetPromiseRejectCallback.html | 4 +- .../javet/utils/JavetReflectionUtils.html | 4 +- .../javet/utils/JavetResourceUtils.html | 4 +- .../caoccao/javet/utils/JavetTypeUtils.html | 4 +- .../javet/utils/JavetVirtualObject.html | 4 +- .../javet/utils/SimpleFreeMarkerFormat.html | 4 +- .../com/caoccao/javet/utils/SimpleMap.html | 4 +- .../com/caoccao/javet/utils/V8ValueUtils.html | 4 +- .../caoccao/javet/utils/package-frame.html | 2 +- .../caoccao/javet/utils/package-summary.html | 4 +- .../com/caoccao/javet/utils/package-tree.html | 4 +- .../receivers/IJavetCallbackReceiver.html | 4 +- .../receivers/JavetCallbackReceiver.html | 4 +- .../javet/utils/receivers/package-frame.html | 2 +- .../utils/receivers/package-summary.html | 4 +- .../javet/utils/receivers/package-tree.html | 4 +- .../com/caoccao/javet/values/IV8Value.html | 4 +- .../com/caoccao/javet/values/V8Data.html | 4 +- .../com/caoccao/javet/values/V8Value.html | 10 +- .../caoccao/javet/values/package-frame.html | 2 +- .../caoccao/javet/values/package-summary.html | 4 +- .../caoccao/javet/values/package-tree.html | 4 +- .../values/primitive/V8ValueBoolean.html | 4 +- .../javet/values/primitive/V8ValueDouble.html | 4 +- .../values/primitive/V8ValueInteger.html | 4 +- .../javet/values/primitive/V8ValueLong.html | 4 +- .../javet/values/primitive/V8ValueNull.html | 4 +- .../values/primitive/V8ValuePrimitive.html | 4 +- .../javet/values/primitive/V8ValueString.html | 4 +- .../values/primitive/V8ValueUndefined.html | 4 +- .../values/primitive/V8ValueUnknown.html | 4 +- .../primitive/V8ValueZonedDateTime.html | 4 +- .../javet/values/primitive/package-frame.html | 2 +- .../values/primitive/package-summary.html | 4 +- .../javet/values/primitive/package-tree.html | 4 +- .../javet/values/reference/IV8Module.html | 4 +- .../javet/values/reference/IV8Script.html | 4 +- .../javet/values/reference/IV8ValueArray.html | 4 +- .../values/reference/IV8ValueFunction.html | 4 +- .../values/reference/IV8ValueIterator.html | 4 +- .../reference/IV8ValueKeyContainer.html | 4 +- .../javet/values/reference/IV8ValueMap.html | 4 +- .../values/reference/IV8ValueObject.html | 4 +- .../values/reference/IV8ValuePromise.html | 4 +- .../javet/values/reference/IV8ValueProxy.html | 4 +- .../values/reference/IV8ValueReference.html | 4 +- .../javet/values/reference/IV8ValueSet.html | 4 +- .../values/reference/IV8ValueTypedArray.html | 4 +- .../javet/values/reference/V8Module.html | 4 +- .../javet/values/reference/V8Script.html | 4 +- .../values/reference/V8ValueArguments.html | 6 +- .../javet/values/reference/V8ValueArray.html | 6 +- .../values/reference/V8ValueArrayBuffer.html | 6 +- .../values/reference/V8ValueDataView.html | 6 +- .../javet/values/reference/V8ValueError.html | 6 +- .../values/reference/V8ValueFunction.html | 6 +- .../values/reference/V8ValueGlobalObject.html | 6 +- .../values/reference/V8ValueIterator.html | 6 +- .../javet/values/reference/V8ValueMap.html | 6 +- .../javet/values/reference/V8ValueObject.html | 70 +- .../values/reference/V8ValuePromise.html | 6 +- .../javet/values/reference/V8ValueProxy.html | 6 +- .../values/reference/V8ValueReference.html | 10 +- .../javet/values/reference/V8ValueRegExp.html | 6 +- .../javet/values/reference/V8ValueSet.html | 6 +- .../reference/V8ValueSharedArrayBuffer.html | 6 +- .../javet/values/reference/V8ValueSymbol.html | 6 +- .../values/reference/V8ValueSymbolObject.html | 6 +- .../values/reference/V8ValueTypedArray.html | 6 +- .../values/reference/V8ValueWeakMap.html | 48 +- .../values/reference/V8ValueWeakSet.html | 48 +- .../reference/builtin/V8ValueBuiltInJson.html | 6 +- .../builtin/V8ValueBuiltInObject.html | 6 +- .../builtin/V8ValueBuiltInPromise.html | 6 +- .../builtin/V8ValueBuiltInSymbol.html | 6 +- .../reference/builtin/package-frame.html | 2 +- .../reference/builtin/package-summary.html | 4 +- .../reference/builtin/package-tree.html | 4 +- .../javet/values/reference/package-frame.html | 2 +- .../values/reference/package-summary.html | 4 +- .../javet/values/reference/package-tree.html | 4 +- .../javet/values/virtual/V8VirtualValue.html | 4 +- .../values/virtual/V8VirtualValueList.html | 4 +- .../javet/values/virtual/package-frame.html | 2 +- .../javet/values/virtual/package-summary.html | 4 +- .../javet/values/virtual/package-tree.html | 4 +- docs/reference/javadoc/constant-values.html | 6 +- docs/reference/javadoc/deprecated-list.html | 4 +- docs/reference/javadoc/help-doc.html | 4 +- docs/reference/javadoc/index-all.html | 208 +-- docs/reference/javadoc/index.html | 2 +- docs/reference/javadoc/overview-frame.html | 2 +- docs/reference/javadoc/overview-summary.html | 6 +- docs/reference/javadoc/overview-tree.html | 5 +- docs/reference/javadoc/serialized-form.html | 4 +- docs/reference/resource_management/index.html | 6 +- .../resource_management/load_and_unload.html | 6 +- docs/reference/resource_management/lock.html | 6 +- .../memory_management.html | 6 +- .../resource_management/modularization.html | 6 +- .../resource_management/performance.html | 6 +- docs/reference/tips/best_practices.html | 6 +- docs/reference/tips/index.html | 6 +- docs/reference/todo_list.html | 6 +- .../troubleshooting/error_codes.html | 6 +- docs/reference/troubleshooting/index.html | 6 +- docs/reference/troubleshooting/logging.html | 6 +- .../troubleshooting/termination.html | 6 +- docs/reference/v8_values/index.html | 6 +- docs/reference/v8_values/v8_collection.html | 6 +- docs/reference/v8_values/v8_function.html | 6 +- docs/reference/v8_values/v8_promise.html | 6 +- docs/release_notes/index.html | 6 +- docs/release_notes/release_notes_0_7.html | 6 +- docs/release_notes/release_notes_0_8.html | 6 +- docs/release_notes/release_notes_0_9.html | 10 +- docs/release_notes/release_notes_0_9.rst | 4 + docs/release_notes/release_notes_1_0.html | 18 +- docs/release_notes/release_notes_1_0.rst | 10 + docs/search.html | 6 +- docs/searchindex.js | 2 +- docs/tutorial/advanced/index.html | 6 +- .../advanced/interact_with_node_js.html | 6 +- .../advanced/java_and_javascript_interop.html | 6 +- docs/tutorial/advanced/object_converter.html | 6 +- docs/tutorial/basic/engine_pool.html | 6 +- docs/tutorial/basic/hello_javet.html | 6 +- docs/tutorial/basic/index.html | 6 +- docs/tutorial/basic/installation.html | 137 +- docs/tutorial/basic/installation.rst | 73 +- docs/tutorial/basic/interception.html | 6 +- docs/tutorial/basic/javet_shell.html | 6 +- .../basic/node_js_mode_and_v8_mode.html | 6 +- docs/tutorial/basic/polyfill.html | 6 +- docs/tutorial/basic/spring_integration.html | 6 +- docs/tutorial/index.html | 6 +- docs/tutorial/migration_guides/index.html | 6 +- .../migration_guides/migrate_from_j2v8.html | 6 +- pom.xml | 4 +- scripts/node/javet-rebuild/rebuild.cmd | 2 +- scripts/node/javet-rebuild/rebuild.sh | 2 +- scripts/python/change_javet_version.py | 4 +- scripts/python/patch_v8_build.py | 41 +- .../caoccao/javet/enums/JSRuntimeType.java | 2 +- .../com/caoccao/javet/interop/IV8Native.java | 6 +- .../javet/interop/JavetClassLoader.java | 65 +- .../caoccao/javet/interop/NodeRuntime.java | 4 +- .../com/caoccao/javet/interop/V8Host.java | 20 +- .../com/caoccao/javet/interop/V8Internal.java | 325 ++++ .../com/caoccao/javet/interop/V8Native.java | 6 +- .../com/caoccao/javet/interop/V8Runtime.java | 165 +- .../converters/JavetObjectConverter.java | 78 +- .../javet/interop/loader/JavetLibLoader.java | 205 ++- .../loader/JavetLibLoadingListener.java | 16 + .../monitoring/V8HeapSpaceStatistics.java | 54 +- .../interop/monitoring/V8HeapStatistics.java | 64 +- .../monitoring/V8SharedMemoryStatistics.java | 20 +- .../proxy/JavetUniversalProxyHandler.java | 12 +- .../com/caoccao/javet/utils/JavetOSUtils.java | 31 +- .../com/caoccao/javet/values/V8Value.java | 3 +- .../javet/values/reference/V8Module.java | 18 +- .../javet/values/reference/V8Script.java | 3 +- .../javet/values/reference/V8ValueArray.java | 9 +- .../values/reference/V8ValueFunction.java | 33 +- .../javet/values/reference/V8ValueMap.java | 6 +- .../javet/values/reference/V8ValueObject.java | 135 +- .../values/reference/V8ValuePromise.java | 27 +- .../javet/values/reference/V8ValueProxy.java | 12 +- .../values/reference/V8ValueReference.java | 26 +- .../javet/values/reference/V8ValueSet.java | 10 +- .../values/reference/V8ValueTypedArray.java | 3 +- .../values/reference/V8ValueWeakMap.java | 10 +- .../values/reference/V8ValueWeakSet.java | 7 - .../javet/interop/TestNodeRuntime.java | 2 +- .../monitoring/TestV8HeapSpaceStatistics.java | 1 + 419 files changed, 5371 insertions(+), 3508 deletions(-) create mode 100644 .github/workflows/android_build.yml create mode 100644 android/.gitignore create mode 100644 android/build.gradle.kts create mode 100644 android/gradle.properties create mode 100644 android/gradle/wrapper/gradle-wrapper.jar create mode 100644 android/gradle/wrapper/gradle-wrapper.properties create mode 100755 android/gradlew create mode 100644 android/gradlew.bat create mode 100644 android/javet-android/.gitignore create mode 100644 android/javet-android/build.gradle.kts create mode 100644 android/javet-android/consumer-rules.pro create mode 100644 android/javet-android/proguard-rules.pro create mode 100644 android/javet-android/src/androidTest/java/com/caoccao/javet/TestPackage.java create mode 100644 android/javet-android/src/main/AndroidManifest.xml create mode 100644 android/javet-android/src/main/java/java/lang/management/ManagementFactory.java create mode 100644 android/javet-android/src/main/java/java/lang/management/MemoryNotificationInfo.java create mode 100644 android/javet-android/src/main/java/java/lang/management/MemoryPoolMXBean.java create mode 100644 android/javet-android/src/main/java/java/lang/management/MemoryType.java create mode 100644 android/javet-android/src/main/java/java/lang/management/MemoryUsage.java create mode 100644 android/javet-android/src/main/java/java/lang/management/RuntimeMXBean.java create mode 100644 android/javet-android/src/main/java/javax/management/ListenerNotFoundException.java create mode 100644 android/javet-android/src/main/java/javax/management/Notification.java create mode 100644 android/javet-android/src/main/java/javax/management/NotificationEmitter.java create mode 100644 android/javet-android/src/main/java/javax/management/NotificationListener.java create mode 100644 android/javet-android/src/test/java/com/caoccao/javet/TestDummy.java create mode 100644 android/settings.gradle.kts create mode 100755 cpp/build-android.sh create mode 100644 docker/android/base.Dockerfile create mode 100644 docker/android/build.Dockerfile create mode 100644 docs/reference/javadoc/com/caoccao/javet/interop/V8Internal.html create mode 100644 src/main/java/com/caoccao/javet/interop/V8Internal.java diff --git a/.dockerignore b/.dockerignore index 1477462e3..ca8f7ad07 100644 --- a/.dockerignore +++ b/.dockerignore @@ -62,4 +62,4 @@ hs_err_pid* # ------------------------------------------------------------------------------ # Misc -docker/* \ No newline at end of file +**/*.Dockerfile diff --git a/.github/workflows/android_build.yml b/.github/workflows/android_build.yml new file mode 100644 index 000000000..b4bec9544 --- /dev/null +++ b/.github/workflows/android_build.yml @@ -0,0 +1,36 @@ +name: Android Build + +on: + pull_request: + types: [opened, synchronize, reopened, ready_for_review] + paths-ignore: + - '**.rst' + - 'docs/**' + push: + paths-ignore: + - '**.rst' + - 'docs/**' + +jobs: + + javet_android: + + name: Javet Android + runs-on: ubuntu-latest + + steps: + + - name: Checkout the code + uses: actions/checkout@v2 + + - name: Build docker image + run: docker build -t javet-android:local -f docker/android/build.Dockerfile . + + - name: Copy the artifact + run: mkdir $PWD/build && docker run --rm -i -v $PWD/build:/output javet-android:local cp -rf /Javet/android/javet-android/build/outputs /output + + - name: Upload the artifact + uses: actions/upload-artifact@v2 + with: + name: javet-android + path: build/outputs/aar/javet*release.aar diff --git a/README.rst b/README.rst index 5658efdc6..ecc3d8d6a 100644 --- a/README.rst +++ b/README.rst @@ -1,7 +1,9 @@ Javet ===== -|Maven Central| |Discord| |Donate| |Linux Build| +|Maven Central| |Discord| |Donate| + +|Linux Build| |Android Build| .. |Maven Central| image:: https://img.shields.io/maven-central/v/com.caoccao.javet/javet?style=for-the-badge :target: https://search.maven.org/search?q=g:com.caoccao.javet @@ -15,6 +17,9 @@ Javet .. |Linux Build| image:: https://img.shields.io/github/workflow/status/caoccao/Javet/Linux%20Build?label=Linux%20Build&style=for-the-badge :target: https://github.com/caoccao/Javet/actions/workflows/linux_build.yml +.. |Android Build| image:: https://img.shields.io/github/workflow/status/caoccao/Javet/Android%20Build?label=Android%20Build&style=for-the-badge + :target: https://github.com/caoccao/Javet/actions/workflows/android_build.yml + `Javet `_ is Java + V8 (JAVa + V + EighT). It is an awesome way of embedding Node.js and V8 in Java. If you like my work, please **Star** this project. And, you may follow me `@sjtucaocao `_, or visit http://caoccao.blogspot.com/. And the official support channel is at `discord `_. @@ -27,7 +32,8 @@ Major Features ============== * Linux + Mac OS + ️Windows (x86_64) -* Node.js ``v16.11.1`` + V8 ``v9.4.146.19`` +* Android (arm, arm64, x86 and x86_64) +* Node.js ``v16.12.0`` + V8 ``v9.5.172.22`` * Dynamic switch between Node.js and V8 mode (`Which mode do you prefer? `_) * Polyfill V8 mode with `Javenode `_ * V8 API exposure in JVM @@ -52,14 +58,21 @@ Maven com.caoccao.javet javet - 1.0.1 + 1.0.2 com.caoccao.javet javet-macos - 1.0.1 + 1.0.2 + + + + + com.caoccao.javet + javet-android + 1.0.2 Gradle Kotlin DSL @@ -67,16 +80,18 @@ Gradle Kotlin DSL .. code-block:: kotlin - implementation("com.caoccao.javet:javet:1.0.1") // Linux or Windows - implementation("com.caoccao.javet:javet-macos:1.0.1") // Mac OS (x86_64 Only) + implementation("com.caoccao.javet:javet:1.0.2") // Linux or Windows + implementation("com.caoccao.javet:javet-macos:1.0.2") // Mac OS (x86_64 Only) + implementation("com.caoccao.javet:javet-android:1.0.2") // Android (arm, arm64, x86 and x86_64) Gradle Groovy DSL ^^^^^^^^^^^^^^^^^ .. code-block:: groovy - implementation 'com.caoccao.javet:javet:1.0.1' // Linux or Windows - implementation 'com.caoccao.javet:javet-macos:1.0.1' // Mac OS (x86_64 Only) + implementation 'com.caoccao.javet:javet:1.0.2' // Linux or Windows + implementation 'com.caoccao.javet:javet-macos:1.0.2' // Mac OS (x86_64 Only) + implementation 'com.caoccao.javet:javet-android:1.0.2' // Android (arm, arm64, x86 and x86_64) Hello Javet ----------- diff --git a/android/.gitignore b/android/.gitignore new file mode 100644 index 000000000..aa724b770 --- /dev/null +++ b/android/.gitignore @@ -0,0 +1,15 @@ +*.iml +.gradle +/local.properties +/.idea/caches +/.idea/libraries +/.idea/modules.xml +/.idea/workspace.xml +/.idea/navEditor.xml +/.idea/assetWizardSettings.xml +.DS_Store +/build +/captures +.externalNativeBuild +.cxx +local.properties diff --git a/android/build.gradle.kts b/android/build.gradle.kts new file mode 100644 index 000000000..a21c18888 --- /dev/null +++ b/android/build.gradle.kts @@ -0,0 +1,30 @@ +/* + * Copyright 2021. caoccao.com Sam Cao + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +buildscript { + repositories { + google() + mavenCentral() + } + dependencies { + classpath("com.android.tools.build:gradle:7.0.3") + } +} + +tasks.register("clean", Delete::class) { + delete(rootProject.buildDir) +} diff --git a/android/gradle.properties b/android/gradle.properties new file mode 100644 index 000000000..52f5917cb --- /dev/null +++ b/android/gradle.properties @@ -0,0 +1,19 @@ +# Project-wide Gradle settings. +# IDE (e.g. Android Studio) users: +# Gradle settings configured through the IDE *will override* +# any settings specified in this file. +# For more details on how to configure your build environment visit +# http://www.gradle.org/docs/current/userguide/build_environment.html +# Specifies the JVM arguments used for the daemon process. +# The setting is particularly useful for tweaking memory settings. +org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8 +# When configured, Gradle will run in incubating parallel mode. +# This option should only be used with decoupled projects. More details, visit +# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects +# org.gradle.parallel=true +# AndroidX package structure to make it clearer which packages are bundled with the +# Android operating system, and which are packaged with your app"s APK +# https://developer.android.com/topic/libraries/support-library/androidx-rn +android.useAndroidX=true +# Automatically convert third-party libraries to use AndroidX +android.enableJetifier=true \ No newline at end of file diff --git a/android/gradle/wrapper/gradle-wrapper.jar b/android/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000000000000000000000000000000000000..e708b1c023ec8b20f512888fe07c5bd3ff77bb8f GIT binary patch literal 59203 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

K7UpUK$>l@ zw`1S}(D?mUXu_C{wupRS-jiX~w=Uqqhf|Vb3Cm9L=T+w91Cu^ z*&Ty%sN?x*h~mJc4g~k{xD4ZmF%FXZNC;oVDwLZ_WvrnzY|{v8hc1nmx4^}Z;yriXsAf+Lp+OFLbR!&Ox?xABwl zu8w&|5pCxmu#$?Cv2_-Vghl2LZ6m7}VLEfR5o2Ou$x02uA-%QB2$c(c1rH3R9hesc zfpn#oqpbKuVsdfV#cv@5pV4^f_!WS+F>SV6N0JQ9E!T90EX((_{bSSFv9ld%I0&}9 zH&Jd4MEX1e0iqDtq~h?DBrxQX1iI0lIs<|kB$Yrh&cpeK0-^K%=FBsCBT46@h#yi!AyDq1V(#V}^;{{V*@T4WJ&U-NTq43w=|K>z8%pr_nC>%C(Wa_l78Ufib$r8Od)IIN=u>417 z`Hl{9A$mI5A(;+-Q&$F&h-@;NR>Z<2U;Y21>>Z;s@0V@SbkMQQj%_;~+qTuQ?c|AV zcWm3XZQHhP&R%QWarS%mJ!9R^&!_)*s(v+VR@I#QrAT}`17Y+l<`b-nvmDNW`De%y zrwTZ9EJrj1AFA>B`1jYDow}~*dfPs}IZMO3=a{Fy#IOILc8F0;JS4x(k-NSpbN@qM z`@aE_e}5{!$v3+qVs7u?sOV(y@1Os*Fgu`fCW9=G@F_#VQ%xf$hj0~wnnP0$hFI+@ zkQj~v#V>xn)u??YutKsX>pxKCl^p!C-o?+9;!Nug^ z{rP!|+KsP5%uF;ZCa5F;O^9TGac=M|=V z_H(PfkV1rz4jl?gJ(ArXMyWT4y(86d3`$iI4^l9`vLdZkzpznSd5Ikfrs8qcSy&>z zTIZgWZGXw0n9ibQxYWE@gI0(3#KA-dAdPcsL_|hg2@~C!VZDM}5;v_Nykfq!*@*Zf zE_wVgx82GMDryKO{U{D>vSzSc%B~|cjDQrt5BN=Ugpsf8H8f1lR4SGo#hCuXPL;QQ z#~b?C4MoepT3X`qdW2dNn& zo8)K}%Lpu>0tQei+{>*VGErz|qjbK#9 zvtd8rcHplw%YyQCKR{kyo6fgg!)6tHUYT(L>B7er5)41iG`j$qe*kSh$fY!PehLcD zWeKZHn<492B34*JUQh=CY1R~jT9Jt=k=jCU2=SL&&y5QI2uAG2?L8qd2U(^AW#{(x zThSy=C#>k+QMo^7caQcpU?Qn}j-`s?1vXuzG#j8(A+RUAY})F@=r&F(8nI&HspAy4 z4>(M>hI9c7?DCW8rw6|23?qQMSq?*Vx?v30U%luBo)B-k2mkL)Ljk5xUha3pK>EEj z@(;tH|M@xkuN?gsz;*bygizwYR!6=(Xgcg^>WlGtRYCozY<rFX2E>kaZo)O<^J7a`MX8Pf`gBd4vrtD|qKn&B)C&wp0O-x*@-|m*0egT=-t@%dD zgP2D+#WPptnc;_ugD6%zN}Z+X4=c61XNLb7L1gWd8;NHrBXwJ7s0ce#lWnnFUMTR& z1_R9Fin4!d17d4jpKcfh?MKRxxQk$@)*hradH2$3)nyXep5Z;B z?yX+-Bd=TqO2!11?MDtG0n(*T^!CIiF@ZQymqq1wPM_X$Iu9-P=^}v7npvvPBu!d$ z7K?@CsA8H38+zjA@{;{kG)#AHME>Ix<711_iQ@WWMObXyVO)a&^qE1GqpP47Q|_AG zP`(AD&r!V^MXQ^e+*n5~Lp9!B+#y3#f8J^5!iC@3Y@P`;FoUH{G*pj*q7MVV)29+j z>BC`a|1@U_v%%o9VH_HsSnM`jZ-&CDvbiqDg)tQEnV>b%Ptm)T|1?TrpIl)Y$LnG_ zzKi5j2Fx^K^PG1=*?GhK;$(UCF-tM~^=Z*+Wp{FSuy7iHt9#4n(sUuHK??@v+6*|10Csdnyg9hAsC5_OrSL;jVkLlf zHXIPukLqbhs~-*oa^gqgvtpgTk_7GypwH><53riYYL*M=Q@F-yEPLqQ&1Sc zZB%w}T~RO|#jFjMWcKMZccxm-SL)s_ig?OC?y_~gLFj{n8D$J_Kw%{r0oB8?@dWzn zB528d-wUBQzrrSSLq?fR!K%59Zv9J4yCQhhDGwhptpA5O5U?Hjqt>8nOD zi{)0CI|&Gu%zunGI*XFZh(ix)q${jT8wnnzbBMPYVJc4HX*9d^mz|21$=R$J$(y7V zo0dxdbX3N#=F$zjstTf*t8vL)2*{XH!+<2IJ1VVFa67|{?LP&P41h$2i2;?N~RA30LV`BsUcj zfO9#Pg1$t}7zpv#&)8`mis3~o+P(DxOMgz-V*(?wWaxi?R=NhtW}<#^Z?(BhSwyar zG|A#Q7wh4OfK<|DAcl9THc-W4*>J4nTevsD%dkj`U~wSUCh15?_N@uMdF^Kw+{agk zJ`im^wDqj`Ev)W3k3stasP`88-M0ZBs7;B6{-tSm3>I@_e-QfT?7|n0D~0RRqDb^G zyHb=is;IwuQ&ITzL4KsP@Z`b$d%B0Wuhioo1CWttW8yhsER1ZUZzA{F*K=wmi-sb#Ju+j z-l@In^IKnb{bQG}Ps>+Vu_W#grNKNGto+yjA)?>0?~X`4I3T@5G1)RqGUZuP^NJCq&^HykuYtMDD8qq+l8RcZNJsvN(10{ zQ1$XcGt}QH-U^WU!-wRR1d--{B$%vY{JLWIV%P4-KQuxxDeJaF#{eu&&r!3Qu{w}0f--8^H|KwE>)ORrcR+2Qf zb})DRcH>k0zWK8@{RX}NYvTF;E~phK{+F;MkIP$)T$93Ba2R2TvKc>`D??#mv9wg$ zd~|-`Qx5LwwsZ2hb*Rt4S9dsF%Cny5<1fscy~)d;0m2r$f=83<->c~!GNyb!U)PA; zq^!`@@)UaG)Ew(9V?5ZBq#c%dCWZrplmuM`o~TyHjAIMh0*#1{B>K4po-dx$Tk-Cq z=WZDkP5x2W&Os`N8KiYHRH#UY*n|nvd(U>yO=MFI-2BEp?x@=N<~CbLJBf6P)}vLS?xJXYJ2^<3KJUdrwKnJnTp{ zjIi|R=L7rn9b*D#Xxr4*R<3T5AuOS+#U8hNlfo&^9JO{VbH!v9^JbK=TCGR-5EWR@ zN8T-_I|&@A}(hKeL4_*eb!1G8p~&_Im8|wc>Cdir+gg90n1dw?QaXcx6Op_W1r=axRw>4;rM*UOpT#Eb9xU1IiWo@h?|5uP zka>-XW0Ikp@dIe;MN8B01a7+5V@h3WN{J=HJ*pe0uwQ3S&MyWFni47X32Q7SyCTNQ z+sR!_9IZa5!>f&V$`q!%H8ci!a|RMx5}5MA_kr+bhtQy{-^)(hCVa@I!^TV4RBi zAFa!Nsi3y37I5EK;0cqu|9MRj<^r&h1lF}u0KpKQD^5Y+LvFEwM zLU@@v4_Na#Axy6tn3P%sD^5P#<7F;sd$f4a7LBMk zGU^RZHBcxSA%kCx*eH&wgA?Qwazm8>9SCSz_!;MqY-QX<1@p$*T8lc?@`ikEqJ>#w zcG``^CoFMAhdEXT9qt47g0IZkaU)4R7wkGs^Ax}usqJ5HfDYAV$!=6?>J6+Ha1I<5 z|6=9soU4>E))tW$<#>F ziZ$6>KJf0bPfbx_)7-}tMINlc=}|H+$uX)mhC6-Hz+XZxsKd^b?RFB6et}O#+>Wmw9Ec9) z{q}XFWp{3@qmyK*Jvzpyqv57LIR;hPXKsrh{G?&dRjF%Zt5&m20Ll?OyfUYC3WRn{cgQ?^V~UAv+5 z&_m#&nIwffgX1*Z2#5^Kl4DbE#NrD&Hi4|7SPqZ}(>_+JMz=s|k77aEL}<=0Zfb)a z%F(*L3zCA<=xO)2U3B|pcTqDbBoFp>QyAEU(jMu8(jLA61-H!ucI804+B!$E^cQQa z)_ERrW3g!B9iLb3nn3dlkvD7KsY?sRvls3QC0qPi>o<)GHx%4Xb$5a3GBTJ(k@`e@ z$RUa^%S15^1oLEmA=sayrP5;9qtf!Z1*?e$ORVPsXpL{jL<6E)0sj&swP3}NPmR%FM?O>SQgN5XfHE< zo(4#Cv11(%Nnw_{_Ro}r6=gKd{k?NebJ~<~Kv0r(r0qe4n3LFx$5%x(BKvrz$m?LG zjLIc;hbj0FMdb9aH9Lpsof#yG$(0sG2%RL;d(n>;#jb!R_+dad+K;Ccw!|RY?uS(a zj~?=&M!4C(5LnlH6k%aYvz@7?xRa^2gml%vn&eKl$R_lJ+e|xsNfXzr#xuh(>`}9g zLHSyiFwK^-p!;p$yt7$F|3*IfO3Mlu9e>Dpx8O`37?fA`cj`C0B-m9uRhJjs^mRp# zWB;Aj6|G^1V6`jg7#7V9UFvnB4((nIwG?k%c7h`?0tS8J3Bn0t#pb#SA}N-|45$-j z$R>%7cc2ebAClXc(&0UtHX<>pd)akR3Kx_cK+n<}FhzmTx!8e9^u2e4%x{>T6pQ`6 zO182bh$-W5A3^wos0SV_TgPmF4WUP-+D25KjbC{y_6W_9I2_vNKwU(^qSdn&>^=*t z&uvp*@c8#2*paD!ZMCi3;K{Na;I4Q35zw$YrW5U@Kk~)&rw;G?d7Q&c9|x<Hg|CNMsxovmfth*|E*GHezPTWa^Hd^F4!B3sF;)? z(NaPyAhocu1jUe(!5Cy|dh|W2=!@fNmuNOzxi^tE_jAtzNJ0JR-avc_H|ve#KO}#S z#a(8secu|^Tx553d4r@3#6^MHbH)vmiBpn0X^29xEv!Vuh1n(Sr5I0V&`jA2;WS|Y zbf0e}X|)wA-Pf5gBZ>r4YX3Mav1kKY(ulAJ0Q*jB)YhviHK)w!TJsi3^dMa$L@^{` z_De`fF4;M87vM3Ph9SzCoCi$#Fsd38u!^0#*sPful^p5oI(xGU?yeYjn;Hq1!wzFk zG&2w}W3`AX4bxoVm03y>ts{KaDf!}b&7$(P4KAMP=vK5?1In^-YYNtx1f#}+2QK@h zeSeAI@E6Z8a?)>sZ`fbq9_snl6LCu6g>o)rO;ijp3|$vig+4t} zylEo7$SEW<_U+qgVcaVhk+4k+C9THI5V10qV*dOV6pPtAI$)QN{!JRBKh-D zk2^{j@bZ}yqW?<#VVuI_27*cI-V~sJiqQv&m07+10XF+#ZnIJdr8t`9s_EE;T2V;B z4UnQUH9EdX%zwh-5&wflY#ve!IWt0UE-My3?L#^Bh%kcgP1q{&26eXLn zTkjJ*w+(|_>Pq0v8{%nX$QZbf)tbJaLY$03;MO=Ic-uqYUmUCuXD>J>o6BCRF=xa% z3R4SK9#t1!K4I_d>tZgE>&+kZ?Q}1qo4&h%U$GfY058s%*=!kac{0Z+4Hwm!)pFLR zJ+5*OpgWUrm0FPI2ib4NPJ+Sk07j(`diti^i#kh&f}i>P4~|d?RFb#!JN)~D@)beox}bw?4VCf^y*`2{4`-@%SFTry2h z>9VBc9#JxEs1+0i2^LR@B1J`B9Ac=#FW=(?2;5;#U$0E0UNag_!jY$&2diQk_n)bT zl5Me_SUvqUjwCqmVcyb`igygB_4YUB*m$h5oeKv3uIF0sk}~es!{D>4r%PC*F~FN3owq5e0|YeUTSG#Vq%&Gk7uwW z0lDo#_wvflqHeRm*}l?}o;EILszBt|EW*zNPmq#?4A+&i0xx^?9obLyY4xx=Y9&^G;xYXYPxG)DOpPg!i_Ccl#3L}6xAAZzNhPK1XaC_~ z!A|mlo?Be*8Nn=a+FhgpOj@G7yYs(Qk(8&|h@_>w8Y^r&5nCqe0V60rRz?b5%J;GYeBqSAjo|K692GxD4` zRZyM2FdI+-jK2}WAZTZ()w_)V{n5tEb@>+JYluDozCb$fA4H)$bzg(Ux{*hXurjO^ zwAxc+UXu=&JV*E59}h3kzQPG4M)X8E*}#_&}w*KEgtX)cU{vm9b$atHa;s>| z+L6&cn8xUL*OSjx4YGjf6{Eq+Q3{!ZyhrL&^6Vz@jGbI%cAM9GkmFlamTbcQGvOlL zmJ?(FI)c86=JEs|*;?h~o)88>12nXlpMR4@yh%qdwFNpct;vMlc=;{FSo*apJ;p}! zAX~t;3tb~VuP|ZW;z$=IHf->F@Ml)&-&Bnb{iQyE#;GZ@C$PzEf6~q}4D>9jic@mTO5x76ulDz@+XAcm35!VSu zT*Gs>;f0b2TNpjU_BjHZ&S6Sqk6V1370+!eppV2H+FY!q*n=GHQ!9Rn6MjY!Jc77A zG7Y!lFp8?TIHN!LXO?gCnsYM-gQxsm=Ek**VmZu7vnuufD7K~GIxfxbsQ@qv2T zPa`tvHB$fFCyZl>3oYg?_wW)C>^_iDOc^B7klnTOoytQH18WkOk)L2BSD0r%xgRSW zQS9elF^?O=_@|58zKLK;(f77l-Zzu}4{fXed2saq!5k#UZAoDBqYQS{sn@j@Vtp|$ zG%gnZ$U|9@u#w1@11Sjl8ze^Co=)7yS(}=;68a3~g;NDe_X^}yJj;~s8xq9ahQ5_r zxAlTMnep*)w1e(TG%tWsjo3RR;yVGPEO4V{Zp?=a_0R#=V^ioQu4YL=BO4r0$$XTX zZfnw#_$V}sDAIDrezGQ+h?q24St0QNug_?{s-pI(^jg`#JRxM1YBV;a@@JQvH8*>> zIJvku74E0NlXkYe_624>znU0J@L<-c=G#F3k4A_)*;ky!C(^uZfj%WB3-*{*B$?9+ zDm$WFp=0(xnt6`vDQV3Jl5f&R(Mp};;q8d3I%Kn>Kx=^;uSVCw0L=gw53%Bp==8Sw zxtx=cs!^-_+i{2OK`Q;913+AXc_&Z5$@z3<)So0CU3;JAv=H?@Zpi~riQ{z-zLtVL z!oF<}@IgJp)Iyz1zVJ42!SPHSkjYNS4%ulVVIXdRuiZ@5Mx8LJS}J#qD^Zi_xQ@>DKDr-_e#>5h3dtje*NcwH_h;i{Sx7}dkdpuW z(yUCjckQsagv*QGMSi9u1`Z|V^}Wjf7B@q%j2DQXyd0nOyqg%m{CK_lAoKlJ7#8M} z%IvR?Vh$6aDWK2W!=i?*<77q&B8O&3?zP(Cs@kapc)&p7En?J;t-TX9abGT#H?TW? ztO5(lPKRuC7fs}zwcUKbRh=7E8wzTsa#Z{a`WR}?UZ%!HohN}d&xJ=JQhpO1PI#>X zHkb>pW04pU%Bj_mf~U}1F1=wxdBZu1790>3Dm44bQ#F=T4V3&HlOLsGH)+AK$cHk6 zia$=$kog?)07HCL*PI6}DRhpM^*%I*kHM<#1Se+AQ!!xyhcy6j7`iDX7Z-2i73_n# zas*?7LkxS-XSqv;YBa zW_n*32D(HTYQ0$feV_Fru1ZxW0g&iwqixPX3=9t4o)o|kOo79V$?$uh?#8Q8e>4e)V6;_(x&ViUVxma+i25qea;d-oK7ouuDsB^ab{ zu1qjQ%`n56VtxBE#0qAzb7lph`Eb-}TYpXB!H-}3Ykqyp`otprp7{VEuW*^IR2n$Fb99*nAtqT&oOFIf z@w*6>YvOGw@Ja?Pp1=whZqydzx@9X4n^2!n83C5{C?G@|E?&$?p*g68)kNvUTJ)I6 z1Q|(#UuP6pj78GUxq11m-GSszc+)X{C2eo-?8ud9sB=3(D47v?`JAa{V(IF zPZQ_0AY*9M97>Jf<o%#O_%Wq}8>YM=q0|tGY+hlXcpE=Z4Od z`NT7Hu2hnvRoqOw@g1f=bv`+nba{GwA$Ak0INlqI1k<9!x_!sL()h?hEWoWrdU3w` zZ%%)VR+Bc@_v!C#koM1p-3v_^L6)_Ktj4HE>aUh%2XZE@JFMOn)J~c`_7VWNb9c-N z2b|SZMR4Z@E7j&q&9(6H3yjEu6HV7{2!1t0lgizD;mZ9$r(r7W5G$ky@w(T_dFnOD z*p#+z$@pKE+>o@%eT(2-p_C}wbQ5s(%Sn_{$HDN@MB+Ev?t@3dPy`%TZ!z}AThZSu zN<1i$siJhXFdjV zP*y|V<`V8t=h#XTRUR~5`c`Z9^-`*BZf?WAehGdg)E2Je)hqFa!k{V(u+(hTf^Yq& zoruUh2(^3pe)2{bvt4&4Y9CY3js)PUHtd4rVG57}uFJL)D(JfSIo^{P=7liFXG zq5yqgof0V8paQcP!gy+;^pp-DA5pj=gbMN0eW=-eY+N8~y+G>t+x}oa!5r>tW$xhI zPQSv=pi;~653Gvf6~*JcQ%t1xOrH2l3Zy@8AoJ+wz@daW@m7?%LXkr!bw9GY@ns3e zSfuWF_gkWnesv?s3I`@}NgE2xwgs&rj?kH-FEy82=O8`+szN ziHch`vvS`zNfap14!&#i9H@wF7}yIPm=UB%(o(}F{wsZ(wA0nJ2aD^@B41>>o-_U6 zUqD~vdo48S8~FTb^+%#zcbQiiYoDKYcj&$#^;Smmb+Ljp(L=1Kt_J!;0s%1|JK}Wi z;={~oL!foo5n8=}rs6MmUW~R&;SIJO3TL4Ky?kh+b2rT9B1Jl4>#Uh-Bec z`Hsp<==#UEW6pGPhNk8H!!DUQR~#F9jEMI6T*OWfN^Ze&X(4nV$wa8QUJ>oTkruH# zm~O<`J7Wxseo@FqaZMl#Y(mrFW9AHM9Kb|XBMqaZ2a)DvJgYipkDD_VUF_PKd~dT7 z#02}bBfPn9a!X!O#83=lbJSK#E}K&yx-HI#T6ua)6o0{|={*HFusCkHzs|Fn&|C3H zBck1cmfcWVUN&i>X$YU^Sn6k2H;r3zuXbJFz)r5~3$d$tUj(l1?o={MM){kjgqXRO zc5R*#{;V7AQh|G|)jLM@wGAK&rm2~@{Pewv#06pHbKn#wL0P6F1!^qw9g&cW3Z=9} zj)POhOlwsh@eF=>z?#sIs*C-Nl(yU!#DaiaxhEs#iJqQ8w%(?+6lU02MYSeDkr!B- zPjMv+on6OLXgGnAtl(ao>|X2Y8*Hb}GRW5}-IzXnoo-d0!m4Vy$GS!XOLy>3_+UGs z2D|YcQx@M#M|}TDOetGi{9lGo9m-=0-^+nKE^*?$^uHkxZh}I{#UTQd;X!L+W@jm( zDg@N4+lUqI92o_rNk{3P>1gxAL=&O;x)ZT=q1mk0kLlE$WeWuY_$0`0jY-Kkt zP*|m3AF}Ubd=`<>(Xg0har*_@x2YH}bn0Wk*OZz3*e5;Zc;2uBdnl8?&XjupbkOeNZsNh6pvsq_ydmJI+*z**{I{0K)-;p1~k8cpJXL$^t!-`E}=*4G^-E8>H!LjTPxSx zcF+cS`ommfKMhNSbas^@YbTpH1*RFrBuATUR zt{oFWSk^$xU&kbFQ;MCX22RAN5F6eq9UfR$ut`Jw--p2YX)A*J69m^!oYfj2y7NYcH6&r+0~_sH^c^nzeN1AU4Ga7=FlR{S|Mm~MpzY0$Z+p2W(a={b-pR9EO1Rs zB%KY|@wLcAA@)KXi!d2_BxrkhDn`DT1=Dec}V!okd{$+wK z4E{n8R*xKyci1(CnNdhf$Dp2(Jpof0-0%-38X=Dd9PQgT+w%Lshx9+loPS~MOm%ZT zt%2B2iL_KU_ita%N>xjB!#71_3=3c}o zgeW~^U_ZTJQ2!PqXulQd=3b=XOQhwATK$y(9$#1jOQ4}4?~l#&nek)H(04f(Sr=s| zWv7Lu1=%WGk4FSw^;;!8&YPM)pQDCY9DhU`hMty1@sq1=Tj7bFsOOBZOFlpR`W>-J$-(kezWJj;`?x-v>ev{*8V z8p|KXJPV$HyQr1A(9LVrM47u-XpcrIyO`yWvx1pVYc&?154aneRpLqgx)EMvRaa#|9?Wwqs2+W8n5~79G z(}iCiLk;?enn}ew`HzhG+tu+Ru@T+K5juvZN)wY;x6HjvqD!&!)$$;1VAh~7fg0K| zEha#aN=Yv|3^~YFH}cc38ovVb%L|g@9W6fo(JtT6$fa?zf@Ct88e}m?i)b*Jgc{fl zExfdvw-BYDmH6>(4QMt#p0;FUIQqkhD}aH?a7)_%JtA~soqj{ppP_82yi9kaxuK>~ ze_)Zt>1?q=ZH*kF{1iq9sr*tVuy=u>Zev}!gEZx@O6-fjyu9X00gpIl-fS_pzjpqJ z1yqBmf9NF!jaF<+YxgH6oXBdK)sH(>VZ)1siyA$P<#KDt;8NT*l_0{xit~5j1P)FN zI8hhYKhQ)i z37^aP13B~u65?sg+_@2Kr^iWHN=U;EDSZ@2W2!5ALhGNWXnFBY%7W?1 z=HI9JzQ-pLKZDYTv<0-lt|6c-RwhxZ)mU2Os{bsX_i^@*fKUj8*aDO5pks=qn3Dv6 zwggpKLuyRCTVPwmw1r}B#AS}?X7b837UlXwp~E2|PJw2SGVueL7){Y&z!jL!XN=0i zU^Eig`S2`{+gU$68aRdWx?BZ{sU_f=8sn~>s~M?GU~`fH5kCc; z8ICp+INM3(3{#k32RZdv6b9MQYdZXNuk7ed8;G?S2nT+NZBG=Tar^KFl2SvhW$bGW#kdWL-I)s_IqVnCDDM9fm8g;P;8 z7t4yZn3^*NQfx7SwmkzP$=fwdC}bafQSEF@pd&P8@H#`swGy_rz;Z?Ty5mkS%>m#% zp_!m9e<()sfKiY(nF<1zBz&&`ZlJf6QLvLhl`_``%RW&{+O>Xhp;lwSsyRqGf=RWd zpftiR`={2(siiPAS|p}@q=NhVc0ELprt%=fMXO3B)4ryC2LT(o=sLM7hJC!}T1@)E zA3^J$3&1*M6Xq>03FX`R&w*NkrZE?FwU+Muut;>qNhj@bX17ZJxnOlPSZ=Zeiz~T_ zOu#yc3t6ONHB;?|r4w+pI)~KGN;HOGC)txxiUN8#mexj+W(cz%9a4sx|IRG=}ia zuEBuba3AHsV2feqw-3MvuL`I+2|`Ud4~7ZkN=JZ;L20|Oxna5vx1qbIh#k2O4$RQF zo`tL()zxaqibg^GbB+BS5#U{@K;WWQj~GcB1zb}zJkPwH|5hZ9iH2308!>_;%msji zJHSL~s)YHBR=Koa1mLEOHos*`gp=s8KA-C zu0aE+W!#iJ*0xqKm3A`fUGy#O+X+5W36myS>Uh2!R*s$aCU^`K&KKLCCDkejX2p=5 z%o7-fl03x`gaSNyr?3_JLv?2RLS3F*8ub>Jd@^Cc17)v8vYEK4aqo?OS@W9mt%ITJ z9=S2%R8M){CugT@k~~0x`}Vl!svYqX=E)c_oU6o}#Hb^%G1l3BudxA{F*tbjG;W_>=xV73pKY53v%>I)@D36I_@&p$h|Aw zonQS`07z_F#@T-%@-Tb|)7;;anoD_WH>9ewFy(ZcEOM$#Y)8>qi7rCnsH9GO-_7zF zu*C87{Df1P4TEOsnzZ@H%&lvV(3V@;Q!%+OYRp`g05PjY^gL$^$-t0Y>H*CDDs?FZly*oZ&dxvsxaUWF!{em4{A>n@vpXg$dwvt@_rgmHF z-MER`ABa8R-t_H*kv>}CzOpz;!>p^^9ztHMsHL|SRnS<-y5Z*r(_}c4=fXF`l^-i}>e7v!qs_jv zqvWhX^F=2sDNWA9c@P0?lUlr6ecrTKM%pNQ^?*Lq?p-0~?_j50xV%^(+H>sMul#Tw zeciF*1=?a7cI(}352%>LO96pD+?9!fNyl^9v3^v&Y4L)mNGK0FN43&Xf8jUlxW1Bw zyiu2;qW-aGNhs=zbuoxnxiwZ3{PFZM#Kw)9H@(hgX23h(`Wm~m4&TvoZoYp{plb^> z_#?vXcxd>r7K+1HKJvhed>gtK`TAbJUazUWQY6T~t2af%#<+Veyr%7-#*A#@&*;@g58{i|E%6yC_InGXCOd{L0;$)z#?n7M`re zh!kO{6=>7I?*}czyF7_frt#)s1CFJ_XE&VrDA?Dp3XbvF{qsEJgb&OLSNz_5g?HpK z9)8rsr4JN!Af3G9!#Qn(6zaUDqLN(g2g8*M)Djap?WMK9NKlkC)E2|-g|#-rp%!Gz zAHd%`iq|81efi93m3yTBw3g0j#;Yb2X{mhRAI?&KDmbGqou(2xiRNb^sV}%%Wu0?< z?($L>(#BO*)^)rSgyNRni$i`R4v;GhlCZ8$@e^ROX(p=2_v6Y!%^As zu022)fHdv_-~Yu_H6WVPLpHQx!W%^6j)cBhS`O3QBW#x(eX54d&I22op(N59b*&$v zFiSRY6rOc^(dgSV1>a7-5C;(5S5MvKcM2Jm-LD9TGqDpP097%52V+0>Xqq!! zq4e3vj53SE6i8J`XcQB|MZPP8j;PAOnpGnllH6#Ku~vS42xP*Nz@~y%db7Xi8s09P z1)e%8ys6&M8D=Dt6&t`iKG_4X=!kgRQoh%Z`dc&mlOUqXk-k`jKv9@(a^2-Upw>?< zt5*^DV~6Zedbec4NVl($2T{&b)zA@b#dUyd>`2JC0=xa_fIm8{5um zr-!ApXZhC8@=vC2WyxO|!@0Km)h8ep*`^he92$@YwP>VcdoS5OC^s38e#7RPsg4j+ zbVGG}WRSET&ZfrcR(x~k8n1rTP%CnfUNKUonD$P?FtNFF#cn!wEIab-;jU=B1dHK@ z(;(yAQJ`O$sMn>h;pf^8{JISW%d+@v6@CnXh9n5TXGC}?FI9i-D0OMaIg&mAg=0Kn zNJ7oz5*ReJukD55fUsMuaP+H4tDN&V9zfqF@ zr=#ecUk9wu{0;!+gl;3Bw=Vn^)z$ahVhhw)io!na&9}LmWurLb0zubxK=UEnU*{5P z+SP}&*(iBKSO4{alBHaY^)5Q=mZ+2OwIooJ7*Q5XJ+2|q`9#f?6myq!&oz?klihLq z4C)$XP!BNS0G_Z1&TM>?Jk{S~{F3n83ioli=IO6f%wkvCl(RFFw~j0tb{GvXTx>*sB0McY0s&SNvj4+^h`9nJ_wM>F!Uc>X}9PifQekn0sKI2SAJP!a4h z5cyGTuCj3ZBM^&{dRelIlT^9zcfaAuL5Y~bl!ppSf`wZbK$z#6U~rdclk``e+!qhe z6Qspo*%<)eu6?C;Bp<^VuW6JI|Ncvyn+LlSl;Mp22Bl7ARQ0Xc24%29(ZrdsIPw&-=yHQ7_Vle|5h>AST0 zUGX2Zk34vp?U~IHT|;$U86T+UUHl_NE4m|}>E~6q``7hccCaT^#y+?wD##Q%HwPd8 zV3x4L4|qqu`B$4(LXqDJngNy-{&@aFBvVsywt@X^}iH7P%>bR?ciC$I^U-4Foa`YKI^qDyGK7k%E%c_P=yzAi`YnxGA%DeNd++j3*h^ z=rn>oBd0|~lZ<6YvmkKY*ZJlJ;Im0tqgWu&E92eqt;+NYdxx`eS(4Hw_Jb5|yVvBg z*tbdY^!AN;luEyN4VRhS@-_DC{({ziH{&Z}iGElSV~qvT>L-8G%+yEL zX#MFOhj{InyKG=mvW-<1B@c-}x$vA(nU?>S>0*eN#!SLzQ)Ex7fvQ)S4D<8|I#N$3 zT5Ei`Z?cxBODHX8(Xp73v`IsAYC@9b;t}z0wxVuQSY1J^GRwDPN@qbM-ZF48T$GZ< z8WU+;Pqo?{ghI-KZ-i*ydXu`Ep0Xw^McH_KE9J0S7G;x8Fe`DVG?j3Pv=0YzJ}yZR z%2=oqHiUjvuk0~Ca>Kol4CFi0_xQT~;_F?=u+!kIDl-9g`#ZNZ9HCy17Ga1v^Jv9# z{T4Kb1-AzUxq*MutfOWWZgD*HnFfyYg0&e9f(5tZ>krPF6{VikNeHoc{linPPt#Si z&*g>(c54V8rT_AX!J&bNm-!umPvOR}vDai#`CX___J#=zeB*{4<&2WpaDncZsOkp* zsg<%@@rbrMkR_ux9?LsQxzoBa1s%$BBn6vk#{&&zUwcfzeCBJUwFYSF$08qDsB;gWQN*g!p8pxjofWbqNSZOEKOaTx@+* zwdt5*Q47@EOZ~EZL9s?1o?A%9TJT=Ob_13yyugvPg*e&ZU(r6^k4=2+D-@n=Hv5vu zSXG|hM(>h9^zn=eQ=$6`JO&70&2|%V5Lsx>)(%#;pcOfu>*nk_3HB_BNaH$`jM<^S zcSftDU1?nL;jy)+sfonQN}(}gUW?d_ikr*3=^{G)=tjBtEPe>TO|0ddVB zTklrSHiW+!#26frPXQQ(YN8DG$PZo?(po(QUCCf_OJC`pw*uey00%gmH!`WJkrKXj2!#6?`T25mTu9OJp2L8z3! z=arrL$ZqxuE{%yV)14Kd>k}j7pxZ6#$Dz8$@WV5p8kTqN<-7W)Q7Gt2{KoOPK_tZ| zf2WG~O5@{qPI+W<4f_;reuFVdO^5`ADC1!JQE|N`s3cq@(0WB!n0uh@*c{=LAd;~} zyGK@hbF-Oo+!nN)@i*O(`@FA#u?o=~e{`4O#5}z&=UkU*50fOrzi11D^&FOqe>wii z?*k+2|EcUs;Gx{!@KBT~>PAwLrIDT7Th=Utu?~?np@t^gFs?zgX=D${RwOY^WGh-+ z+#4$066ISh8eYW#FXWp~S`<*%O^ZuItL1Tyqt8#tZ zY120E;^VG`!lZn&3sPd$RkdHpU#|w+bYV)pJC|SH9g%|5IkxVTQcBA4CL0}$&}ef@ zW^Vtj%M;;_1xxP9x#ex17&4N*{ksO*_4O}xYu(p*JkL#yr}@7b)t5X?%CY<+s5_MJ zuiqt+N_;A(_)%lumoyRFixWa-M7qK_9s6<1X?JDa9fP!+_6u~~M$5L=ipB=7(j#f< zZ34J%=bs549%~_mA(|={uZNs_0?o7;-LBP(ZRnkd{-^|2|=4vUTmtByHL8 zEph`(LSEzQj68a+`d$V<45J7cyv^#|^|%fD#si1Nx!4NW*`l*{->HEWNh6-|g>-=r zXmQ|-i}Ku$ndUeHQ^&ieT!Lf}vf6GaqW9$DJ2NWrqwPY%%4nip$@vK$nRp*_C-v<| zuKz~ZyN&<%!NS26&x?jhy+@awJipMQ-8(X4#Ae5??U<1QMt1l9R=w9fAnEF}NYu$2 z>6}Vkc zIb*A?G*z8^IvibmBKn_u^5&T_1oey0gZS2~obf(#xk=erZGTEdQnt3DMGM+0oPwss zj5zXD;(oWhB_T@~Ig#9@v)AKtXu3>Inmgf@A|-lD-1U>cNyl3h?ADD9)GG4}zUGPk zZzaXe!~Kf?<~@$G?Uql3t8jy9{2!doq4=J}j9ktTxss{p6!9UdjyDERlA*xZ!=Q)KDs5O)phz>Vq3BNGoM(H|=1*Q4$^2fTZw z(%nq1P|5Rt81}SYJpEEzMPl5VJsV5&4e)ZWKDyoZ>1EwpkHx-AQVQc8%JMz;{H~p{=FXV>jIxvm4X*qv52e?Y-f%DJ zxEA165GikEASQ^fH6K#d!Tpu2HP{sFs%E=e$gYd$aj$+xue6N+Wc(rAz~wUsk2`(b z8Kvmyz%bKQxpP}~baG-rwYcYCvkHOi zlkR<=>ZBTU*8RF_d#Bl@zZsRIhx<%~Z@Z=ik z>adw3!DK(8R|q$vy{FTxw%#xliD~6qXmY^7_9kthVPTF~Xy1CfBqbU~?1QmxmU=+k z(ggxvEuA;0e&+ci-zQR{-f7aO{O(Pz_OsEjLh_K>MbvoZ4nxtk5u{g@nPv)cgW_R} z9}EA4K4@z0?7ue}Z(o~R(X&FjejUI2g~08PH1E4w>9o{)S(?1>Z0XMvTb|;&EuyOE zGvWNpYX)Nv<8|a^;1>bh#&znEcl-r!T#pn= z4$?Yudha6F%4b>*8@=BdtXXY4N+`U4Dmx$}>HeVJk-QdTG@t!tVT#0(LeV0gvqyyw z2sEp^9eY0N`u10Tm4n8No&A=)IeEC|gnmEXoNSzu!1<4R<%-9kY_8~5Ej?zRegMn78wuMs#;i&eUA0Zk_RXQ3b&TT} z;SCI=7-FUB@*&;8|n>(_g^HGf3@QODE3LpmX~ELnymQm{Sx9xrKS zK29p~?v@R$0=v6Dr5aW>-!{+h@?Q58|Kz8{{W`%J+lDAdb&M5VHrX_mDY;1-JLnf)ezmPau$)1;=`-FU=-r-83tX=C`S#}GZufju zQ>sXNT0Ny=k@nc%cFnvA_i4SC)?_ORXHq8B4D%el1uPX`c~uG#S1M7C+*MMqLw78E zhY2dI8@+N^qrMI1+;TUda(vGqGSRyU{Fnm`aqrr7bz42c5xsOO-~oZpkzorD1g}Y<6rk&3>PsSGy}W?MtqFky@A(X# zIuNZK0cK?^=;PUAu>j0#HtjbHCV*6?jzA&OoE$*Jlga*}LF`SF?WLhv1O|zqC<>*> zYB;#lsYKx0&kH@BFpW8n*yDcc6?;_zaJs<-jPSkCsSX-!aV=P5kUgF@Nu<{a%#K*F z134Q{9|YX7X(v$62_cY3^G%t~rD>Q0z@)1|zs)vjJ6Jq9;7#Ki`w+eS**En?7;n&7 zu==V3T&eFboN3ZiMx3D8qYc;VjFUk_H-WWCau(VFXSQf~viH0L$gwD$UfFHqNcgN`x}M+YQ6RnN<+@t>JUp#)9YOkqst-Ga?{FsDpEeX0(5v{0J~SEbWiL zXC2}M4?UH@u&|;%0y`eb33ldo4~z-x8zY!oVmV=c+f$m?RfDC35mdQ2E>Pze7KWP- z>!Bh<&57I+O_^s}9Tg^k)h7{xx@0a0IA~GAOt2yy!X%Q$1rt~LbTB6@Du!_0%HV>N zlf)QI1&gvERKwso23mJ!Ou6ZS#zCS5W`gxE5T>C#E|{i<1D35C222I33?Njaz`On7 zi<+VWFP6D{e-{yiN#M|Jgk<44u1TiMI78S5W`Sdb5f+{zu34s{CfWN7a3Cf^@L%!& zN$?|!!9j2c)j$~+R6n#891w-z8(!oBpL2K=+%a$r2|~8-(vQj5_XT`<0Ksf;oP+tz z9CObS!0m)Tgg`K#xBM8B(|Z)Wb&DYL{WTYv`;A=q6~Nnx2+!lTIXtj8J7dZE!P_{z z#f8w6F}^!?^KE#+ZDv+xd5O&3EmomZzsv?>E-~ygGum45fk!SBN&|eo1rKw^?aZJ4 E2O(~oYXATM literal 0 HcmV?d00001 diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 000000000..ae7d2adcd --- /dev/null +++ b/android/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,6 @@ +#Thu Oct 21 08:49:28 CST 2021 +distributionBase=GRADLE_USER_HOME +distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip +distributionPath=wrapper/dists +zipStorePath=wrapper/dists +zipStoreBase=GRADLE_USER_HOME diff --git a/android/gradlew b/android/gradlew new file mode 100755 index 000000000..4f906e0c8 --- /dev/null +++ b/android/gradlew @@ -0,0 +1,185 @@ +#!/usr/bin/env sh + +# +# Copyright 2015 the original author or authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +############################################################################## +## +## Gradle start up script for UN*X +## +############################################################################## + +# Attempt to set APP_HOME +# Resolve links: $0 may be a link +PRG="$0" +# Need this for relative symlinks. +while [ -h "$PRG" ] ; do + ls=`ls -ld "$PRG"` + link=`expr "$ls" : '.*-> \(.*\)$'` + if expr "$link" : '/.*' > /dev/null; then + PRG="$link" + else + PRG=`dirname "$PRG"`"/$link" + fi +done +SAVED="`pwd`" +cd "`dirname \"$PRG\"`/" >/dev/null +APP_HOME="`pwd -P`" +cd "$SAVED" >/dev/null + +APP_NAME="Gradle" +APP_BASE_NAME=`basename "$0"` + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD="maximum" + +warn () { + echo "$*" +} + +die () { + echo + echo "$*" + echo + exit 1 +} + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "`uname`" in + CYGWIN* ) + cygwin=true + ;; + Darwin* ) + darwin=true + ;; + MINGW* ) + msys=true + ;; + NONSTOP* ) + nonstop=true + ;; +esac + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD="$JAVA_HOME/jre/sh/java" + else + JAVACMD="$JAVA_HOME/bin/java" + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD="java" + which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." +fi + +# Increase the maximum file descriptors if we can. +if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then + MAX_FD_LIMIT=`ulimit -H -n` + if [ $? -eq 0 ] ; then + if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then + MAX_FD="$MAX_FD_LIMIT" + fi + ulimit -n $MAX_FD + if [ $? -ne 0 ] ; then + warn "Could not set maximum file descriptor limit: $MAX_FD" + fi + else + warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" + fi +fi + +# For Darwin, add options to specify how the application appears in the dock +if $darwin; then + GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" +fi + +# For Cygwin or MSYS, switch paths to Windows format before running java +if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then + APP_HOME=`cygpath --path --mixed "$APP_HOME"` + CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` + + JAVACMD=`cygpath --unix "$JAVACMD"` + + # We build the pattern for arguments to be converted via cygpath + ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` + SEP="" + for dir in $ROOTDIRSRAW ; do + ROOTDIRS="$ROOTDIRS$SEP$dir" + SEP="|" + done + OURCYGPATTERN="(^($ROOTDIRS))" + # Add a user-defined pattern to the cygpath arguments + if [ "$GRADLE_CYGPATTERN" != "" ] ; then + OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" + fi + # Now convert the arguments - kludge to limit ourselves to /bin/sh + i=0 + for arg in "$@" ; do + CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` + CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option + + if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition + eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` + else + eval `echo args$i`="\"$arg\"" + fi + i=`expr $i + 1` + done + case $i in + 0) set -- ;; + 1) set -- "$args0" ;; + 2) set -- "$args0" "$args1" ;; + 3) set -- "$args0" "$args1" "$args2" ;; + 4) set -- "$args0" "$args1" "$args2" "$args3" ;; + 5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; + 6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; + 7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; + 8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; + 9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; + esac +fi + +# Escape application args +save () { + for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done + echo " " +} +APP_ARGS=`save "$@"` + +# Collect all arguments for the java command, following the shell quoting and substitution rules +eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" + +exec "$JAVACMD" "$@" diff --git a/android/gradlew.bat b/android/gradlew.bat new file mode 100644 index 000000000..ac1b06f93 --- /dev/null +++ b/android/gradlew.bat @@ -0,0 +1,89 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem + +@if "%DEBUG%" == "" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%" == "" set DIRNAME=. +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if "%ERRORLEVEL%" == "0" goto execute + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto execute + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* + +:end +@rem End local scope for the variables with windows NT shell +if "%ERRORLEVEL%"=="0" goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 +exit /b 1 + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/android/javet-android/.gitignore b/android/javet-android/.gitignore new file mode 100644 index 000000000..d717879da --- /dev/null +++ b/android/javet-android/.gitignore @@ -0,0 +1,2 @@ +/build +*.so \ No newline at end of file diff --git a/android/javet-android/build.gradle.kts b/android/javet-android/build.gradle.kts new file mode 100644 index 000000000..6a4970568 --- /dev/null +++ b/android/javet-android/build.gradle.kts @@ -0,0 +1,72 @@ +/* + * Copyright 2021. caoccao.com Sam Cao + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +plugins { + id("com.android.library") +} + +version = "1.0.2" + +android { + compileSdk = 30 + + defaultConfig { + minSdk = 26 + targetSdk = 30 + + testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" + consumerProguardFiles("consumer-rules.pro") + } + + buildTypes { + getByName("release") { + isMinifyEnabled = false + proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro") + setProperty("archivesBaseName", property("archivesBaseName") as String + "-" + version) + } + } + + compileOptions { + sourceCompatibility = JavaVersion.VERSION_1_8 + targetCompatibility = JavaVersion.VERSION_1_8 + } + + sourceSets { + getByName("main") { + java.srcDirs("${projectDir}/../../src/main/java", "src/main/java") + jniLibs.srcDirs("src/main/jniLibs") + } + } +} + +dependencies { + implementation("androidx.appcompat:appcompat:1.3.1") + testImplementation("junit:junit:4.13.2") + androidTestImplementation("androidx.test.ext:junit:1.1.3") + androidTestImplementation("androidx.test.espresso:espresso-core:3.4.0") +} + +tasks.register(name = "sourceJar") { + from(android.sourceSets["main"].java.srcDirs) + classifier = "sources" +} + +tasks.register(name = "javadocJar") { + from(android.sourceSets["main"].java.srcDirs) + classifier = "javadoc" +} + diff --git a/android/javet-android/consumer-rules.pro b/android/javet-android/consumer-rules.pro new file mode 100644 index 000000000..e69de29bb diff --git a/android/javet-android/proguard-rules.pro b/android/javet-android/proguard-rules.pro new file mode 100644 index 000000000..ff59496d8 --- /dev/null +++ b/android/javet-android/proguard-rules.pro @@ -0,0 +1,21 @@ +# Add project specific ProGuard rules here. +# You can control the set of applied configuration files using the +# proguardFiles setting in build.gradle.kts. +# +# For more details, see +# http://developer.android.com/guide/developing/tools/proguard.html + +# If your project uses WebView with JS, uncomment the following +# and specify the fully qualified class name to the JavaScript interface +# class: +#-keepclassmembers class fqcn.of.javascript.interface.for.webview { +# public *; +#} + +# Uncomment this to preserve the line number information for +# debugging stack traces. +#-keepattributes SourceFile,LineNumberTable + +# If you keep the line number information, uncomment this to +# hide the original source file name. +#-renamesourcefileattribute SourceFile \ No newline at end of file diff --git a/android/javet-android/src/androidTest/java/com/caoccao/javet/TestPackage.java b/android/javet-android/src/androidTest/java/com/caoccao/javet/TestPackage.java new file mode 100644 index 000000000..e44fa85ee --- /dev/null +++ b/android/javet-android/src/androidTest/java/com/caoccao/javet/TestPackage.java @@ -0,0 +1,43 @@ +/* + * Copyright (c) 2021. caoccao.com Sam Cao + * All rights reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.caoccao.javet; + +import android.content.Context; + +import androidx.test.platform.app.InstrumentationRegistry; +import androidx.test.ext.junit.runners.AndroidJUnit4; + +import org.junit.Test; +import org.junit.runner.RunWith; + +import static org.junit.Assert.*; + +/** + * Instrumented test, which will execute on an Android device. + * + * @see Testing documentation + */ +@RunWith(AndroidJUnit4.class) +public class TestPackage { + @Test + public void useAppContext() { + // Context of the app under test. + Context appContext = InstrumentationRegistry.getInstrumentation().getTargetContext(); + assertEquals("com.caoccao.javet.test", appContext.getPackageName()); + } +} \ No newline at end of file diff --git a/android/javet-android/src/main/AndroidManifest.xml b/android/javet-android/src/main/AndroidManifest.xml new file mode 100644 index 000000000..d6717cb40 --- /dev/null +++ b/android/javet-android/src/main/AndroidManifest.xml @@ -0,0 +1,8 @@ + + + + \ No newline at end of file diff --git a/android/javet-android/src/main/java/java/lang/management/ManagementFactory.java b/android/javet-android/src/main/java/java/lang/management/ManagementFactory.java new file mode 100644 index 000000000..afcbff226 --- /dev/null +++ b/android/javet-android/src/main/java/java/lang/management/ManagementFactory.java @@ -0,0 +1,42 @@ +package java.lang.management; + +import com.caoccao.javet.interop.V8Notifier; + +import java.util.ArrayList; +import java.util.List; + +import javax.management.ListenerNotFoundException; +import javax.management.NotificationEmitter; + +public class ManagementFactory { + public static List getMemoryPoolMXBeans() { + return new ArrayList<>(); + } + + public static NotificationEmitter getMemoryMXBean() { + return new NotificationEmitter() { + @Override + public void addNotificationListener(V8Notifier v8Notifier, Object o, Object o1) { + } + + @Override + public void removeNotificationListener(V8Notifier v8Notifier, Object o, Object o1) + throws ListenerNotFoundException { + } + }; + } + + public static RuntimeMXBean getRuntimeMXBean() { + return new RuntimeMXBean() { + @Override + public String getInputArguments() { + return ""; + } + + @Override + public String getName() { + return "1"; + } + }; + } +} diff --git a/android/javet-android/src/main/java/java/lang/management/MemoryNotificationInfo.java b/android/javet-android/src/main/java/java/lang/management/MemoryNotificationInfo.java new file mode 100644 index 000000000..555a59fd6 --- /dev/null +++ b/android/javet-android/src/main/java/java/lang/management/MemoryNotificationInfo.java @@ -0,0 +1,9 @@ +package java.lang.management; + +public class MemoryNotificationInfo { + public static final String MEMORY_THRESHOLD_EXCEEDED = + "java.management.memory.threshold.exceeded"; + + public static final String MEMORY_COLLECTION_THRESHOLD_EXCEEDED = + "java.management.memory.collection.threshold.exceeded"; +} diff --git a/android/javet-android/src/main/java/java/lang/management/MemoryPoolMXBean.java b/android/javet-android/src/main/java/java/lang/management/MemoryPoolMXBean.java new file mode 100644 index 000000000..9a6755b71 --- /dev/null +++ b/android/javet-android/src/main/java/java/lang/management/MemoryPoolMXBean.java @@ -0,0 +1,13 @@ +package java.lang.management; + +public interface MemoryPoolMXBean { + boolean isUsageThresholdSupported(); + + default MemoryType getType() { + return null; + } + + MemoryUsage getUsage(); + + void setUsageThreshold(long memoryUsageThreshold); +} diff --git a/android/javet-android/src/main/java/java/lang/management/MemoryType.java b/android/javet-android/src/main/java/java/lang/management/MemoryType.java new file mode 100644 index 000000000..8a6864b6b --- /dev/null +++ b/android/javet-android/src/main/java/java/lang/management/MemoryType.java @@ -0,0 +1,5 @@ +package java.lang.management; + +public enum MemoryType { + HEAP; +} diff --git a/android/javet-android/src/main/java/java/lang/management/MemoryUsage.java b/android/javet-android/src/main/java/java/lang/management/MemoryUsage.java new file mode 100644 index 000000000..b0e14ab27 --- /dev/null +++ b/android/javet-android/src/main/java/java/lang/management/MemoryUsage.java @@ -0,0 +1,7 @@ +package java.lang.management; + +public class MemoryUsage { + public long getMax() { + return 1; + } +} diff --git a/android/javet-android/src/main/java/java/lang/management/RuntimeMXBean.java b/android/javet-android/src/main/java/java/lang/management/RuntimeMXBean.java new file mode 100644 index 000000000..544fea608 --- /dev/null +++ b/android/javet-android/src/main/java/java/lang/management/RuntimeMXBean.java @@ -0,0 +1,7 @@ +package java.lang.management; + +public interface RuntimeMXBean { + String getInputArguments(); + + String getName(); +} diff --git a/android/javet-android/src/main/java/javax/management/ListenerNotFoundException.java b/android/javet-android/src/main/java/javax/management/ListenerNotFoundException.java new file mode 100644 index 000000000..9ae8fcdf4 --- /dev/null +++ b/android/javet-android/src/main/java/javax/management/ListenerNotFoundException.java @@ -0,0 +1,4 @@ +package javax.management; + +public class ListenerNotFoundException extends Exception { +} diff --git a/android/javet-android/src/main/java/javax/management/Notification.java b/android/javet-android/src/main/java/javax/management/Notification.java new file mode 100644 index 000000000..baea81c91 --- /dev/null +++ b/android/javet-android/src/main/java/javax/management/Notification.java @@ -0,0 +1,7 @@ +package javax.management; + +public class Notification { + public String getType() { + return ""; + } +} diff --git a/android/javet-android/src/main/java/javax/management/NotificationEmitter.java b/android/javet-android/src/main/java/javax/management/NotificationEmitter.java new file mode 100644 index 000000000..948452342 --- /dev/null +++ b/android/javet-android/src/main/java/javax/management/NotificationEmitter.java @@ -0,0 +1,10 @@ +package javax.management; + +import com.caoccao.javet.interop.V8Notifier; + +public interface NotificationEmitter { + void addNotificationListener(V8Notifier v8Notifier, Object o, Object o1); + + void removeNotificationListener(V8Notifier v8Notifier, Object o, Object o1) + throws ListenerNotFoundException; +} diff --git a/android/javet-android/src/main/java/javax/management/NotificationListener.java b/android/javet-android/src/main/java/javax/management/NotificationListener.java new file mode 100644 index 000000000..d0cff4f42 --- /dev/null +++ b/android/javet-android/src/main/java/javax/management/NotificationListener.java @@ -0,0 +1,5 @@ +package javax.management; + +public interface NotificationListener { + void handleNotification(Notification notification, Object handback); +} diff --git a/android/javet-android/src/test/java/com/caoccao/javet/TestDummy.java b/android/javet-android/src/test/java/com/caoccao/javet/TestDummy.java new file mode 100644 index 000000000..3dc3d05f7 --- /dev/null +++ b/android/javet-android/src/test/java/com/caoccao/javet/TestDummy.java @@ -0,0 +1,34 @@ +/* + * Copyright (c) 2021. caoccao.com Sam Cao + * All rights reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.caoccao.javet; + +import org.junit.Test; + +import static org.junit.Assert.*; + +/** + * Example local unit test, which will execute on the development machine (host). + * + * @see Testing documentation + */ +public class TestDummy { + @Test + public void test() { + assertEquals(4, 2 + 2); + } +} \ No newline at end of file diff --git a/android/settings.gradle.kts b/android/settings.gradle.kts new file mode 100644 index 000000000..42a247126 --- /dev/null +++ b/android/settings.gradle.kts @@ -0,0 +1,26 @@ +/* + * Copyright 2021. caoccao.com Sam Cao + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +dependencyResolutionManagement { + repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS) + repositories { + google() + mavenCentral() + } +} +rootProject.name = "javet" +include(":javet-android") diff --git a/build.gradle.kts b/build.gradle.kts index 36d52e98d..07e9e5bac 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -25,11 +25,7 @@ repositories { } group = "com.caoccao.javet" -version = "1.0.1" - -repositories { - mavenCentral() -} +version = "1.0.2" dependencies { testImplementation("org.eclipse.jetty.websocket:websocket-server:9.4.38.v20210224") diff --git a/cpp/CMakeLists.txt b/cpp/CMakeLists.txt index ea2ffa0b2..37988dd18 100644 --- a/cpp/CMakeLists.txt +++ b/cpp/CMakeLists.txt @@ -34,6 +34,38 @@ if (POLICY CMP0091) cmake_policy(SET CMP0091 NEW) endif() +if(CMAKE_SYSTEM_NAME STREQUAL "Android") + if(NOT DEFINED CMAKE_ANDROID_NDK) + message(FATAL_ERROR "CMAKE_ANDROID_NDK needs to be defined.") + endif() + if(NOT DEFINED CMAKE_ANDROID_ARCH) + message(FATAL_ERROR "CMAKE_ANDROID_ARCH needs to be defined.") + elseif(CMAKE_ANDROID_ARCH STREQUAL "arm64") + set(CMAKE_ANDROID_ARCH_ABI arm64-v8a) + set(JAVET_LIB_ARCH arm64) + elseif(CMAKE_ANDROID_ARCH STREQUAL "arm") + set(CMAKE_ANDROID_ARCH_ABI armeabi-v7a) + set(CMAKE_ANDROID_ARM_NEON 1) + set(JAVET_LIB_ARCH arm) + elseif(CMAKE_ANDROID_ARCH STREQUAL "x86") + set(CMAKE_ANDROID_ARCH_ABI x86) + set(JAVET_LIB_ARCH x86) + elseif(CMAKE_ANDROID_ARCH STREQUAL "x86_64") + set(CMAKE_ANDROID_ARCH_ABI x86_64) + set(JAVET_LIB_ARCH x86_64) + else() + message(FATAL_ERROR "CMAKE_ANDROID_ARCH must be one of arm, arm64, x86, x86_64.") + endif() + # For now, the target ABI version is set to 26 because not all Java code is fully compatible with legacy SDK. + # In the future, more work will be done to lower the target ABI version. + set(CMAKE_SYSTEM_VERSION 26) + set(CMAKE_ANDROID_STL_TYPE c++_static) + set(JAVA_RESOURCES_DIR ${CMAKE_SOURCE_DIR}/../android/javet-android/src/main/jniLibs/${CMAKE_ANDROID_ARCH_ABI}) +else() + set(JAVA_RESOURCES_DIR ${CMAKE_SOURCE_DIR}/../src/main/resources) + set(JAVET_LIB_ARCH x86_64) +endif() + # Initialization project(Javet) aux_source_directory("jni" sourceFiles) @@ -51,10 +83,23 @@ endif() # Preparation if(DEFINED V8_DIR) + if(CMAKE_SYSTEM_NAME STREQUAL "Android") + if(CMAKE_ANDROID_ARCH STREQUAL "arm64") + set(V8_RELEASE_DIR ${V8_DIR}/out.gn/arm64.release) + elseif(CMAKE_ANDROID_ARCH STREQUAL "arm") + set(V8_RELEASE_DIR ${V8_DIR}/out.gn/arm.release) + elseif(CMAKE_ANDROID_ARCH STREQUAL "x86") + set(V8_RELEASE_DIR ${V8_DIR}/out.gn/ia32.release) + elseif(CMAKE_ANDROID_ARCH STREQUAL "x86_64") + set(V8_RELEASE_DIR ${V8_DIR}/out.gn/x64.release) + endif() + else() + set(V8_RELEASE_DIR ${V8_DIR}/out.gn/x64.release) + endif() list(APPEND includeDirs ${V8_DIR} ${V8_DIR}/include - ${V8_DIR}/out.gn/x64.release/gen) + ${V8_RELEASE_DIR}/gen) list(APPEND importLibraries v8_monolith) set(JAVET_LIB_TYPE "v8") endif() @@ -70,7 +115,7 @@ if(DEFINED NODE_DIR) v8_libbase v8_libplatform v8_snapshot v8_zlib zlib) if(CMAKE_SYSTEM_NAME STREQUAL "Windows") list(APPEND importLibraries libnode libuv) - elseif(CMAKE_SYSTEM_NAME STREQUAL "Linux") + elseif(CMAKE_SYSTEM_NAME STREQUAL "Linux" OR CMAKE_SYSTEM_NAME STREQUAL "Android") list(APPEND importLibraries node node_text_start uv) elseif(CMAKE_SYSTEM_NAME STREQUAL "Darwin") list(APPEND importLibraries node uv) @@ -94,7 +139,7 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Windows") set(CMAKE_MSVC_RUNTIME_LIBRARY "MultiThreaded$<$:Debug>") if(DEFINED V8_DIR) foreach(importLibrary ${importLibraries}) - set_target_properties(${importLibrary} PROPERTIES IMPORTED_LOCATION ${V8_DIR}/out.gn/x64.release/obj/${importLibrary}.lib) + set_target_properties(${importLibrary} PROPERTIES IMPORTED_LOCATION ${V8_RELEASE_DIR}/obj/${importLibrary}.lib) endforeach(importLibrary) set_target_properties(v8_monolith PROPERTIES LINK_FLAGS "/WHOLEARCHIVE:v8_monolith.lib") add_library(Javet SHARED ${sourceFiles} "jni/javet_resource_v8.rc") @@ -113,22 +158,22 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Windows") set_property(TARGET Javet APPEND_STRING PROPERTY LINK_FLAGS_RELEASE "") set_property(TARGET Javet PROPERTY MSVC_RUNTIME_LIBRARY "MultiThreaded$<$:Debug>") target_link_libraries(Javet ${importLibraries}) -elseif(CMAKE_SYSTEM_NAME STREQUAL "Linux" OR CMAKE_SYSTEM_NAME STREQUAL "Darwin") +elseif(CMAKE_SYSTEM_NAME STREQUAL "Linux" OR CMAKE_SYSTEM_NAME STREQUAL "Android" OR CMAKE_SYSTEM_NAME STREQUAL "Darwin") project(JavetStatic) set(JAVET_LIB_PREFIX "javet") - add_definitions(-D__x86_64__) set(CMAKE_POSITION_INDEPENDENT_CODE ON) add_library(Javet SHARED ${sourceFiles}) add_library(JavetStatic STATIC ${sourceFiles}) - if(CMAKE_SYSTEM_NAME STREQUAL "Linux") + if(CMAKE_SYSTEM_NAME STREQUAL "Linux" AND CMAKE_HOST_SYSTEM_PROCESSOR STREQUAL "x86_64") set(JAVET_LIB_SYSTEM "linux") + add_definitions(-D__x86_64__) add_definitions(-D__linux__) list(APPEND includeDirs $ENV{JAVA_HOME}/include/linux) set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -m64 ") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -m64 ") if(DEFINED V8_DIR) foreach(importLibrary ${importLibraries}) - set_target_properties(${importLibrary} PROPERTIES IMPORTED_LOCATION ${V8_DIR}/out.gn/x64.release/obj/lib${importLibrary}.a) + set_target_properties(${importLibrary} PROPERTIES IMPORTED_LOCATION ${V8_RELEASE_DIR}/obj/lib${importLibrary}.a) endforeach(importLibrary) target_link_libraries(Javet PUBLIC -Wl,--whole-archive ${importLibraries} -Wl,--no-whole-archive debug "-lrt" optimized "-lrt" "${libgcc}") @@ -152,13 +197,29 @@ elseif(CMAKE_SYSTEM_NAME STREQUAL "Linux" OR CMAKE_SYSTEM_NAME STREQUAL "Darwin" # Exported symbol filter is disabled unless production issues call for it. # https://www.gnu.org/software/gnulib/manual/html_node/LD-Version-Scripts.html # target_link_libraries(Javet PUBLIC -Wl,--version-script=${CMAKE_SOURCE_DIR}/jni/version_script.map) - elseif(CMAKE_HOST_SYSTEM_PROCESSOR STREQUAL "x86_64") + elseif(CMAKE_SYSTEM_NAME STREQUAL "Android" AND CMAKE_HOST_SYSTEM_PROCESSOR STREQUAL "x86_64") + set(JAVET_LIB_SYSTEM "android") + add_definitions(-D__ANDROID__) + list(APPEND includeDirs $ENV{JAVA_HOME}/include/linux) + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wno-unknown-pragmas -Wno-unused-function -Wno-unused-variable -O3 -funroll-loops -ftree-vectorize -ffast-math -fpermissive -fPIC ") + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wno-unknown-pragmas -Wno-unused-function -Wno-unused-variable -O3 -funroll-loops -ftree-vectorize -ffast-math -fpermissive -fPIC ") + if(DEFINED V8_DIR) + foreach(importLibrary ${importLibraries}) + set_target_properties(${importLibrary} PROPERTIES IMPORTED_LOCATION ${V8_RELEASE_DIR}/obj/lib${importLibrary}.a) + endforeach(importLibrary) + target_link_libraries(Javet PUBLIC -Wl,--whole-archive ${importLibraries} -Wl,--no-whole-archive + -llog "${libgcc}") + target_link_libraries(JavetStatic PUBLIC -Wl,--whole-archive ${importLibraries} -Wl,--no-whole-archive + -llog "${libgcc}") + endif() + elseif(CMAKE_SYSTEM_NAME STREQUAL "Darwin" AND CMAKE_HOST_SYSTEM_PROCESSOR STREQUAL "x86_64") set(JAVET_LIB_SYSTEM "macos") + add_definitions(-D__x86_64__) add_definitions(-D__APPLE__) list(APPEND includeDirs $ENV{JAVA_HOME}/include/darwin) if(DEFINED V8_DIR) foreach(importLibrary ${importLibraries}) - set_target_properties(${importLibrary} PROPERTIES IMPORTED_LOCATION ${V8_DIR}/out.gn/x64.release/obj/lib${importLibrary}.a) + set_target_properties(${importLibrary} PROPERTIES IMPORTED_LOCATION ${V8_RELEASE_DIR}/obj/lib${importLibrary}.a) target_link_libraries(Javet PUBLIC -force_load ${importLibrary}) target_link_libraries(JavetStatic PUBLIC -force_load ${importLibrary}) endforeach(importLibrary) @@ -184,10 +245,11 @@ elseif(CMAKE_SYSTEM_NAME STREQUAL "Linux" OR CMAKE_SYSTEM_NAME STREQUAL "Darwin" else() message(FATAL_ERROR "Mac OS arm64 is not supported. Please donate to support the maintainer who will be able to purchase an arm64 device.") endif() - set_target_properties(JavetStatic PROPERTIES OUTPUT_NAME "${JAVET_LIB_PREFIX}-${JAVET_LIB_TYPE}-${JAVET_LIB_SYSTEM}-x86_64.v.${JAVET_VERSION}") + set_target_properties(JavetStatic PROPERTIES OUTPUT_NAME "${JAVET_LIB_PREFIX}-${JAVET_LIB_TYPE}-${JAVET_LIB_SYSTEM}-${JAVET_LIB_ARCH}.v.${JAVET_VERSION}") else() - message(FATAL_ERROR "Linux, Mac OS and Windows x86-64 are the only supported OS.") + message(FATAL_ERROR "Linux (x86-64), Mac OS (x86-64), Windows (x86-64) and Android are the only supported Operating Systems.") endif() -set_target_properties(Javet PROPERTIES OUTPUT_NAME "${JAVET_LIB_PREFIX}-${JAVET_LIB_TYPE}-${JAVET_LIB_SYSTEM}-x86_64.v.${JAVET_VERSION}") +set_target_properties(Javet PROPERTIES OUTPUT_NAME "${JAVET_LIB_PREFIX}-${JAVET_LIB_TYPE}-${JAVET_LIB_SYSTEM}-${JAVET_LIB_ARCH}.v.${JAVET_VERSION}") include_directories(${includeDirs}) +add_custom_command(TARGET Javet POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy $ "${JAVA_RESOURCES_DIR}/$") diff --git a/cpp/build-android.sh b/cpp/build-android.sh new file mode 100755 index 000000000..7b9a1d78c --- /dev/null +++ b/cpp/build-android.sh @@ -0,0 +1,19 @@ +#!/usr/bin/env bash + +# Usage for V8: sh build-android.sh -DV8_DIR=${HOME}/v8 -DCMAKE_ANDROID_NDK=${HOME}/android -DCMAKE_ANDROID_ARCH=arm64 +# Usage for Node: sh build-android.sh -DNODE_DIR=${HOME}/node -DCMAKE_ANDROID_NDK=${HOME}/android -DCMAKE_ANDROID_ARCH=arm64 +JAVET_VERSION=1.0.2 +rm -rf build +mkdir build +cd build +mkdir -p ../../build/libs +cmake ../ -DCMAKE_SYSTEM_NAME=Android -DJAVET_VERSION=${JAVET_VERSION} "$@" \ + && make -j4 +if [ $? -eq 0 ]; then + cp -f *.a ../../build/libs + echo Build Completed +else + echo Build Failed +fi +cd ../ + diff --git a/cpp/build-linux.sh b/cpp/build-linux.sh index 61e269c63..b9d1472db 100755 --- a/cpp/build-linux.sh +++ b/cpp/build-linux.sh @@ -2,18 +2,16 @@ # Usage for V8: sh build-linux.sh -DV8_DIR=${HOME}/v8 # Usage for Node: sh build-linux.sh -DNODE_DIR=${HOME}/node -JAVET_VERSION=1.0.1 +JAVET_VERSION=1.0.2 rm -rf build mkdir build cd build -mkdir -p ../../src/main/resources mkdir -p ../../build/libs cmake ../ -DJAVET_VERSION=${JAVET_VERSION} "$@" \ && make -j4 \ - && execstack -c libjavet-*-linux-x86_64.v.${JAVET_VERSION}.so \ - && strip --strip-unneeded -R .note -R .comment libjavet-*-linux-x86_64.v.${JAVET_VERSION}.so + && execstack -c ../../src/main/resources/libjavet-*-linux-x86_64.v.${JAVET_VERSION}.so \ + && strip --strip-unneeded -R .note -R .comment ../../src/main/resources/libjavet-*-linux-x86_64.v.${JAVET_VERSION}.so if [ $? -eq 0 ]; then - cp -f *.so ../../src/main/resources cp -f *.a ../../build/libs echo Build Completed else diff --git a/cpp/build-macos.sh b/cpp/build-macos.sh index 07c81922e..1ad88b524 100755 --- a/cpp/build-macos.sh +++ b/cpp/build-macos.sh @@ -2,16 +2,14 @@ # Usage for V8: sh build-macos.sh -DV8_DIR=${HOME}/v8 # Usage for Node: sh build-macos.sh -DNODE_DIR=${HOME}/node -JAVET_VERSION=1.0.1 +JAVET_VERSION=1.0.2 rm -rf build mkdir build cd build -mkdir -p ../../src/main/resources mkdir -p ../../build/libs cmake ../ -DJAVET_VERSION=${JAVET_VERSION} "$@" \ && make -j4 if [ $? -eq 0 ]; then - cp -f *.dylib ../../src/main/resources cp -f *.a ../../build/libs echo Build Completed else diff --git a/cpp/build-windows.cmd b/cpp/build-windows.cmd index a4c5b802c..ff0406b63 100644 --- a/cpp/build-windows.cmd +++ b/cpp/build-windows.cmd @@ -1,16 +1,14 @@ @echo off REM Usage for V8: build -DV8_DIR=C:\v8 REM Usage for Node: build -DNODE_DIR=C:\node -SET JAVET_VERSION=1.0.1 +SET JAVET_VERSION=1.0.2 rd /s/q build mkdir build cd build -mkdir ..\..\src\main\resources mkdir ..\..\build\libs cmake ..\ -G "Visual Studio 16 2019" -A x64 -DJAVET_VERSION=%JAVET_VERSION% %* ^ && cmake --build . -- /p:CharacterSet=Unicode /p:Configuration=Release /p:Platform=x64 IF %ERRORLEVEL% EQU 0 ( -copy /y Release\*.dll ..\..\src\main\resources copy /y Release\*.lib ..\..\build\libs echo Build Completed ) ELSE ( diff --git a/cpp/jni/com_caoccao_javet_interop_V8Native.cpp b/cpp/jni/com_caoccao_javet_interop_V8Native.cpp index 04807890c..23b682dda 100644 --- a/cpp/jni/com_caoccao_javet_interop_V8Native.cpp +++ b/cpp/jni/com_caoccao_javet_interop_V8Native.cpp @@ -695,19 +695,19 @@ JNIEXPORT jstring JNICALL Java_com_caoccao_javet_interop_V8Native_getSourceCode return nullptr; } -JNIEXPORT jintArray JNICALL Java_com_caoccao_javet_interop_V8Native_getV8HeapSpaceStatistics +JNIEXPORT jobject JNICALL Java_com_caoccao_javet_interop_V8Native_getV8HeapSpaceStatistics (JNIEnv* jniEnv, jobject caller, jlong v8RuntimeHandle, jint allocationSpace) { auto v8Runtime = Javet::V8Runtime::FromHandle(v8RuntimeHandle); return Javet::Monitor::GetHeapSpaceStatistics(jniEnv, v8Runtime->v8Isolate, allocationSpace); } -JNIEXPORT jintArray JNICALL Java_com_caoccao_javet_interop_V8Native_getV8HeapStatistics +JNIEXPORT jobject JNICALL Java_com_caoccao_javet_interop_V8Native_getV8HeapStatistics (JNIEnv* jniEnv, jobject caller, jlong v8RuntimeHandle) { auto v8Runtime = Javet::V8Runtime::FromHandle(v8RuntimeHandle); return Javet::Monitor::GetHeapStatistics(jniEnv, v8Runtime->v8Isolate); } -JNIEXPORT jintArray JNICALL Java_com_caoccao_javet_interop_V8Native_getV8SharedMemoryStatistics +JNIEXPORT jobject JNICALL Java_com_caoccao_javet_interop_V8Native_getV8SharedMemoryStatistics (JNIEnv* jniEnv, jobject caller) { return Javet::Monitor::GetV8SharedMemoryStatistics(jniEnv); } diff --git a/cpp/jni/com_caoccao_javet_interop_V8Native.h b/cpp/jni/com_caoccao_javet_interop_V8Native.h index d24bba3c4..b52fb813f 100644 --- a/cpp/jni/com_caoccao_javet_interop_V8Native.h +++ b/cpp/jni/com_caoccao_javet_interop_V8Native.h @@ -266,25 +266,25 @@ JNIEXPORT jstring JNICALL Java_com_caoccao_javet_interop_V8Native_getSourceCode /* * Class: com_caoccao_javet_interop_V8Native * Method: getV8HeapSpaceStatistics - * Signature: (JI)[I + * Signature: (JI)Ljava/lang/Object; */ -JNIEXPORT jintArray JNICALL Java_com_caoccao_javet_interop_V8Native_getV8HeapSpaceStatistics +JNIEXPORT jobject JNICALL Java_com_caoccao_javet_interop_V8Native_getV8HeapSpaceStatistics (JNIEnv *, jobject, jlong, jint); /* * Class: com_caoccao_javet_interop_V8Native * Method: getV8HeapStatistics - * Signature: (J)[I + * Signature: (J)Ljava/lang/Object; */ -JNIEXPORT jintArray JNICALL Java_com_caoccao_javet_interop_V8Native_getV8HeapStatistics +JNIEXPORT jobject JNICALL Java_com_caoccao_javet_interop_V8Native_getV8HeapStatistics (JNIEnv *, jobject, jlong); /* * Class: com_caoccao_javet_interop_V8Native * Method: getV8SharedMemoryStatistics - * Signature: ()[I + * Signature: ()Ljava/lang/Object; */ -JNIEXPORT jintArray JNICALL Java_com_caoccao_javet_interop_V8Native_getV8SharedMemoryStatistics +JNIEXPORT jobject JNICALL Java_com_caoccao_javet_interop_V8Native_getV8SharedMemoryStatistics (JNIEnv *, jobject); /* diff --git a/cpp/jni/javet_monitor.cpp b/cpp/jni/javet_monitor.cpp index d31f2aa13..bce0b47eb 100644 --- a/cpp/jni/javet_monitor.cpp +++ b/cpp/jni/javet_monitor.cpp @@ -15,60 +15,61 @@ * limitations under the License. */ +#include "javet_converter.h" #include "javet_monitor.h" #include "javet_logging.h" namespace Javet { namespace Monitor { - jintArray GetHeapSpaceStatistics(JNIEnv* jniEnv, v8::Isolate* v8Isolate, jint allocationSpace) { + void Initialize(JNIEnv* jniEnv) { + jclassV8HeapSpaceStatistics = (jclass)jniEnv->NewGlobalRef(jniEnv->FindClass("com/caoccao/javet/interop/monitoring/V8HeapSpaceStatistics")); + jmethodIDV8HeapSpaceStatisticsConstructor = jniEnv->GetMethodID(jclassV8HeapSpaceStatistics, "", "(Ljava/lang/String;IIII)V"); + + jclassV8HeapStatistics = (jclass)jniEnv->NewGlobalRef(jniEnv->FindClass("com/caoccao/javet/interop/monitoring/V8HeapStatistics")); + jmethodIDV8HeapStatisticsConstructor = jniEnv->GetMethodID(jclassV8HeapStatistics, "", "(IIIIIIIIIIIIII)V"); + + jclassV8SharedMemoryStatistics = (jclass)jniEnv->NewGlobalRef(jniEnv->FindClass("com/caoccao/javet/interop/monitoring/V8SharedMemoryStatistics")); + jmethodIDV8SharedMemoryStatisticsConstructor = jniEnv->GetMethodID(jclassV8SharedMemoryStatistics, "", "(III)V"); + } + + jobject GetHeapSpaceStatistics(JNIEnv* jniEnv, v8::Isolate* v8Isolate, jint allocationSpaceIndex) { v8::HeapSpaceStatistics heapSpaceStatistics; - v8Isolate->GetHeapSpaceStatistics(&heapSpaceStatistics, static_cast(allocationSpace)); - jintArray intArray = jniEnv->NewIntArray(4); - jboolean copy = false; - jint* intArrayPointer = jniEnv->GetIntArrayElements(intArray, ©); - intArrayPointer[0] = static_cast(heapSpaceStatistics.physical_space_size()); - intArrayPointer[1] = static_cast(heapSpaceStatistics.space_available_size()); - intArrayPointer[2] = static_cast(heapSpaceStatistics.space_size()); - intArrayPointer[3] = static_cast(heapSpaceStatistics.space_used_size()); - jniEnv->ReleaseIntArrayElements(intArray, intArrayPointer, 0); - return intArray; + v8Isolate->GetHeapSpaceStatistics(&heapSpaceStatistics, static_cast(allocationSpaceIndex)); + return jniEnv->NewObject(jclassV8HeapSpaceStatistics, jmethodIDV8HeapSpaceStatisticsConstructor, + Javet::Converter::ToJavaString(jniEnv, heapSpaceStatistics.space_name()), + static_cast(heapSpaceStatistics.physical_space_size()), + static_cast(heapSpaceStatistics.space_available_size()), + static_cast(heapSpaceStatistics.space_size()), + static_cast(heapSpaceStatistics.space_used_size())); } - jintArray GetHeapStatistics(JNIEnv* jniEnv, v8::Isolate* v8Isolate) { + jobject GetHeapStatistics(JNIEnv* jniEnv, v8::Isolate* v8Isolate) { v8::HeapStatistics heapStatistics; v8Isolate->GetHeapStatistics(&heapStatistics); - jintArray intArray = jniEnv->NewIntArray(14); - jboolean copy = false; - jint* intArrayPointer = jniEnv->GetIntArrayElements(intArray, ©); - intArrayPointer[0] = static_cast(heapStatistics.does_zap_garbage()); - intArrayPointer[1] = static_cast(heapStatistics.external_memory()); - intArrayPointer[2] = static_cast(heapStatistics.heap_size_limit()); - intArrayPointer[3] = static_cast(heapStatistics.malloced_memory()); - intArrayPointer[4] = static_cast(heapStatistics.number_of_detached_contexts()); - intArrayPointer[5] = static_cast(heapStatistics.number_of_native_contexts()); - intArrayPointer[6] = static_cast(heapStatistics.peak_malloced_memory()); - intArrayPointer[7] = static_cast(heapStatistics.total_available_size()); - intArrayPointer[8] = static_cast(heapStatistics.total_global_handles_size()); - intArrayPointer[9] = static_cast(heapStatistics.total_heap_size()); - intArrayPointer[10] = static_cast(heapStatistics.total_heap_size_executable()); - intArrayPointer[11] = static_cast(heapStatistics.total_physical_size()); - intArrayPointer[12] = static_cast(heapStatistics.used_global_handles_size()); - intArrayPointer[13] = static_cast(heapStatistics.used_heap_size()); - jniEnv->ReleaseIntArrayElements(intArray, intArrayPointer, 0); - return intArray; + return jniEnv->NewObject(jclassV8HeapStatistics, jmethodIDV8HeapStatisticsConstructor, + static_cast(heapStatistics.does_zap_garbage()), + static_cast(heapStatistics.external_memory()), + static_cast(heapStatistics.heap_size_limit()), + static_cast(heapStatistics.malloced_memory()), + static_cast(heapStatistics.number_of_detached_contexts()), + static_cast(heapStatistics.number_of_native_contexts()), + static_cast(heapStatistics.peak_malloced_memory()), + static_cast(heapStatistics.total_available_size()), + static_cast(heapStatistics.total_global_handles_size()), + static_cast(heapStatistics.total_heap_size()), + static_cast(heapStatistics.total_heap_size_executable()), + static_cast(heapStatistics.total_physical_size()), + static_cast(heapStatistics.used_global_handles_size()), + static_cast(heapStatistics.used_heap_size())); } - jintArray GetV8SharedMemoryStatistics(JNIEnv* jniEnv) { + jobject GetV8SharedMemoryStatistics(JNIEnv* jniEnv) { v8::SharedMemoryStatistics sharedMemoryStatistics; v8::V8::GetSharedMemoryStatistics(&sharedMemoryStatistics); - jintArray intArray = jniEnv->NewIntArray(3); - jboolean copy = false; - jint* intArrayPointer = jniEnv->GetIntArrayElements(intArray, ©); - intArrayPointer[0] = static_cast(sharedMemoryStatistics.read_only_space_physical_size()); - intArrayPointer[1] = static_cast(sharedMemoryStatistics.read_only_space_size()); - intArrayPointer[2] = static_cast(sharedMemoryStatistics.read_only_space_used_size()); - jniEnv->ReleaseIntArrayElements(intArray, intArrayPointer, 0); - return intArray; + return jniEnv->NewObject(jclassV8SharedMemoryStatistics, jmethodIDV8SharedMemoryStatisticsConstructor, + static_cast(sharedMemoryStatistics.read_only_space_physical_size()), + static_cast(sharedMemoryStatistics.read_only_space_size()), + static_cast(sharedMemoryStatistics.read_only_space_used_size())); } #ifdef ENABLE_MONITOR diff --git a/cpp/jni/javet_monitor.h b/cpp/jni/javet_monitor.h index bf6552d9c..7c1f9b9da 100644 --- a/cpp/jni/javet_monitor.h +++ b/cpp/jni/javet_monitor.h @@ -29,9 +29,20 @@ namespace Javet { namespace Monitor { - jintArray GetHeapSpaceStatistics(JNIEnv* jniEnv, v8::Isolate* v8Isolate, jint allocationSpace); - jintArray GetHeapStatistics(JNIEnv* jniEnv, v8::Isolate* v8Isolate); - jintArray GetV8SharedMemoryStatistics(JNIEnv* jniEnv); + static jclass jclassV8HeapSpaceStatistics; + static jmethodID jmethodIDV8HeapSpaceStatisticsConstructor; + + static jclass jclassV8HeapStatistics; + static jmethodID jmethodIDV8HeapStatisticsConstructor; + + static jclass jclassV8SharedMemoryStatistics; + static jmethodID jmethodIDV8SharedMemoryStatisticsConstructor; + + void Initialize(JNIEnv* jniEnv); + + jobject GetHeapSpaceStatistics(JNIEnv* jniEnv, v8::Isolate* v8Isolate, jint allocationSpaceIndex); + jobject GetHeapStatistics(JNIEnv* jniEnv, v8::Isolate* v8Isolate); + jobject GetV8SharedMemoryStatistics(JNIEnv* jniEnv); #ifdef ENABLE_MONITOR namespace CounterType { diff --git a/cpp/jni/javet_native.cpp b/cpp/jni/javet_native.cpp index 7d75a5454..e068a05f0 100644 --- a/cpp/jni/javet_native.cpp +++ b/cpp/jni/javet_native.cpp @@ -30,7 +30,7 @@ JavaVM* GlobalJavaVM; jint JNI_OnLoad(JavaVM* javaVM, void* reserved) { LOG_INFO("JNI_Onload() begins."); JNIEnv* jniEnv; - if (javaVM->GetEnv((void**)&jniEnv, JNI_VERSION_1_8) != JNI_OK) { + if (javaVM->GetEnv((void**)&jniEnv, SUPPORTED_JNI_VERSION) != JNI_OK) { LOG_ERROR("Failed to call JavaVM.GetEnv()."); return ERROR_JNI_ON_LOAD; } @@ -48,14 +48,15 @@ jint JNI_OnLoad(JavaVM* javaVM, void* reserved) { Javet::Converter::Initialize(jniEnv); Javet::Exceptions::Initialize(jniEnv); Javet::Inspector::Initialize(jniEnv); + Javet::Monitor::Initialize(jniEnv); LOG_INFO("JNI_Onload() ends."); - return JNI_VERSION_1_8; + return SUPPORTED_JNI_VERSION; } void JNI_OnUnload(JavaVM* javaVM, void* reserved) { LOG_INFO("JNI_OnUnload() begins."); JNIEnv* jniEnv; - if (javaVM->GetEnv((void**)&jniEnv, JNI_VERSION_1_8) != JNI_OK) { + if (javaVM->GetEnv((void**)&jniEnv, SUPPORTED_JNI_VERSION) != JNI_OK) { LOG_ERROR("Failed to call JavaVM.GetEnv()."); } if (jniEnv == nullptr) { diff --git a/cpp/jni/javet_native.h b/cpp/jni/javet_native.h index ce5b32f4e..387f87e70 100644 --- a/cpp/jni/javet_native.h +++ b/cpp/jni/javet_native.h @@ -21,9 +21,15 @@ #include "javet_node.h" #include "javet_v8.h" +#ifdef __ANDROID__ +#define SUPPORTED_JNI_VERSION JNI_VERSION_1_6 +#else +#define SUPPORTED_JNI_VERSION JNI_VERSION_1_8 +#endif + #define FETCH_JNI_ENV(javaVMPointer) \ JNIEnv* jniEnv; \ - javaVMPointer->GetEnv((void**)&jniEnv, JNI_VERSION_1_8); \ + javaVMPointer->GetEnv((void**)&jniEnv, SUPPORTED_JNI_VERSION); \ javaVMPointer->AttachCurrentThread((void**)&jniEnv, nullptr); #define RUNTIME_HANDLES_TO_OBJECTS_WITH_SCOPE(v8RuntimeHandle) \ diff --git a/cpp/jni/javet_resource_node.rc b/cpp/jni/javet_resource_node.rc index a871d07bb..66427e1ec 100644 --- a/cpp/jni/javet_resource_node.rc +++ b/cpp/jni/javet_resource_node.rc @@ -61,8 +61,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US // VS_VERSION_INFO VERSIONINFO - FILEVERSION 1,0,1,0 - PRODUCTVERSION 1,0,1,0 + FILEVERSION 1,0,2,0 + PRODUCTVERSION 1,0,2,0 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -79,12 +79,12 @@ BEGIN BEGIN VALUE "CompanyName", "caoccao.com" VALUE "FileDescription", "caoccao.com" - VALUE "FileVersion", "1.0.1.0" - VALUE "InternalName", "libjavet-node-windows-x86_64.v.1.0.1.dll" + VALUE "FileVersion", "1.0.2.0" + VALUE "InternalName", "libjavet-node-windows-x86_64.v.1.0.2.dll" VALUE "LegalCopyright", "Copyright (C) 2021" - VALUE "OriginalFilename", "libjavet-node-windows-x86_64.v.1.0.1.dll" + VALUE "OriginalFilename", "libjavet-node-windows-x86_64.v.1.0.2.dll" VALUE "ProductName", "Javet Windows" - VALUE "ProductVersion", "1.0.1.0" + VALUE "ProductVersion", "1.0.2.0" END END BLOCK "VarFileInfo" diff --git a/cpp/jni/javet_resource_v8.rc b/cpp/jni/javet_resource_v8.rc index 0cfc9a479..5fa8eb1d0 100644 --- a/cpp/jni/javet_resource_v8.rc +++ b/cpp/jni/javet_resource_v8.rc @@ -61,8 +61,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US // VS_VERSION_INFO VERSIONINFO - FILEVERSION 1,0,1,0 - PRODUCTVERSION 1,0,1,0 + FILEVERSION 1,0,2,0 + PRODUCTVERSION 1,0,2,0 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -79,12 +79,12 @@ BEGIN BEGIN VALUE "CompanyName", "caoccao.com" VALUE "FileDescription", "caoccao.com" - VALUE "FileVersion", "1.0.1.0" - VALUE "InternalName", "libjavet-v8-windows-x86_64.v.1.0.1.dll" + VALUE "FileVersion", "1.0.2.0" + VALUE "InternalName", "libjavet-v8-windows-x86_64.v.1.0.2.dll" VALUE "LegalCopyright", "Copyright (C) 2021" - VALUE "OriginalFilename", "libjavet-v8-windows-x86_64.v.1.0.1.dll" + VALUE "OriginalFilename", "libjavet-v8-windows-x86_64.v.1.0.2.dll" VALUE "ProductName", "Javet Windows" - VALUE "ProductVersion", "1.0.1.0" + VALUE "ProductVersion", "1.0.2.0" END END BLOCK "VarFileInfo" diff --git a/docker/android/base.Dockerfile b/docker/android/base.Dockerfile new file mode 100644 index 000000000..b50fb362b --- /dev/null +++ b/docker/android/base.Dockerfile @@ -0,0 +1,109 @@ +# Copyright (c) 2021 caoccao.com Sam Cao +# All rights reserved. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +# Usage: docker build -t sjtucaocao/javet-android:1.0.2 -f docker/android/base.Dockerfile . + +FROM ubuntu:20.04 +WORKDIR / + +# Update Ubuntu +ENV DEBIAN_FRONTEND=noninteractive +RUN echo Cache V1 +RUN apt-get update +RUN apt-get install --upgrade -qq -y --no-install-recommends git curl wget build-essential software-properties-common patchelf maven sudo zip unzip execstack cmake +RUN apt-get install --upgrade -qq -y --no-install-recommends python3 python python3-pip python3-distutils python3-testresources +RUN apt-get upgrade -y +RUN pip3 install coloredlogs + +# Prepare V8 +RUN mkdir google +WORKDIR /google +RUN git clone https://chromium.googlesource.com/chromium/tools/depot_tools.git +WORKDIR /google/depot_tools +RUN git checkout remotes/origin/main +ENV PATH=/google/depot_tools:$PATH +WORKDIR /google +RUN fetch v8 +WORKDIR /google/v8 +RUN git checkout 9.5.172.22 +RUN sed -i 's/snapcraft/nosnapcraft/g' ./build/install-build-deps.sh +RUN ./build/install-build-deps.sh +RUN sed -i 's/nosnapcraft/snapcraft/g' ./build/install-build-deps.sh +WORKDIR /google +RUN echo 'target_os = ["android"]' >> .gclient +RUN gclient sync +RUN echo V8 preparation is completed. + +# Prepare Android NDK +WORKDIR / +RUN wget https://dl.google.com/android/repository/android-ndk-r21e-linux-x86_64.zip +RUN unzip android-ndk-r21e-linux-x86_64.zip +RUN rm android-ndk-r21e-linux-x86_64.zip + +# Prepare Android SDK +WORKDIR /google/v8/third_party/android_sdk/public/cmdline-tools/latest/bin +RUN yes | ./sdkmanager --licenses +RUN ./sdkmanager "build-tools;30.0.2" "platforms;android-30" +ENV ANDROID_SDK_ROOT=/google/v8/third_party/android_sdk + +# Patch Docker +RUN apt-get install --upgrade -qq -y --no-install-recommends gcc-multilib + +# Build V8 +WORKDIR /google/v8 +COPY ./scripts/python/patch_v8_build.py . +RUN python tools/dev/v8gen.py arm.release -- 'target_os="android"' 'target_cpu="arm"' 'v8_target_cpu="arm"' v8_monolithic=true v8_use_external_startup_data=false is_component_build=false v8_enable_i18n_support=false v8_enable_pointer_compression=false v8_static_library=true symbol_level=0 use_custom_libcxx=false +RUN ninja -C out.gn/arm.release v8_monolith || python3 patch_v8_build.py -p ./ +RUN ninja -C out.gn/arm.release v8_monolith +RUN python tools/dev/v8gen.py arm64.release -- 'target_os="android"' 'target_cpu="arm64"' 'v8_target_cpu="arm64"' v8_monolithic=true v8_use_external_startup_data=false is_component_build=false v8_enable_i18n_support=false v8_enable_pointer_compression=false v8_static_library=true symbol_level=0 use_custom_libcxx=false +RUN ninja -C out.gn/arm64.release v8_monolith || python3 patch_v8_build.py -p ./ +RUN ninja -C out.gn/arm64.release v8_monolith +RUN python tools/dev/v8gen.py ia32.release -- 'target_os="android"' 'target_cpu="x86"' 'v8_target_cpu="x86"' v8_monolithic=true v8_use_external_startup_data=false is_component_build=false v8_enable_i18n_support=false v8_enable_pointer_compression=false v8_static_library=true symbol_level=0 use_custom_libcxx=false +RUN ninja -C out.gn/ia32.release v8_monolith || python3 patch_v8_build.py -p ./ +RUN ninja -C out.gn/ia32.release v8_monolith +RUN python tools/dev/v8gen.py x64.release -- 'target_os="android"' 'target_cpu="x64"' 'v8_target_cpu="x64"' v8_monolithic=true v8_use_external_startup_data=false is_component_build=false v8_enable_i18n_support=false v8_enable_pointer_compression=false v8_static_library=true symbol_level=0 use_custom_libcxx=false +RUN ninja -C out.gn/x64.release v8_monolith || python3 patch_v8_build.py -p ./ +RUN ninja -C out.gn/x64.release v8_monolith +RUN rm patch_v8_build.py +RUN echo V8 build is completed. + +# Prepare Javet Build Environment +RUN apt-get install --upgrade -qq -y --no-install-recommends openjdk-11-jdk +ENV JAVA_HOME=/usr/lib/jvm/java-11-openjdk-amd64 +RUN rm /bin/sh && ln -s /bin/bash /bin/sh +ENV SDKMAN_HOME="/root/.sdkman" +ENV GRADLE_HOME="${SDKMAN_HOME}/candidates/gradle/current" +RUN curl -s https://get.sdkman.io | bash +RUN source ${SDKMAN_HOME}/bin/sdkman-init.sh && sdk install gradle 7.2 +ENV PATH=$GRADLE_HOME/bin:$PATH + +# Shrink +RUN rm -rf ${SDKMAN_HOME}/archives/* +RUN rm -rf ${SDKMAN_HOME}/tmp/* +RUN apt-get clean -y +RUN rm -rf /var/lib/apt/lists/* +WORKDIR / + +# Pre-cache Dependencies +RUN mkdir Javet +WORKDIR /Javet +COPY . . +WORKDIR /Javet/android +RUN gradle dependencies +WORKDIR / +RUN rm -rf /Javet + +# Completed +RUN echo Javet Android build base image is completed. diff --git a/docker/android/build.Dockerfile b/docker/android/build.Dockerfile new file mode 100644 index 000000000..5a4a7cca1 --- /dev/null +++ b/docker/android/build.Dockerfile @@ -0,0 +1,40 @@ +# Copyright (c) 2021 caoccao.com Sam Cao +# All rights reserved. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +# Usage: docker build -t javet-android:local -f docker/android/build.Dockerfile . + +FROM sjtucaocao/javet-android:1.0.2 +WORKDIR / + +# Copy Javet +RUN mkdir Javet +WORKDIR /Javet +COPY . . + +# Build JNI +WORKDIR /Javet/cpp +RUN sh ./build-android.sh -DV8_DIR=/google/v8 -DCMAKE_ANDROID_NDK=/android-ndk-r21e -DCMAKE_ANDROID_ARCH=arm +RUN sh ./build-android.sh -DV8_DIR=/google/v8 -DCMAKE_ANDROID_NDK=/android-ndk-r21e -DCMAKE_ANDROID_ARCH=arm64 +RUN sh ./build-android.sh -DV8_DIR=/google/v8 -DCMAKE_ANDROID_NDK=/android-ndk-r21e -DCMAKE_ANDROID_ARCH=x86 +RUN sh ./build-android.sh -DV8_DIR=/google/v8 -DCMAKE_ANDROID_NDK=/android-ndk-r21e -DCMAKE_ANDROID_ARCH=x86_64 + +# Build AAR +WORKDIR /Javet/android +RUN gradle build + +VOLUME /output + +# Completed +RUN echo Javet Android build is completed. diff --git a/docker/linux-x86_64/base.Dockerfile b/docker/linux-x86_64/base.Dockerfile index 22dc0801b..d45b7e643 100644 --- a/docker/linux-x86_64/base.Dockerfile +++ b/docker/linux-x86_64/base.Dockerfile @@ -13,13 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. -# Usage: docker build -t sjtucaocao/javet:1.0.2 -f docker/linux-x86_64/base.Dockerfile . +# Usage: docker build -t sjtucaocao/javet:1.0.2.1 -f docker/linux-x86_64/base.Dockerfile . FROM ubuntu:20.04 WORKDIR / # Update Ubuntu ENV DEBIAN_FRONTEND=noninteractive +RUN echo Cache V1 RUN apt-get update RUN apt-get install --upgrade -qq -y --no-install-recommends git curl wget build-essential software-properties-common patchelf maven sudo zip unzip execstack cmake RUN apt-get install --upgrade -qq -y --no-install-recommends python3 python python3-pip python3-distutils python3-testresources @@ -36,7 +37,7 @@ ENV PATH=/google/depot_tools:$PATH WORKDIR /google RUN fetch v8 WORKDIR /google/v8 -RUN git checkout 9.4.146.19 +RUN git checkout 9.5.172.22 RUN sed -i 's/snapcraft/nosnapcraft/g' ./build/install-build-deps.sh RUN ./build/install-build-deps.sh RUN sed -i 's/nosnapcraft/snapcraft/g' ./build/install-build-deps.sh @@ -47,14 +48,18 @@ RUN echo V8 preparation is completed. # Build V8 WORKDIR /google/v8 RUN python tools/dev/v8gen.py x64.release -- v8_monolithic=true v8_use_external_startup_data=false is_component_build=false v8_enable_i18n_support=false v8_enable_pointer_compression=false v8_static_library=true symbol_level=0 use_custom_libcxx=false +COPY ./scripts/python/patch_v8_build.py . +RUN ninja -C out.gn/x64.release v8_monolith || echo Patch +RUN python3 patch_v8_build.py -p ./ RUN ninja -C out.gn/x64.release v8_monolith +RUN rm patch_v8_build.py RUN echo V8 build is completed. # Prepare Node.js v16 WORKDIR / RUN git clone https://github.com/nodejs/node.git WORKDIR /node -RUN git checkout v16.11.1 +RUN git checkout v16.12.0 RUN echo Node.js preparation is completed. # Build Node.js diff --git a/docker/linux-x86_64/build.Dockerfile b/docker/linux-x86_64/build.Dockerfile index 82df02b6b..6cb93e7fe 100644 --- a/docker/linux-x86_64/build.Dockerfile +++ b/docker/linux-x86_64/build.Dockerfile @@ -15,7 +15,7 @@ # Usage: docker build -t javet:local -f docker/linux-x86_64/build.Dockerfile . -FROM sjtucaocao/javet:1.0.2 +FROM sjtucaocao/javet:1.0.2.1 WORKDIR / # Copy Javet diff --git a/docker/windows-x86_64/base.Dockerfile b/docker/windows-x86_64/base.Dockerfile index 102aa8741..18c9f0c12 100644 --- a/docker/windows-x86_64/base.Dockerfile +++ b/docker/windows-x86_64/base.Dockerfile @@ -60,7 +60,7 @@ ENV DEPOT_TOOLS_WIN_TOOLCHAIN=0 WORKDIR /google RUN fetch v8 WORKDIR /google/v8 -RUN git checkout 9.4.146.19 +RUN git checkout 9.5.172.22 WORKDIR /google RUN gclient sync RUN echo V8 preparation is completed. @@ -103,7 +103,7 @@ RUN powershell -ExecutionPolicy Bypass -c "iex(New-Object Net.WebClient).Downloa RUN choco install -y nasm RUN git clone https://github.com/nodejs/node.git WORKDIR /node -RUN git checkout v16.11.1 +RUN git checkout v16.12.0 RUN echo Node.js preparation is completed. # Build Node.js diff --git a/docs/_static/documentation_options.js b/docs/_static/documentation_options.js index f61f1c025..893e5bf11 100644 --- a/docs/_static/documentation_options.js +++ b/docs/_static/documentation_options.js @@ -1,6 +1,6 @@ var DOCUMENTATION_OPTIONS = { URL_ROOT: document.getElementById("documentation_options").getAttribute('data-url_root'), - VERSION: '1.0.1', + VERSION: '1.0.2', LANGUAGE: 'en, zh-CN', COLLAPSE_INDEX: false, BUILDER: 'html', diff --git a/docs/conf.py b/docs/conf.py index b95158657..788ff06c3 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -22,7 +22,7 @@ author = 'Sam Cao' # The full version, including alpha/beta/rc tags -release = '1.0.1' +release = '1.0.2' # -- General configuration --------------------------------------------------- diff --git a/docs/development/build.html b/docs/development/build.html index 2a97fceda..489323ce1 100644 --- a/docs/development/build.html +++ b/docs/development/build.html @@ -5,7 +5,7 @@ - Build Javet - Javet 1.0.1 documentation + Build Javet - Javet 1.0.2 documentation @@ -124,7 +124,7 @@

-
Javet 1.0.1 documentation
 +
Javet 1.0.2 documentation
@@ -135,7 +135,7 @@
-
- Javet 1.0.1 documentation + Javet 1.0.2 documentation