Release 4.8.4

.gitlab-ci.yml

@@ -13,6 +13,7 @@ variables:
 before_script:
   - apk add --no-cache nss
   - apk add --update python git gzip tar openjdk8 bash wget unzip libstdc++ 
+  - apk add gnupg
   - 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

build.gradle

@@ -3,7 +3,11 @@ apply plugin: 'signing'
 
 group = 'com.eclipsesource.j2v8'
 archivesBaseName = 'j2v8'
-version = '4.8.3-SNAPSHOT'
+version = System.getenv('J2V8_FULL_VERSION')
+
+ext."signing.secretKeyRingFile" = '/.gnupg/secring.gpg'
+ext."signing.password" = System.getenv("KEYSTORE_PASSWORD")
+ext."signing.keyId" = System.getenv("KEY_ID")
 
 configurations {
     archives {
@@ -62,6 +66,7 @@ android {
 
         // androidTest.setRoot('src/test')
     }
+
 }
 
 // see: https://github.com/square/spoon
@@ -81,18 +86,18 @@ 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: System.getenv("MAVEN_REPO_USER"), password: System.getenv("MAVEN_REPO_PASS") )
+      }
 
       snapshotRepository(url: "https://oss.sonatype.org/content/repositories/snapshots/") {
         authentication(userName: System.getenv("MAVEN_REPO_USER"), password: System.getenv("MAVEN_REPO_PASS") )

build_system/build_settings.py

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

build_system/docker_build.py

@@ -88,6 +88,12 @@ def sys_image_arg(value):
         def vendor_arg(value):
             return build_arg("vendor", value)
 
+        def keystore_arg(value):
+            return build_arg("KEYSTORE", value)
+
+        def keystorepassword_arg(value):
+            return build_arg("KEYSTORE_PASSWORD", value)
+
         # use custom sys-image if it was specified by the user
         args_str += sys_image_arg(config.sys_image)
 
@@ -103,6 +109,9 @@ def vendor_arg(value):
         # pass a specified vendor string to the docker build
         args_str += vendor_arg(config.vendor)
 
+        args_str += keystore_arg("$KEYSTORE")
+        args_str += keystorepassword_arg("$KEYSTORE_PASSWORD")
+
         image_name = self.get_image_name(config)
 
         print ("Building docker image: " + config.inject_env(image_name))
@@ -131,7 +140,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 + " -e MAVEN_REPO_USER=$MAVEN_REPO_USER -e MAVEN_REPO_PASS=$MAVEN_REPO_PASS -P -v $CWD:" + mount_point + \
+        docker_run_str = "docker run " + extra_options + " -e KEY_ID=$KEY_ID -e KEYSTORE_PASSWORD=$KEYSTORE_PASSWORD -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)

docker/android/Dockerfile

@@ -77,6 +77,19 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get install -y libqt5widgets5
 ENV QT_QPA_PLATFORM offscreen
 ENV LD_LIBRARY_PATH ${ANDROID_HOME}/tools/lib64:${ANDROID_HOME}/emulator/lib64:${ANDROID_HOME}/emulator/lib64/qt/lib
 
+ARG KEYSTORE
+ARG KEYSTORE_PASSWORD
+
+ENV KEYSTORE=$KEYSTORE
+ENV KEYSTORE_PASSWORD=$KEYSTORE_PASSWORD
+
+RUN mkdir ~/.gnupg
+
+RUN if [ -n "$KEYSTORE" ]; then echo $KEYSTORE | base64 -d > my-private-key.asc; fi
+RUN if [ -n "$KEYSTORE" -a -n "$KEYSTORE_PASSWORD" ]; then echo $KEYSTORE_PASSWORD | gpg --import --batch --yes --passphrase-fd 0 my-private-key.asc; fi
+
+RUN cp -r ~/.gnupg /
+
 EXPOSE 22
 EXPOSE 5037
 EXPOSE 5554