Commit 508e50ac authored by Dorel Luca's avatar Dorel Luca
Browse files

Backed out 6 changesets (bug 1509572) for linting failure. CLOSED TREE 

Backed out changeset 9f6a7e664cef (bug 1509572)
Backed out changeset f6653c7d2967 (bug 1509572)
Backed out changeset 122d6f1a1136 (bug 1509572)
Backed out changeset bc6911d14ae0 (bug 1509572)
Backed out changeset bd0729ff0bbc (bug 1509572)
Backed out changeset c4087e8ea340 (bug 1509572)
parent b84f24cf

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-4.4-all.zip

distributionSha256Sum=7a2c66d1a78f811d5f37d14630ad21cec5e77a2a4dc61e787e2257a6341016ce

mobile/android/annotations/src/main/java/org/mozilla/gecko/annotationProcessors/AnnotationProcessor.java

+15 −0
Original line number Diff line number Diff line
@@ -170,6 +170,21 @@ public class AnnotationProcessor { 
    private static int writeOutputFile(final String name, final StringBuilder content) {

        final byte[] contentBytes = content.toString().getBytes(StandardCharsets.UTF_8);



        try {

            final byte[] existingBytes = Files.readAllBytes(new File(name).toPath());

            if (Arrays.equals(contentBytes, existingBytes)) {

                return 0;

            }

        } catch (FileNotFoundException e) {

            // Pass.

        } catch (NoSuchFileException e) {

            // Pass.

        } catch (IOException e) {

            System.err.println("Unable to read " + name + ". Perhaps a permissions issue?");

            e.printStackTrace(System.err);

            return 1;

        }



        try (FileOutputStream outStream = new FileOutputStream(name)) {

            outStream.write(contentBytes);

        } catch (IOException e) {

mobile/android/annotations/src/main/java/org/mozilla/gecko/annotationProcessors/SDKProcessor.java

+2 −2
Original line number Diff line number Diff line
@@ -226,8 +226,8 @@ public class SDKProcessor { 


    public static void main(String[] args) throws Exception {

        // We expect a list of jars on the commandline. If missing, whinge about it.

        if (args.length < 3 || args.length % 2 != 1) {

            System.err.println("Usage: java SDKProcessor sdkjar max-sdk-version outdir [configfile fileprefix]*");

        if (args.length < 5 || args.length % 2 != 1) {

            System.err.println("Usage: java SDKProcessor sdkjar max-sdk-version outdir [configfile fileprefix]+");

            System.exit(1);

        }

mobile/android/app/build.gradle

+26 −2
Original line number Diff line number Diff line
@@ -411,7 +411,7 @@ android.applicationVariants.all { variant -> 
        classpath = variant.javaCompile.classpath



        excludeFilter = file("findbugs-exclude.xml")

        dependsOn "bundleAppClasses${variant.name.capitalize()}"

        dependsOn "assemble${variant.name.capitalize()}"



        reports {

            html.enabled = true // HTML reports for humans.
@@ -435,7 +435,7 @@ android.applicationVariants.all { variant -> 
        classpath = variant.javaCompile.classpath



        excludeFilter = file("findbugs-exclude.xml")

        dependsOn "bundleAppClasses${variant.name.capitalize()}"

        dependsOn "assemble${variant.name.capitalize()}"



        reports {

            xml.enabled = true // XML reports for machines.
@@ -497,6 +497,30 @@ android.applicationVariants.all { variant -> 
    }

}



android.applicationVariants.all { variant ->

    def processResourcesTask = tasks["process${variant.name.capitalize()}Resources"]

    def assembleTask = tasks["assemble${variant.name.capitalize()}"]



    def dumpTask = task("dump${variant.name.capitalize()}RTxt", type: Copy) {

        from "${project.buildDir}/intermediates/symbols"

        into "${project.buildDir}/R/symbols-${System.env.AB_CD}"

        include "**/R.txt"



        includeEmptyDirs = false



        // Force task to run.

        outputs.upToDateWhen { false }



        rename { filename ->

            filename.replace 'R.txt', "R-${new Date().format('yyyyMMddHHmmssSSS')}.txt"

        }



        dependsOn processResourcesTask

    }



    assembleTask.dependsOn dumpTask

}



// Bug 1415298: make Robolectric find assets.  Fix adapted from

// https://github.com/robolectric/robolectric/issues/2647.

android.applicationVariants.all { variant ->

mobile/android/geckoview/build.gradle

+2 −5
Original line number Diff line number Diff line
@@ -380,12 +380,9 @@ task("generateSDKBindings", type: JavaExec) { 


    // Configure the arguments at evaluation-time, not at configuration-time.

    doFirst {

        // From -Pgenerate_sdk_bindings_args=... on command line; missing in

        // `android-gradle-dependencies` toolchain task.

        if (project.hasProperty('generate_sdk_bindings_args')) {

        // From -Pgenerate_sdk_bindings_args=... on command line.

        args project.generate_sdk_bindings_args.split(':')

    }

    }



    workingDir "${topsrcdir}/widget/android/bindings"