Commit 094f958c authored by Agi Sferro's avatar Agi Sferro
Browse files

Bug 1522795 - Update android gradle plugin to 3.4.2. r=nalexander 

Differential Revision: https://phabricator.services.mozilla.com/D39106

--HG--
extra : moz-landing-system : lando
parent bda94b6b

build.gradle

+2 −5
Original line number Diff line number Diff line
@@ -83,8 +83,8 @@ buildscript { 
    }



    dependencies {

        classpath 'org.mozilla.apilint:apilint:0.2.2'

        classpath 'com.android.tools.build:gradle:3.2.1'

        classpath 'org.mozilla.apilint:apilint:0.2.3'

        classpath 'com.android.tools.build:gradle:3.4.2'

        classpath 'com.getkeepsafe.dexcount:dexcount-gradle-plugin:0.8.2'

        classpath 'org.apache.commons:commons-exec:1.3'

        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
@@ -324,6 +324,3 @@ idea { 
        }

    }

}
 


task wrapper(type: Wrapper) {

}

gradle/wrapper/gradle-wrapper.properties

+2 −2
Original line number Diff line number Diff line
@@ -3,5 +3,5 @@ distributionBase=GRADLE_USER_HOME 
distributionPath=wrapper/dists

zipStoreBase=GRADLE_USER_HOME

zipStorePath=wrapper/dists

distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.2-all.zip

distributionSha256Sum=b7aedd369a26b177147bcb715f8b1fc4fe32b0a6ade0d7fd8ee5ed0c6f731f2c
 
distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-all.zip

distributionSha256Sum=53b71812f18cdb2777e9f1b2a0f2038683907c90bdc406bc64d8b400e1fb2c3b

mobile/android/app/build.gradle

+2 −2
Original line number Diff line number Diff line
@@ -266,7 +266,7 @@ dependencies { 
    implementation project(path: ':thirdparty')



    testImplementation 'junit:junit:4.12'

    testImplementation 'org.robolectric:robolectric:3.8'

    testImplementation 'org.robolectric:robolectric:4.3'

    testImplementation 'org.simpleframework:simple-http:6.0.1'

    testImplementation 'org.mockito:mockito-core:1.10.19'
@@ -414,7 +414,7 @@ if (gradle.startParameter.taskNames.any { it.endsWith('UnitTest') }) { 
// to generate one report per invocation: https://stackoverflow.com/a/42720235.

// Run two tasks, accepting the cost of duplicate work.

android.applicationVariants.all { variant ->

    def jarTask = tasks["packageAppClasses${variant.name.capitalize()}"]

    def jarTask = tasks["bundle${variant.name.capitalize()}Classes"]

    def bundleJar = jarTask.outputs.files.find({ it.absolutePath.contains('/classes.jar') })



    task("findbugsHtml${variant.name.capitalize()}", type: FindBugs) {

mobile/android/app/src/test/java/com/keepsafe/switchboard/TestSwitchboard.java

+0 −10
Original line number Diff line number Diff line
@@ -126,20 +126,10 @@ public class TestSwitchboard { 
        assertFalse("List of active experiments does not contain inactive-experiment again", SwitchBoard.getActiveExperiments(c).contains("inactive-experiment"));

    }



    @Test

    public void testMatching() {

        final Context c = RuntimeEnvironment.application;

        assertTrue("is-experiment is matching", SwitchBoard.isInExperiment(c, "is-matching"));

        assertFalse("is-not-matching is not matching", SwitchBoard.isInExperiment(c, "is-not-matching"));

    }



    @Test

    public void testNotExisting() {

        final Context c = RuntimeEnvironment.application;

        assertFalse("F0O does not exists", SwitchBoard.isInExperiment(c, "F0O"));

        assertFalse("BaAaz does not exists", SwitchBoard.hasExperimentValues(c, "BaAaz"));

    }







}

mobile/android/app/src/test/java/org/mozilla/gecko/GlobalPageMetadataTest.java

+14 −5
Original line number Diff line number Diff line
@@ -5,10 +5,12 @@ package org.mozilla.gecko; 


import android.content.ContentProvider;

import android.content.ContentProviderClient;

import android.content.ContentResolver;

import android.content.ContentValues;

import android.database.Cursor;

import android.os.RemoteException;



import org.junit.Before;

import org.junit.Test;

import org.junit.runner.RunWith;

import org.mozilla.gecko.background.db.DelegatingTestContentProvider;
@@ -17,20 +19,28 @@ import org.mozilla.gecko.db.BrowserContract.PageMetadata; 
import org.mozilla.gecko.db.BrowserDB;

import org.mozilla.gecko.db.LocalBrowserDB;

import org.robolectric.RobolectricTestRunner;

import org.robolectric.RuntimeEnvironment;

import org.robolectric.shadows.ShadowContentResolver;



import static org.junit.Assert.*;



@RunWith(RobolectricTestRunner.class)

public class GlobalPageMetadataTest {

    ContentResolver contentResolver;



    @Before

    public void setUp() throws Exception {

        contentResolver = RuntimeEnvironment.application.getContentResolver();

    }



    @Test

    public void testQueueing() throws Exception {

        BrowserDB db = new LocalBrowserDB("default");



        final ContentProvider provider = DelegatingTestContentProvider.createDelegatingBrowserProvider();

        try {

            ShadowContentResolver cr = new ShadowContentResolver();

            ContentProviderClient pageMetadataClient = cr.acquireContentProviderClient(PageMetadata.CONTENT_URI);

            ContentProviderClient pageMetadataClient = contentResolver.acquireContentProviderClient(

                    PageMetadata.CONTENT_URI);



            assertEquals(0, GlobalPageMetadata.getInstance().getMetadataQueueSize());
@@ -63,9 +73,8 @@ public class GlobalPageMetadataTest { 


        final ContentProvider provider = DelegatingTestContentProvider.createDelegatingBrowserProvider();

        try {

            ShadowContentResolver cr = new ShadowContentResolver();

            ContentProviderClient historyClient = cr.acquireContentProviderClient(BrowserContract.History.CONTENT_URI);

            ContentProviderClient pageMetadataClient = cr.acquireContentProviderClient(PageMetadata.CONTENT_URI);

            ContentProviderClient historyClient = contentResolver.acquireContentProviderClient(BrowserContract.History.CONTENT_URI);

            ContentProviderClient pageMetadataClient = contentResolver.acquireContentProviderClient(PageMetadata.CONTENT_URI);



            // Insert required history item...

            ContentValues cv = new ContentValues();