Testroid

.gitignore

@@ -68,3 +68,4 @@ app/src/main/assets/jsengine.bundle.js
 node_modules/
 yarn.lock
 app/google-services.json
+app/cliqz-config.json

Dockerfile

@@ -1,4 +1,4 @@
-FROM ubuntu:16.04
+FROM ubuntu:18.04
 MAINTAINER Stefano Pacifici <[email protected]>
 ENV DEBIAN_FRONTEND noninteractive
 
@@ -61,7 +61,7 @@ ENV JAVA_HOME /usr/lib/jvm/java-8-openjdk-amd64/
 ENV ANDROID_HOME /home/jenkins/android_home
 ENV GRADLE_USER_HOME /home/jenkins/gradle_home
 ENV NVM_DIR /home/jenkins/nvm 
-ENV NODE_VERSION 8.9.3
+ENV NODE_VERSION 9.11.2
 
 USER jenkins
 
@@ -74,33 +74,38 @@ RUN mkdir -p $ANDROID_HOME; \
     rm -r sdktools.zip; \
     (while (true); do echo y; sleep 2; done) | \
         tools/bin/sdkmanager  \
-        "build-tools;26.0.2" \
-        "platforms;android-23" \
-        "platforms;android-27" \
+        "build-tools;28.0.3" \
+        "platforms;android-28" \
         "platform-tools" \
         "tools" \
-        "platforms;android-25" \
         "extras;google;m2repository" \
         "extras;android;m2repository" \
         "extras;google;google_play_services";
 
-ENV LD_LIBRARY_PATH "/home/jenkins/android_home/emulator/lib64/qt/lib"
-
 # Install Node.JS
 SHELL ["/bin/bash", "-l", "-c"]
 RUN curl https://raw.githubusercontent.com/creationix/nvm/v0.33.8/install.sh | bash && \
     . $NVM_DIR/nvm.sh 
 
 ENV PATH "$NVM_DIR/versions/node/v$NODE_VERSION/bin:$PATH"
 
-#Installation of 'yarn'; 'appium' & 'wd' for Integration Tests
-RUN npm install --global \
-    yarn \
-    appium \
-    wd
+#Installation of Updated 'npm'
+RUN npm install --global npm
 
 #Install Ruby and Fastlane
+RUN for key in 409B6B1796C275462A1703113804BB82D39DC0E3 \
+               7D2BAF1CF37B13E2069D6956105BD0E739499BDB; do \
+        for server in "hkp://keys.gnupg.net" \
+                         "hkp://p80.pool.sks-keyservers.net:80" \
+                         "pgp.mit.edu" \
+                         "hkp://keyserver.ubuntu.com:80"; do \
+            gpg2 --keyserver "${server}" --recv-keys "${key}" || echo "Trying new server..."; \
+        done; \
+    done
+RUN curl -sSL https://get.rvm.io | bash -s stable --ruby=2.4.3 --autolibs=read-fail && \
+    source /home/jenkins/.rvm/scripts/rvm \
+    rvm reload && \
+    gem install fastlane --version 2.126.0
 
-RUN gpg2 --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3 && \
-    curl -sSL https://get.rvm.io | bash -s stable --ruby=2.4.1 --autolibs=read-fail
-RUN gem install fastlane
+#Install AWS CLI
+RUN pip install awscli --upgrade --user

Jenkinsfile.upload

@@ -1,67 +1,77 @@
 #!/bin/env groovy
-
+@Library(['[email protected]']) _
+properties([
+    parameters([
+        choice(choices: ['lumen', 'cliqz'], defaultValue: 'lumen', description: 'Which Product ?', name: 'product')
+    ])
+])
 node('master'){
     def imageName = 'android-browser'
-    def branchName = "${BRANCH_NAME}"
-
     stage('Checkout'){
         checkout scm
     }
-
     stage('Build docker image') {
         docker.build(imageName, '--build-arg UID=`id -u` --build-arg GID=`id -g` .')
     }
-
     docker.image(imageName).inside() {
-        stage('Extension') {
-            sh '''
-                set -x
-                set -e
-                yarn  
-                npm run bundle
-            '''
-        }
-
-        withEnv(["GRADLE_USER_HOME=${pwd()}/gradle_home","BN=${branchName}"]) {
-            withCredentials([
-                    file(credentialsId: '263e59fb-e9de-4e51-962c-0237c6ee167b', variable: 'CERT_PATH'),
-                    string(credentialsId: '60354bba-8ed0-4df9-8f8e-5be7454c1680', variable: 'CERT_PASS'),
-                    file(credentialsId: '2939d2e1-dd9a-4097-adc2-430e3d67157a', variable: 'PLAY_STORE_CERT')]) {
-                sh 'echo $BN'
-                if ("${BN}".contains("-re")) {
-                    stage('Compile') {
-                        sh './gradlew clean assembleStandardFatRelease'
-                    }
-                }else {
+        try {
+            stage('Extension') {
+                sh '''#!/bin/bash -l
+                    set -x
+                    set -e
+                    npm ci
+                    npm run bundle
+                '''
+            }
+            withEnv([
+                "GRADLE_USER_HOME=${pwd()}/gradle_home",
+                "BUILD_NUMBER=${BUILD_NUMBER}"
+                ]) {
+                withCredentials([
+                        file(credentialsId: '263e59fb-e9de-4e51-962c-0237c6ee167b', variable: 'CERT_PATH'),
+                        string(credentialsId: '60354bba-8ed0-4df9-8f8e-5be7454c1680', variable: 'CERT_PASS'),
+                        file(credentialsId: '2939d2e1-dd9a-4097-adc2-430e3d67157a', variable: 'PLAY_STORE_CERT'),
+                        file(credentialsId: 'cliqz-config.json', variable: 'CLIQZ_CONFIG_JSON'),
+                        file(credentialsId: '6006a534-9f2e-4ba8-93f9-f0f27c0713df', variable: 'GOOGLE_SERVICES')]) {
                     stage('Compile and Upload') {
-                        sh '''#!/bin/bash -l
-                            set -x
-                            set -e
-                            fastlane android alpha
-                        '''
+                            sh '''#!/bin/bash -l
+                                set -x
+                                set -e
+                                cp "$CLIQZ_CONFIG_JSON" app/cliqz-config.json
+                                cp "$GOOGLE_SERVICES" app/google-services.json
+                            '''
+                            if(params.product == "cliqz") {
+                                sh '''#!/bin/bash -l
+                                    set -x
+                                    set -e
+                                    export APP_PACKAGE="com.cliqz.browser"
+                                    fastlane android internal_cliqz
+                                '''
+                            }
+                            if(params.product == "lumen") {
+                                sh '''#!/bin/bash -l
+                                    set -x
+                                    set -e
+                                    export APP_PACKAGE="com.cliqz.lumen"
+                                    fastlane android internal_lumen
+                                '''
+                            }
+                        }
                     }
                 }
-            }
-        }
-
-    }
-    if ("${branchName}".contains("-re")) {
-        def id = "Cliqz_Browser_android"+"${branchName}".substring("${branchName}".indexOf("v"), "${branchName}".indexOf("-"))
-        stage('Upload') {
-            withCredentials([
-                    [
-                            $class          : 'UsernamePasswordMultiBinding',
-                            credentialsId   : 'f1732e5f-3e84-47ad-9286-a5fa6657ec43',
-                            passwordVariable: 'AWS_SECRET_ACCESS_KEY',
-                            usernameVariable: 'AWS_ACCESS_KEY_ID',
-                    ]
-            ]) {
-                def s3Path = 's3://repository.cliqz.com/dist/android/release/apk'
-                def apkPath = "app/build/outputs/apk/standardFat/release/app-standard-fat-release.apk"
-
-                sh "aws s3 cp --acl public-read --acl bucket-owner-full-control ${apkPath} ${s3Path}/${id}.apk"
-                sh "aws s3 cp --acl public-read --acl bucket-owner-full-control ${s3Path}/${id}.apk ${s3Path}/latest.apk"
+            } finally {
+            stage('Upload Artifacts and Clean Up') {
+                archiveArtifacts allowEmptyArchive: true, artifacts: 'app/build/**/*.apk'
+                sh'''#!/bin/bash -l
+                    set -x
+                    set -e
+                    rm -f app/cliqz-config.json
+                    rm -f app/google-services.json
+                    rm -rf app/build
+                    rm -rf jsengine/*
+                    rm -rf gradle_home/
+                '''
             }
         }
     }
-}
+}

README.md

@@ -78,12 +78,12 @@ To also develop code from `browser-core`, follow these steps:
  ```
  3. Now, build the extension, and direct the build output to the android browser's node_modules directory. Use the `fern serve` command means that the project will be rebuild if you make code changes:
  ```shell
-  CLIQZ_OUTPUT_PATH=/path/to/android-browser/node_modules/browser-core/build/ ./fern.js serve configs/react-native.json
+  CLIQZ_OUTPUT_PATH=/path/to/android-browser/node_modules/browser-core/build/ ./fern.js serve configs/cliqz-android.js
   ```
 
 Now the dev server will see and load the updated files outputed from the fern build when you reload the code in the app.
 
-### Degugging
+### Debugging
 
 To work with react live reloading server, the Developer Support option has to
 be set on ReactInstanceManager in `/app/src/main/java/com/cliqz/jsengine/Engine.java`,

android_utils/src/main/java/com/cliqz/utils/SpannableUtils.java

@@ -3,16 +3,17 @@
 import android.content.Context;
 import android.content.res.Resources;
 import android.graphics.drawable.Drawable;
-import androidx.annotation.NonNull;
-import androidx.annotation.StringRes;
-import androidx.core.content.ContextCompat;
 import android.text.Spannable;
 import android.text.SpannableString;
 import android.text.SpannableStringBuilder;
 import android.text.Spanned;
 import android.text.style.ImageSpan;
 import android.text.style.URLSpan;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.StringRes;
+import androidx.appcompat.content.res.AppCompatResources;
+
 import java.util.Iterator;
 import java.util.LinkedList;
 import java.util.List;
@@ -25,7 +26,7 @@
 public final class SpannableUtils {
 
     private static final Pattern MARKDOWN_PATTERN =
-            Pattern.compile("((!?)\\[(.*?)\\]\\((.*?)\\))|(<br\\s*>)");
+            Pattern.compile("((!?)\\[(.*?)]\\((.*?)\\))|(<br\\s*>)");
 
     private SpannableUtils() {
     } // No instances
@@ -67,7 +68,8 @@ public static Spannable markdownStringToSpannable(@NonNull Context context,
                 if (drawableId == 0) {
                     drawable = null;
                 } else {
-                    drawable = ContextCompat.getDrawable(context, drawableId);
+                    drawable = AppCompatResources.getDrawable(context, drawableId);
+                    assert drawable != null;
                     drawable.setBounds(0, 0, drawable.getIntrinsicWidth(), drawable.getIntrinsicHeight());
                 }
                 region = new SpannableRegion(matcher.start(), matcher.end(),
@@ -110,7 +112,7 @@ public static Spannable markdownStringToSpannable(@NonNull Context context,
             prev = region.regionEnd;
         }
         if (prev < in.length()) {
-            builder.append(in.substring(prev, in.length()));
+            builder.append(in.substring(prev));
         }
         return builder;
     }