Update dependency versions

This change also makes the build properly self-contained, and attempts to separate the dependencies that are due to Firebase from the dependencies of the Android google-services gradle plugin.
DBOI7453 · Aug 22, 2018 · fc68a6e · fc68a6e
1 parent b7ccbed
commit fc68a6e
Show file tree

Hide file tree

Showing 138 changed files with 19,403 additions and 37 deletions.
diff --git a/Android/app/build.gradle b/Android/app/build.gradle
@@ -42,8 +42,8 @@ repositories {
 dependencies {
     // Third-party dependency: OkHttp3
     implementation fileTree(include: [
-            'okhttp-3.9.1.jar',
-            'okio-1.13.0.jar',
+            'okhttp-3.11.0.jar',
+            'okio-1.15.0.jar',
             'guava-26.0-android.jar'
     ], dir: 'libs')
 
@@ -61,9 +61,9 @@ dependencies {
     implementation 'androidx.constraintlayout:constraintlayout:1.1.2'
 
     // For Firebase Analytics, etc.
-    implementation 'com.google.firebase:firebase-core:11.8.0'
-    implementation 'com.google.firebase:firebase-perf:11.8.0'
-    implementation 'com.google.firebase:firebase-crash:11.8.0'
+    implementation 'com.google.firebase:firebase-core:16.0.1'
+    implementation 'com.google.firebase:firebase-perf:16.1.0'
+    implementation 'com.google.firebase:firebase-crash:16.0.1'
 }
 // For Firebase Analytics
 apply plugin: 'com.google.gms.google-services'

diff --git a/Android/app/libs/okhttp-3.11.0.jar b/Android/app/libs/okhttp-3.11.0.jar
diff --git a/Android/app/libs/okhttp-3.9.1.jar b/Android/app/libs/okhttp-3.9.1.jar
diff --git a/Android/app/libs/okio-1.13.0.jar b/Android/app/libs/okio-1.13.0.jar
diff --git a/Android/app/libs/okio-1.15.0.jar b/Android/app/libs/okio-1.15.0.jar
diff --git a/Android/app/src/main/res/layout/main_content.xml b/Android/app/src/main/res/layout/main_content.xml
@@ -67,7 +67,7 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/dns_switch"
-        tools:text="@string/vpn_active"/>
+        tools:text="@string/vpn_explanation"/>
 
     <app.intra.util.HistoryGraph
         android:id="@+id/graph"

diff --git a/Android/build.gradle b/Android/build.gradle
@@ -13,16 +13,16 @@ buildscript {
         maven {
             url 'firebase-repo'
         }
-        // However, miscellaneous remaining build-setup dependencies (especially transitive
-        // dependencies of com.android.tools.build:gradle) are still only available at jcenter
-        // and are not mirrored.
-        jcenter()
+        // The gradle plugin also has dependencies that are not in the Google repository.
+        maven {
+            url 'gradle-plugin-repo'
+        }
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:3.2.0-beta05'
 
         // For Firebase Analytics
-        classpath 'com.google.gms:google-services:3.1.2'
+        classpath 'com.google.gms:google-services:4.1.0'
         classpath 'com.google.firebase:firebase-plugins:1.1.5'
     }
 }

diff --git a/Android/firebase-repo/com/google/gms/google-services/3.1.2/google-services-3.1.2.jar b/Android/firebase-repo/com/google/gms/google-services/3.1.2/google-services-3.1.2.jar
diff --git a/Android/firebase-repo/com/google/gms/google-services/3.1.2/google-services-3.1.2.pom b/Android/firebase-repo/com/google/gms/google-services/3.1.2/google-services-3.1.2.pom
diff --git a/Android/gradle-plugin-repo/com/google/auto/auto-parent/3/auto-parent-3.pom b/Android/gradle-plugin-repo/com/google/auto/auto-parent/3/auto-parent-3.pom
@@ -0,0 +1,125 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Copyright (C) 2013 Google, Inc.
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+<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/maven-v4_0_0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+
+  <parent>
+    <groupId>org.sonatype.oss</groupId>
+    <artifactId>oss-parent</artifactId>
+    <version>7</version>
+  </parent>
+
+  <groupId>com.google.auto</groupId>
+  <artifactId>auto-parent</artifactId>
+  <packaging>pom</packaging>
+  <version>3</version>
+  <name>Auto (Parent)</name>
+  <description>A collection of code generators for Java.</description>
+  <url>https://github.com/google/auto</url>
+
+  <properties>
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    <java.version>1.6</java.version>
+  </properties>
+
+  <scm>
+    <url>http://github.com/google/auto</url>
+    <connection>scm:git:git://github.com/google/auto.git</connection>
+    <developerConnection>scm:git:ssh://[email protected]/google/auto.git</developerConnection>
+    <tag>HEAD</tag>
+  </scm>
+
+  <issueManagement>
+    <system>GitHub Issues</system>
+    <url>http://github.com/google/auto/issues</url>
+  </issueManagement>
+
+  <licenses>
+    <license>
+      <name>Apache 2.0</name>
+      <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+    </license>
+  </licenses>
+
+  <organization>
+    <name>Google, Inc.</name>
+    <url>http://www.google.com</url>
+  </organization>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <version>3.1</version>
+        <configuration>
+          <source>${java.version}</source>
+          <target>${java.version}</target>
+          <compilerArgument>-Xlint:all</compilerArgument>
+          <showWarnings>true</showWarnings>
+          <showDeprecation>true</showDeprecation>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-checkstyle-plugin</artifactId>
+        <version>2.11</version>
+        <configuration>
+          <consoleOutput>true</consoleOutput>
+          <configLocation>checkstyle.xml</configLocation>
+          <failOnViolation>false</failOnViolation>
+        </configuration>
+      </plugin>
+    </plugins>
+    <pluginManagement>
+      <plugins>
+        <plugin>
+          <artifactId>maven-invoker-plugin</artifactId>
+          <version>1.8</version>
+        </plugin>
+      </plugins>
+    </pluginManagement>
+  </build>
+
+  <profiles>
+    <profile>
+      <id>default-profile</id>
+      <activation>
+        <activeByDefault>true</activeByDefault>
+        <file>
+          <exists>${java.home}/../lib/tools.jar</exists>
+        </file>
+      </activation>
+      <properties>
+        <toolsjar>${java.home}/../lib/tools.jar</toolsjar>
+      </properties>
+    </profile>
+    <profile>
+      <id>mac-profile</id>
+      <activation>
+        <activeByDefault>false</activeByDefault>
+        <file>
+          <exists>${java.home}/../Classes/classes.jar</exists>
+        </file>
+      </activation>
+      <properties>
+        <toolsjar>${java.home}/../Classes/classes.jar</toolsjar>
+      </properties>
+    </profile>
+  </profiles>
+</project>
diff --git a/Android/gradle-plugin-repo/com/google/auto/value/auto-value/1.5.2/auto-value-1.5.2.jar b/Android/gradle-plugin-repo/com/google/auto/value/auto-value/1.5.2/auto-value-1.5.2.jar
diff --git a/Android/gradle-plugin-repo/com/google/auto/value/auto-value/1.5.2/auto-value-1.5.2.pom b/Android/gradle-plugin-repo/com/google/auto/value/auto-value/1.5.2/auto-value-1.5.2.pom
@@ -0,0 +1,175 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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/maven-v4_0_0.xsd">
+  <parent>
+    <artifactId>auto-parent</artifactId>
+    <groupId>com.google.auto</groupId>
+    <version>3</version>
+  </parent>
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>com.google.auto.value</groupId>
+  <artifactId>auto-value</artifactId>
+  <name>AutoValue</name>
+  <version>1.5.2</version>
+  <description>Immutable value-type code generation for Java 1.6+.</description>
+  <scm>
+    <connection>scm:git:git://github.com/google/auto.git</connection>
+    <developerConnection>scm:git:ssh://[email protected]/google/auto.git</developerConnection>
+    <url>http://github.com/google/auto</url>
+  </scm>
+  <build>
+    <resources>
+      <resource>
+        <directory>src/main/java</directory>
+      </resource>
+    </resources>
+    <plugins>
+      <plugin>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <version>3.1</version>
+        <configuration>
+          <source>1.8</source>
+          <target>1.8</target>
+        </configuration>
+      </plugin>
+      <plugin>
+        <artifactId>maven-jar-plugin</artifactId>
+        <version>2.6</version>
+      </plugin>
+      <plugin>
+        <artifactId>maven-invoker-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>integration-test</id>
+            <goals>
+              <goal>install</goal>
+              <goal>run</goal>
+            </goals>
+          </execution>
+        </executions>
+        <configuration>
+          <addTestClassPath>true</addTestClassPath>
+          <cloneProjectsTo>${project.build.directory}/it</cloneProjectsTo>
+          <filterProperties>
+            <auto.version>${project.version}</auto.version>
+          </filterProperties>
+          <pomIncludes>
+            <pomInclude>*/pom.xml</pomInclude>
+          </pomIncludes>
+          <streamLogs>true</streamLogs>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.immutables.tools</groupId>
+        <artifactId>maven-shade-plugin</artifactId>
+        <version>4</version>
+        <executions>
+          <execution>
+            <phase>package</phase>
+            <goals>
+              <goal>shade</goal>
+            </goals>
+            <configuration>
+              <minimizeJar>true</minimizeJar>
+              <artifactSet>
+                <excludes>
+                  <exclude>com.google.code.findbugs:jsr305</exclude>
+                </excludes>
+              </artifactSet>
+              <relocations>
+                <relocation>
+                  <pattern>org.objectweb</pattern>
+                  <shadedPattern>autovalue.shaded.org.objectweb$</shadedPattern>
+                </relocation>
+                <relocation>
+                  <pattern>com.google</pattern>
+                  <shadedPattern>autovalue.shaded.com.google$</shadedPattern>
+                  <excludes>
+                    <exclude>com.google.auto.value.**</exclude>
+                  </excludes>
+                </relocation>
+                <relocation>
+                  <pattern>com.squareup.javapoet</pattern>
+                  <shadedPattern>autovalue.shaded.com.squareup.javapoet$</shadedPattern>
+                </relocation>
+              </relocations>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
+  <profiles>
+    <profile>
+      <id>disable-java8-doclint</id>
+      <properties>
+        <additionalparam>-Xdoclint:none</additionalparam>
+      </properties>
+    </profile>
+  </profiles>
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.velocity</groupId>
+      <artifactId>velocity</artifactId>
+      <version>1.7</version>
+      <scope>test</scope>
+      <exclusions>
+        <exclusion>
+          <artifactId>commons-collections</artifactId>
+          <groupId>commons-collections</groupId>
+        </exclusion>
+        <exclusion>
+          <artifactId>commons-lang</artifactId>
+          <groupId>commons-lang</groupId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>com.google.guava</groupId>
+      <artifactId>guava-testlib</artifactId>
+      <version>23.0</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>4.12</version>
+      <scope>test</scope>
+      <exclusions>
+        <exclusion>
+          <artifactId>hamcrest-core</artifactId>
+          <groupId>org.hamcrest</groupId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>com.google.truth</groupId>
+      <artifactId>truth</artifactId>
+      <version>0.34</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.google.testing.compile</groupId>
+      <artifactId>compile-testing</artifactId>
+      <version>0.11</version>
+      <scope>test</scope>
+      <exclusions>
+        <exclusion>
+          <artifactId>truth-java8-extension</artifactId>
+          <groupId>com.google.truth.extensions</groupId>
+        </exclusion>
+        <exclusion>
+          <artifactId>tools</artifactId>
+          <groupId>com.sun</groupId>
+        </exclusion>
+        <exclusion>
+          <artifactId>auto-value</artifactId>
+          <groupId>com.google.auto.value</groupId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+  </dependencies>
+  <properties>
+    <guava.version>23.0</guava.version>
+  </properties>
+</project>
+
diff --git a/Android/gradle-plugin-repo/com/google/code/findbugs/jsr305/1.3.9/jsr305-1.3.9.jar b/Android/gradle-plugin-repo/com/google/code/findbugs/jsr305/1.3.9/jsr305-1.3.9.jar