Readme

.classpath

@@ -10,6 +10,7 @@
 		<attributes>
 			<attribute name="optional" value="true"/>
 			<attribute name="maven.pomderived" value="true"/>
+			<attribute name="test" value="true"/>
 		</attributes>
 	</classpathentry>
 	<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
@@ -23,7 +24,7 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7">
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>

.gitlab-ci.yml

@@ -0,0 +1,83 @@
+# The build image for all regulator projects is available at
+# https://regulator.innoopract.com/build-tools/regulator-build-image
+# Whenever changes are submitted to the master branch, the image is
+# automatically built and uploaded to the projects container registry.
+image: docker:18.06.1-ce-dind
+
+variables:
+  DOCKER_HOST: tcp://localhost:2375/
+  ANDROID_COMPILE_SDK: "28"
+  ANDROID_BUILD_TOOLS: "28.0.2"
+  ANDROID_SDK_TOOLS:   "4333796"
+
+before_script:
+  - apk add --update python git gzip tar openjdk8 bash wget unzip libstdc++ 
+  - wget --quiet --output-document=android-sdk.zip https://dl.google.com/android/repository/sdk-tools-linux-${ANDROID_SDK_TOOLS}.zip
+  - unzip -d android-sdk-linux android-sdk.zip
+  - echo y | android-sdk-linux/tools/bin/sdkmanager "platforms;android-${ANDROID_COMPILE_SDK}" >/dev/null
+  - echo y | android-sdk-linux/tools/bin/sdkmanager "platform-tools" >/dev/null
+  - echo y | android-sdk-linux/tools/bin/sdkmanager "build-tools;${ANDROID_BUILD_TOOLS}" >/dev/null
+  - export ANDROID_HOME=$PWD/android-sdk-linux
+  - export PATH=$PATH:$PWD/android-sdk-linux/platform-tools/
+  - chmod +x ./gradlew
+  # temporarily disable checking for EPIPE error and use yes to accept all licenses
+  - set +o pipefail
+  - yes | android-sdk-linux/tools/bin/sdkmanager --licenses
+  - set -o pipefail
+
+stages:
+  - build
+
+services:
+  - name: docker:dind
+    entrypoint:
+      - dockerd-entrypoint.sh
+
+maven_verify:
+  stage: build
+  script:
+    - docker info
+    - COMMIT_HASH=`git rev-parse HEAD` && sed -i "s/Unknown\ revision\ ID/$COMMIT_HASH/g" src/main/java/com/eclipsesource/v8/V8.java
+    - python nodejs.py git clone
+    - python nodejs.py diff apply
+    - python build.py -t android -a arm --docker all ~j2v8release > arm.txt 2>&1 && ! grep -q BUILD\ FAILED arm.txt && echo passed || exit 1
+    - python build.py -t android -a x86 --keep-native-libs  --docker nodejs j2v8cmake j2v8jni j2v8cpp j2v8optimize j2v8java > x86.txt 2>&1 && ! grep -q BUILD\ FAILED x86.txt && echo passed || exit 1
+    - python build.py -t android -a x86_64 --keep-native-libs  --docker nodejs j2v8cmake j2v8jni j2v8cpp j2v8optimize j2v8java > x86_64.txt 2>&1 && ! grep -q BUILD\ FAILED x86_64.txt && echo passed || exit 1
+    - python build.py -t android -a arm64 --keep-native-libs  --docker nodejs j2v8cmake j2v8jni j2v8cpp j2v8optimize j2v8java > arm64.txt 2>&1 && ! grep -q BUILD\ FAILED arm64.txt && echo passed || exit 1
+  artifacts:
+    when: always
+    paths:
+      - build/outputs/aar/**
+      - arm.txt
+      - x86.txt
+      - x86_64.txt
+      - arm64.txt
+      - src/main/jniLibs/**/*
+  except:
+    - master
+    - 4.8-maintenance
+
+maven_verify_deploy:
+  stage: build
+  script:
+    - docker info
+    - COMMIT_HASH=`git rev-parse HEAD` && sed -i "s/Unknown\ revision\ ID/$COMMIT_HASH/g" src/main/java/com/eclipsesource/v8/V8.java
+    - python nodejs.py git clone
+    - python nodejs.py diff apply
+    - python build.py -t android -a arm --docker all ~j2v8release > arm.txt 2>&1 && ! grep -q BUILD\ FAILED arm.txt && echo passed || exit 1
+    - python build.py -t android -a x86 --keep-native-libs  --docker nodejs j2v8cmake j2v8jni j2v8cpp j2v8optimize j2v8java > x86.txt 2>&1 && ! grep -q BUILD\ FAILED x86.txt && echo passed || exit 1
+    - python build.py -t android -a x86_64 --keep-native-libs  --docker nodejs j2v8cmake j2v8jni j2v8cpp j2v8optimize j2v8java > x86_64.txt 2>&1 && ! grep -q BUILD\ FAILED x86_64.txt && echo passed || exit 1
+    - python build.py -t android -a arm64 --keep-native-libs  --docker nodejs j2v8cmake j2v8jni j2v8cpp j2v8optimize j2v8java > arm64.txt 2>&1 && ! grep -q BUILD\ FAILED arm64.txt && echo passed || exit 1
+    - python build.py -t android -a arm j2v8release --keep-native-libs --docker
+  artifacts:
+    when: always
+    paths:
+      - build/outputs/aar/**
+      - arm.txt
+      - x86.txt
+      - x86_64.txt
+      - arm64.txt
+      - src/main/jniLibs/**/*
+  only:
+    - master
+    - 4.8-maintenance

.m2/settings.xml

@@ -0,0 +1,10 @@
+<settings xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.1.0 http://maven.apache.org/xsd/settings-1.1.0.xsd"
+    xmlns="http://maven.apache.org/SETTINGS/1.1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <servers>
+    <server>
+      <id>snapshots</id>
+      <username>${env.MAVEN_REPO_USER}</username>
+      <password>${env.MAVEN_REPO_PASS}</password>
+    </server>
+  </servers>
+</settings>

README.md

@@ -1,7 +1,7 @@
 J2V8
 ====
 
-[![Build Status](https://secure.travis-ci.org/eclipsesource/J2V8.png)](http://travis-ci.org/eclipsesource/J2V8)
+[![Build Status](https://travis-ci.org/eclipsesource/J2V8.svg?branch=4.8-maintenance)](https://travis-ci.org/eclipsesource/J2V8)
 [![Maven Central](https://img.shields.io/maven-central/v/com.eclipsesource.j2v8/j2v8_win32_x86.svg)](http://search.maven.org/#search%7Cga%7C1%7Cg%3A%22com.eclipsesource.j2v8%22)
 
 J2V8 is a set of Java bindings for V8. J2V8 focuses on performance and tight integration with V8. It also takes a 'primitive first' approach, meaning that if a value can be accessed as a primitive, then it should be. This forces a more static type system between the JS and Java code, but it also improves the performance since intermediate Objects are not created.

build.gradle

@@ -3,7 +3,7 @@ apply plugin: 'signing'
 
 group = 'com.eclipsesource.j2v8'
 archivesBaseName = 'j2v8'
-version = '4.8.2'
+version = '4.8.3-SNAPSHOT'
 
 configurations {
     archives {
@@ -81,21 +81,21 @@ spoon {
 }
 
 signing {
-    required { has("release") && gradle.taskGraph.hasTask("uploadArchives") }
-    sign configurations.archives
+    //required { has("release") && gradle.taskGraph.hasTask("uploadArchives") }
+    //sign configurations.archives
 }
 
 uploadArchives {
   repositories {
     mavenDeployer {
-      beforeDeployment { MavenDeployment deployment -> signing.signPom(deployment) }
+      //beforeDeployment { MavenDeployment deployment -> signing.signPom(deployment) }
 
-      repository(url: "https://oss.sonatype.org/service/local/staging/deploy/maven2/") {
-        authentication(userName: project.hasProperty('ossrhUsername')?ossrhUsername:'', password: project.hasProperty('ossrhPassword')?ossrhPassword:'')
-      }
+      //repository(url: "https://oss.sonatype.org/service/local/staging/deploy/maven2/") {
+        //authentication(userName: project.hasProperty('ossrhUsername')?ossrhUsername:'', password: project.hasProperty('ossrhPassword')?ossrhPassword:'')
+      //}
 
       snapshotRepository(url: "https://oss.sonatype.org/content/repositories/snapshots/") {
-        authentication(userName: project.hasProperty('ossrhUsername')?ossrhUsername:'', password: project.hasProperty('ossrhPassword')?ossrhPassword:'')
+        authentication(userName: System.getenv("MAVEN_REPO_USER"), password: System.getenv("MAVEN_REPO_PASS") )
       }
 
       pom.project {

build_system/build_constants.py

@@ -25,6 +25,7 @@
     CLIStep(c.build_j2v8_java, "        Compiles the Java source code and packages it, including the previously built native libraries, into the final package artifacts.\n" +
                        "                For the execution of this build-step Maven (Java) or Gradle (Android) are used for the respective target platforms."),
     CLIStep(c.build_j2v8_test, "       Runs the Java (JUnit/Gradle) unit tests."),
+    CLIStep(c.build_j2v8_release, "       Release J2V8."),
 ]
 
 # build_steps_help = dict(atomic_build_steps)
@@ -61,6 +62,8 @@
 
 avail_architectures = [
     c.arch_x86,
+    c.arch_x86_64,
     c.arch_x64,
     c.arch_arm,
+    c.arch_arm64
 ]

build_system/build_settings.py

@@ -16,7 +16,7 @@
 # J2V8 settings
 #-----------------------------------------------------------------------
 
-J2V8_VERSION_MAJOR, J2V8_VERSION_MINOR, J2V8_VERSION_PATCH = 4, 8, 2
+J2V8_VERSION_MAJOR, J2V8_VERSION_MINOR, J2V8_VERSION_PATCH = 4, 8, 3
 J2V8_VERSION_SUFFIX = "-SNAPSHOT"
 
 # The J2V8 version in the format {major.minor.patch} to be used in other build & utility scripts

build_system/config_android.py

@@ -6,7 +6,7 @@
 import cmake_utils as cmu
 import os
 
-android_config = PlatformConfig(c.target_android, [c.arch_x86, c.arch_arm])
+android_config = PlatformConfig(c.target_android, [c.arch_x86, c.arch_arm, c.arch_arm64, c.arch_x86_64])
 
 android_config.set_cross_configs({
     "docker": DockerBuildStep(
@@ -22,23 +22,32 @@
 
 android_config.set_file_abis({
     c.arch_arm: "armeabi-v7a",
-    c.arch_x86: "x86"
+    c.arch_x86: "x86",
+    c.arch_x86_64: "x86_64",
+    c.arch_arm64: "arm64-v8a"
 })
 
 #-----------------------------------------------------------------------
 def build_node_js(config):
+    arch = config.inject_env("$ARCH")
+    if ("x86_64" in arch):
+        os.environ['DEST_CPU'] = "x64"
+    else:
+        os.environ['DEST_CPU'] = arch
     return [
-        """android-gcc-toolchain $ARCH --api 17 --host gcc-lpthread -C \
+        """android-gcc-toolchain $ARCH --api 21 --host gcc-lpthread -C \
             sh -c \"                \\
             cd ./node;              \\
             ./configure             \\
             --without-intl          \\
+            --cross-compiling       \\
             --without-inspector     \\
-            --dest-cpu=$ARCH        \\
+            --dest-cpu=$DEST_CPU    \\
             --dest-os=$PLATFORM     \\
+            --openssl-no-asm        \\
             --without-snapshot      \\
             --enable-static &&      \\
-            CFLAGS=-fPIC CXXFLAGS=-fPIC make -j4\"  \
+            CFLAGS=-fPIC CXXFLAGS=-fPIC make -j4 \"  \
             """,
     ]
 
@@ -123,3 +132,11 @@ def build_j2v8_test(config):
 
 android_config.build_step(c.build_j2v8_test, build_j2v8_test)
 #-----------------------------------------------------------------------
+def build_j2v8_release(config):
+    return \
+        u.setVersionEnv(config) + \
+        u.gradle(" uploadArchives")
+
+android_config.build_step(c.build_j2v8_release, build_j2v8_release)
+#-----------------------------------------------------------------------
+

build_system/constants.py

@@ -12,7 +12,9 @@
 # target architectures
 arch_x86 = 'x86'
 arch_x64 = 'x64'
+arch_x86_64 = 'x86_64'
 arch_arm = 'arm'
+arch_arm64 = 'arm64'
 
 # atomic build-steps
 build_node_js = 'nodejs'
@@ -22,6 +24,7 @@
 build_j2v8_optimize = 'j2v8optimize'
 build_j2v8_java = 'j2v8java'
 build_j2v8_test = 'j2v8test'
+build_j2v8_release = 'j2v8release'
 
 # aliases
 build_java = 'java'

build_system/docker_build.py

@@ -3,6 +3,7 @@
 import re
 import subprocess
 import sys
+import platform
 
 from build_structures import BuildSystem, BuildStep
 import constants as c
@@ -31,19 +32,21 @@ def health_check(self, config):
             # NOTE: the additional newlines are important for the regex matching
             version_str = utils.execute_to_str("docker version") + "\n\n"
 
-            server_match = re.search(r"Server:(.*)\n\n", version_str + "\n\n", re.DOTALL)
+            docker_version_match = re.search(r"Client:(.*)\n\n", version_str + "\n\n", re.DOTALL)
 
-            if (server_match is None or server_match.group(1) is None):
+            if (docker_version_match is None or docker_version_match.group(1) is None):
                 utils.cli_exit("ERROR: Unable to determine docker server version from version string: \n\n" + version_str)
 
-            version_match = re.search(r"^  OS/Arch:\s+(.*)$", server_match.group(1), re.MULTILINE)
+            version_match = re.search(r"OS/Arch:\s+(.*)$", docker_version_match.group(1), re.MULTILINE)
 
             if (version_match is None):
                 utils.cli_exit("ERROR: Unable to determine docker server platform from version string: \n\n" + version_str)
 
             docker_version = version_match.group(1)
 
             docker_req_platform = "windows" if utils.is_win32(config.platform) else "linux"
+            if (platform.system() == "Darwin"):
+                docker_req_platform = "darwin/amd64"
 
             # check if the docker engine is running the expected container platform (linux or windows)
             if (docker_req_platform not in docker_version):
@@ -103,7 +106,7 @@ def vendor_arg(value):
         image_name = self.get_image_name(config)
 
         print ("Building docker image: " + config.inject_env(image_name))
-        self.exec_host_cmd("docker build " + args_str + " -f $PLATFORM/Dockerfile -t \"" + image_name + "\" .", config)
+        self.exec_host_cmd("docker build " + args_str + " -f $PLATFORM/Dockerfile -t \"" + image_name + "\" . ", config)
 
     def exec_build(self, config):
         print ("DOCKER running " + config.platform + "@" + config.arch + " => " + config.name)
@@ -128,7 +131,7 @@ def exec_build(self, config):
         image_name = self.get_image_name(config)
         container_name = self.get_container_name(config)
 
-        docker_run_str = "docker run " + extra_options + " -P -v $CWD:" + mount_point + \
+        docker_run_str = "docker run " + extra_options + " -e MAVEN_REPO_USER=$MAVEN_REPO_USER -e MAVEN_REPO_PASS=$MAVEN_REPO_PASS -P -v $CWD:" + mount_point + \
             " --name " + container_name + " " + image_name + " " + shell_invoke + " \"cd $BUILD_CWD" + cmd_separator + " " + build_cmd + "\""
 
         docker_run_str = self.inject_env(docker_run_str, config)