Bug 1514374 - Remove workaround for accessibility-test-framework. r=nalexander,geckoview-reviewers,snorp
authorAgi Sferro <agi@mozilla.com>
Wed, 20 Feb 2019 17:44:23 +0000
changeset 460150 fa8d440c53823bc18834429c8978814d984e5fe2
parent 460134 65ed5c9d6bd83928ec4da046ecd6172c3f071fdf
child 460151 4e46fb46408db09e84480b37287230413d312422
push id112059
push useropoprus@mozilla.com
push dateThu, 21 Feb 2019 09:45:58 +0000
treeherdermozilla-inbound@9d2f9b494284 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersnalexander, geckoview-reviewers, snorp
bugs1514374
milestone67.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1514374 - Remove workaround for accessibility-test-framework. r=nalexander,geckoview-reviewers,snorp Looks like accessibility-test-framework was added to maven central so we can remove this. Differential Revision: https://phabricator.services.mozilla.com/D20365
build.gradle
mobile/android/gradle/m2repo/com/google/android/apps/common/testing/accessibility/framework/accessibility-test-framework/2.1/accessibility-test-framework-2.1.jar
mobile/android/gradle/m2repo/com/google/android/apps/common/testing/accessibility/framework/accessibility-test-framework/2.1/accessibility-test-framework-2.1.pom
--- a/build.gradle
+++ b/build.gradle
@@ -27,23 +27,16 @@ allprojects {
     }
 
     repositories {
         gradle.mozconfig.substs.GRADLE_MAVEN_REPOSITORIES.each { repository ->
             maven {
                 url repository
             }
         }
-        // For in tree dependencies.
-        // TODO: remove this once
-        // https://issuetracker.google.com/issues/120951637 is resolved. See
-        // also Bug 1514374.
-        maven {
-            url "file://${gradle.mozconfig.topsrcdir}/mobile/android/gradle/m2repo"
-        }
     }
 
     task downloadDependencies() {
         description 'Download all dependencies to the Gradle cache'
         doLast {
             configurations.each { configuration ->
                 if (configuration.canBeResolved) {
                     configuration.allDependencies.each { dependency ->
deleted file mode 100644
index 1cd83a3dbaba7fb476e6677e3494681cb3de2f4c..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
--- a/mobile/android/gradle/m2repo/com/google/android/apps/common/testing/accessibility/framework/accessibility-test-framework/2.1/accessibility-test-framework-2.1.pom
+++ /dev/null
@@ -1,165 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" 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">
-  <modelVersion>4.0.0</modelVersion>
-
-  <groupId>com.google.android.apps.common.testing.accessibility.framework</groupId>
-  <artifactId>accessibility-test-framework</artifactId>
-  <version>2.1</version>
-  <packaging>jar</packaging>
-
-  <name>Accessibility Test Framework</name>
-  <description>Library used to test for common accessibility issues.</description>
-  <url>https://github.com/google/Accessibility-Test-Framework-for-Android</url>
-
-  <licenses>
-    <license>
-      <name>Apache License, Version 2.0</name>
-      <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-      <distribution>repo</distribution>
-    </license>
-  </licenses>
-
-  <developers>
-    <developer>
-      <name>Phil Weaver</name>
-      <email>pweaver@google.com</email>
-      <organization>Google, Inc</organization>
-      <organizationUrl>http://www.google.com</organizationUrl>
-    </developer>
-    <developer>
-      <name>Casey Burkhardt</name>
-      <email>caseyburkhardt@google.com</email>
-      <organization>Google, Inc</organization>
-      <organizationUrl>http://www.google.com</organizationUrl>
-    </developer>
-    <developer>
-      <name>Samuel Rush</name>
-      <email>sjrush@google.com</email>
-      <organization>Google, Inc</organization>
-      <organizationUrl>http://www.google.com</organizationUrl>
-    </developer>
-  </developers>
-
-  <scm>
-    <connection>scm:git:git@github.com:google/Accessibility-Test-Framework-for-Android.git</connection>
-    <developerConnection>scm:git:git@github.com:google/Accessibility-Test-Framework-for-Android.git</developerConnection>
-    <url>https://github.com/google/Accessibility-Test-Framework-for-Android</url>
-  </scm>
-
-  <dependencies>
-    <dependency>
-      <groupId>android.support</groupId>
-      <artifactId>compatibility-v4</artifactId>
-      <version>23.0.1</version>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>android</groupId>
-      <artifactId>android</artifactId>
-      <version>5.1.1_r2</version>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.hamcrest</groupId>
-      <artifactId>hamcrest-core</artifactId>
-      <version>1.3</version>
-    </dependency>
-    <dependency>
-      <groupId>org.hamcrest</groupId>
-      <artifactId>hamcrest-library</artifactId>
-      <version>1.3</version>
-    </dependency>
-    <dependency>
-      <groupId>com.google.protobuf</groupId>
-      <artifactId>protobuf-java</artifactId>
-      <version>2.6.1</version>
-    </dependency>
-  </dependencies>
-
-  <build>
-    <finalName>${project.artifactId}</finalName>
-    <sourceDirectory>src</sourceDirectory>
-    <pluginManagement>
-     <plugins>
-      <plugin>
-       <groupId>com.jayway.maven.plugins.android.generation2</groupId>
-       <artifactId>android-maven-plugin</artifactId>
-       <version>3.1.1</version>
-       <extensions>true</extensions>
-      </plugin>
-     </plugins>
-    </pluginManagement>
-    <plugins>
-     <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <version>3.3</version>
-        <configuration>
-          <source>1.7</source>
-          <target>1.7</target>
-        </configuration>
-      </plugin>
-     <plugin>
-      <groupId>com.jayway.maven.plugins.android.generation2</groupId>
-      <artifactId>android-maven-plugin</artifactId>
-      <configuration>
-       <sdk>
-        <platform>21</platform>
-       </sdk>
-      </configuration>
-     </plugin>
-     <plugin>
-      <groupId>org.apache.maven.plugins</groupId>
-      <artifactId>maven-source-plugin</artifactId>
-      <version>2.4</version>
-      <executions>
-       <execution>
-        <id>attach-sources</id>
-        <goals>
-         <goal>jar</goal>
-        </goals>
-        </execution>
-       </executions>
-     </plugin>
-     <plugin>
-      <groupId>org.apache.maven.plugins</groupId>
-      <artifactId>maven-javadoc-plugin</artifactId>
-      <version>2.10.3</version>
-      <configuration>
-       <sourcepath>src</sourcepath>
-       <additionalparam>-Xdoclint:none</additionalparam>
-      </configuration>
-      <executions>
-       <execution>
-        <id>attach-javadocs</id>
-        <goals>
-         <goal>jar</goal>
-        </goals>
-       </execution>
-      </executions>
-     </plugin>
-     <plugin>
-      <groupId>com.github.os72</groupId>
-      <artifactId>protoc-jar-maven-plugin</artifactId>
-      <version>3.0.0-a3</version>
-      <executions>
-       <execution>
-        <phase>generate-sources</phase>
-        <goals>
-         <goal>run</goal>
-        </goals>
-        <configuration>
-         <protocVersion>2.4.1</protocVersion>
-         <includeDirectories>
-          <include>src/main</include>
-         </includeDirectories>
-         <inputDirectories>
-          <include>src/main/java/com/google/android/apps/common/testing/accessibility/framework/proto</include>
-         </inputDirectories>
-        </configuration>
-       </execution>
-      </executions>
-     </plugin>
-    </plugins>
-   </build>
-</project>