Bug 1258769 - Backed out changeset fe11700b6cdf.
authorMichael Comella <michael.l.comella@gmail.com>
Fri, 25 Mar 2016 13:53:58 -0700
changeset 290390 81d754a0681160c34aa9ad4ba9d398d0d149eb7b
parent 290389 28a35458f825099bb18ea5af6dd92d85c660f7b9
child 290391 4a92742ac20d768b4824171b2167aee2900510bd
push id18376
push usermichael.l.comella@gmail.com
push dateFri, 25 Mar 2016 20:55:30 +0000
treeherderfx-team@81d754a06811 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1258769
milestone48.0a1
Bug 1258769 - Backed out changeset fe11700b6cdf. MozReview-Commit-ID: Jxz5RK8o4n4
build.gradle
mobile/android/app/build.gradle
mobile/android/app/checkstyle.xml
mobile/android/gradle/m2repo/gradle/plugin/si/dlabs/gradle/soter/1.0.6/LICENSE
mobile/android/gradle/m2repo/gradle/plugin/si/dlabs/gradle/soter/1.0.6/soter-1.0.6.jar
mobile/android/gradle/m2repo/gradle/plugin/si/dlabs/gradle/soter/1.0.6/soter-1.0.6.pom
--- a/build.gradle
+++ b/build.gradle
@@ -21,31 +21,30 @@ buildDir "${topobjdir}/gradle/build"
 
 buildscript {
     repositories {
         if (gradle.mozconfig.substs.GRADLE_MAVEN_REPOSITORY) {
             maven {
                 url gradle.mozconfig.substs.GRADLE_MAVEN_REPOSITORY
             }
         }
-        // For android-sdk-manager SNAPSHOT releases & soter.
+        // For android-sdk-manager SNAPSHOT releases.
         maven {
             url "file://${gradle.mozconfig.topsrcdir}/mobile/android/gradle/m2repo"
         }
     }
 
     dependencies {
         classpath 'com.android.tools.build:gradle:1.5.0'
         classpath('com.stanfy.spoon:spoon-gradle-plugin:1.0.4') {
             // Without these, we get errors linting.
             exclude module: 'guava'
         }
         // Provided in tree.
         classpath 'com.jakewharton.sdkmanager:gradle-plugin:1.5.0-SNAPSHOT'
-        classpath "gradle.plugin.si.dlabs.gradle:soter:1.0.6"
     }
 }
 
 task generateCodeAndResources(type:Exec) {
     workingDir "${topobjdir}"
 
     commandLine mozconfig.substs.GMAKE
     args '-C'
--- a/mobile/android/app/build.gradle
+++ b/mobile/android/app/build.gradle
@@ -333,31 +333,16 @@ android.applicationVariants.all { varian
     generateAssetsTask.dependsOn syncLibsFromDistDir
     generateAssetsTask.dependsOn syncAssetsFromDistDir
 
     android.sourceSets."${productFlavor}${buildType.capitalize()}".assets.srcDir syncOmnijarFromDistDir.destinationDir
     android.sourceSets."${productFlavor}${buildType.capitalize()}".assets.srcDir syncAssetsFromDistDir.destinationDir
     android.sourceSets."${productFlavor}${buildType.capitalize()}".jniLibs.srcDir syncLibsFromDistDir.destinationDir
 }
 
-apply plugin: 'si.dlabs.soter'
-
-soter {
-    dependencies {
-        checkstyleRules files("checkstyle.xml")
-    }
-
-    checkstyle {
-        enabled true
-        uploadReports false
-        toolVersion "6.7"
-        showViolations true
-    }
-}
-
 apply plugin: 'spoon'
 
 spoon {
     // For now, let's be verbose.
     debug = true
     // It's not helpful to pass when we don't have a device connected.
     failIfNoDeviceConnected = true
 
deleted file mode 100644
--- a/mobile/android/app/checkstyle.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0"?>
-<!-- This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-<!DOCTYPE module PUBLIC
-    "-//Puppy Crawl//DTD Check Configuration 1.2//EN"
-    "http://www.puppycrawl.com/dtds/configuration_1_2.dtd">
-
-<!-- TODO: Clean up code & add checks:
-       - WhitespaceAround
-       - EmptyLineSeparator
-       - NeedBraces
-       - LeftCurly // placement of "{" in new scope or literal
-       - RightCurly // placement of "}" in close scope or literal
-       - Indentation
-       - OneStatementPerLine
-       - OperatorWrap
-       - SeparatorWrap
-       - MultipleVariableDeclarations
-       - FallThrough
-       (I spent too much time already)
-
-     Maybe add:
-       - OneTopLevelClass
-       - OverloadMethodsDeclarationOrder
-       - Empty*Block // better to catch errors!
-       (I spent too much time already)
-
-     See http://checkstyle.sourceforge.net/google_style.html
-     for a good set of defaults.
--->
-
-<module name="Checker">
-    <property name="charset" value="UTF-8"/>
-
-    <!-- TODO: <property name="fileExtensions" value="java, properties, xml"/> -->
-
-    <module name="FileTabCharacter"> <!-- No tabs! -->
-        <property name="eachLine" value="true"/>
-    </module>
-
-    <module name="TreeWalker">
-        <module name="NoLineWrap">
-            <property name="tokens" value="IMPORT,PACKAGE_DEF"/>
-        </module>
-        <module name="OuterTypeFilename"/> <!-- `class Lol` only in Lol.java -->
-    </module>
-
-</module>
deleted file mode 100644
--- a/mobile/android/gradle/m2repo/gradle/plugin/si/dlabs/gradle/soter/1.0.6/LICENSE
+++ /dev/null
@@ -1,21 +0,0 @@
-The MIT License (MIT)
-
-Copyright (c) 2015 D┬ĚLabs
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
deleted file mode 100644
index 7694f4f2035e670e7c133c7284b2c9654158f22a..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
--- a/mobile/android/gradle/m2repo/gradle/plugin/si/dlabs/gradle/soter/1.0.6/soter-1.0.6.pom
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>gradle.plugin.si.dlabs.gradle</groupId>
-  <artifactId>soter</artifactId>
-  <version>1.0.6</version>
-  <dependencies>
-    <dependency>
-      <groupId>si.dlabs</groupId>
-      <artifactId>aws-java-sdk-s3</artifactId>
-      <version>1.9.35</version>
-      <scope>compile</scope>
-      <type>jar</type>
-    </dependency>
-    <dependency>
-      <groupId>com.github.blazsolar.gradle</groupId>
-      <artifactId>gradle-hipchat-plugin</artifactId>
-      <version>0.2.0</version>
-      <scope>compile</scope>
-      <type>jar</type>
-    </dependency>
-    <dependency>
-      <groupId>org.ajoberstar</groupId>
-      <artifactId>grgit</artifactId>
-      <version>1.1.0</version>
-      <scope>compile</scope>
-      <type>jar</type>
-    </dependency>
-    <dependency>
-      <groupId>com.squareup.okhttp</groupId>
-      <artifactId>okhttp</artifactId>
-      <version>2.0.0</version>
-      <scope>compile</scope>
-      <type>jar</type>
-    </dependency>
-    <dependency>
-      <groupId>org.codehaus.jackson</groupId>
-      <artifactId>jackson-mapper-asl</artifactId>
-      <version>1.9.13</version>
-      <scope>runtime</scope>
-      <type>jar</type>
-    </dependency>
-  </dependencies>
-</project>