Integrate Latest @ 166136277

jonsimantov · jonsimantov · commit bf171a2c0209 · 2017-08-22T17:08:01.000-07:00
Changes to all ...
- Update build files to ignore Proguard warnings and add Maven repo.

CL: 166136277
diff --git a/admob/testapp/build.gradle b/admob/testapp/build.gradle
@@ -2,6 +2,7 @@
 buildscript {
   repositories {
     mavenLocal()
+    maven { url 'https://maven.google.com'  }
     jcenter()
   }
   dependencies {
@@ -13,6 +14,7 @@ buildscript {
 allprojects {
   repositories {
     mavenLocal()
+    maven { url 'https://maven.google.com'  }
     jcenter()
   }
 }
@@ -83,6 +85,7 @@ android {
             proguardFile getDefaultProguardFile('proguard-android.txt')
             proguardFile file(project.ext.firebase_cpp_sdk_dir + "/libs/android/app.pro")
             proguardFile file(project.ext.firebase_cpp_sdk_dir + "/libs/android/admob.pro")
+            proguardFile file('proguard.pro')
       }
     }
 }
diff --git a/admob/testapp/proguard.pro b/admob/testapp/proguard.pro
@@ -0,0 +1,2 @@
+-ignorewarnings
+-keep,includedescriptorclasses public class com.google.firebase.example.LoggingUtils { *; }
diff --git a/analytics/testapp/build.gradle b/analytics/testapp/build.gradle
@@ -2,6 +2,7 @@
 buildscript {
   repositories {
     mavenLocal()
+    maven { url 'https://maven.google.com'  }
     jcenter()
   }
   dependencies {
@@ -13,6 +14,7 @@ buildscript {
 allprojects {
   repositories {
     mavenLocal()
+    maven { url 'https://maven.google.com'  }
     jcenter()
   }
 }
diff --git a/analytics/testapp/proguard.pro b/analytics/testapp/proguard.pro
@@ -1 +1,2 @@
+-ignorewarnings
 -keep,includedescriptorclasses public class com.google.firebase.example.LoggingUtils { *; }
diff --git a/auth/testapp/build.gradle b/auth/testapp/build.gradle
@@ -2,6 +2,7 @@
 buildscript {
   repositories {
     mavenLocal()
+    maven { url 'https://maven.google.com'  }
     jcenter()
   }
   dependencies {
@@ -13,6 +14,7 @@ buildscript {
 allprojects {
   repositories {
     mavenLocal()
+    maven { url 'https://maven.google.com'  }
     jcenter()
   }
 }
diff --git a/auth/testapp/proguard.pro b/auth/testapp/proguard.pro
@@ -1,2 +1,3 @@
+-ignorewarnings
 -keep,includedescriptorclasses public class com.google.firebase.example.LoggingUtils { *; }
 -keep,includedescriptorclasses public class com.google.firebase.example.TextEntryField { *; }
diff --git a/database/testapp/build.gradle b/database/testapp/build.gradle
@@ -2,6 +2,7 @@
 buildscript {
   repositories {
     mavenLocal()
+    maven { url 'https://maven.google.com'  }
     jcenter()
   }
   dependencies {
@@ -13,6 +14,7 @@ buildscript {
 allprojects {
   repositories {
     mavenLocal()
+    maven { url 'https://maven.google.com'  }
     jcenter()
   }
 }
diff --git a/database/testapp/proguard.pro b/database/testapp/proguard.pro
@@ -1 +1,2 @@
+-ignorewarnings
 -keep,includedescriptorclasses public class com.google.firebase.example.LoggingUtils { *; }
diff --git a/dynamic_links/testapp/build.gradle b/dynamic_links/testapp/build.gradle
@@ -2,6 +2,7 @@
 buildscript {
   repositories {
     mavenLocal()
+    maven { url 'https://maven.google.com'  }
     jcenter()
   }
   dependencies {
@@ -13,6 +14,7 @@ buildscript {
 allprojects {
   repositories {
     mavenLocal()
+    maven { url 'https://maven.google.com'  }
     jcenter()
   }
 }
diff --git a/dynamic_links/testapp/proguard.pro b/dynamic_links/testapp/proguard.pro
@@ -1 +1,2 @@
+-ignorewarnings
 -keep,includedescriptorclasses public class com.google.firebase.example.LoggingUtils { *; }
diff --git a/invites/testapp/build.gradle b/invites/testapp/build.gradle
@@ -2,6 +2,7 @@
 buildscript {
   repositories {
     mavenLocal()
+    maven { url 'https://maven.google.com'  }
     jcenter()
   }
   dependencies {
@@ -13,6 +14,7 @@ buildscript {
 allprojects {
   repositories {
     mavenLocal()
+    maven { url 'https://maven.google.com'  }
     jcenter()
   }
 }
diff --git a/invites/testapp/proguard.pro b/invites/testapp/proguard.pro
@@ -1 +1,2 @@
+-ignorewarnings
 -keep,includedescriptorclasses public class com.google.firebase.example.LoggingUtils { *; }
diff --git a/messaging/testapp/build.gradle b/messaging/testapp/build.gradle
@@ -2,6 +2,7 @@
 buildscript {
   repositories {
     mavenLocal()
+    maven { url 'https://maven.google.com'  }
     jcenter()
   }
   dependencies {
@@ -13,6 +14,7 @@ buildscript {
 allprojects {
   repositories {
     mavenLocal()
+    maven { url 'https://maven.google.com'  }
     jcenter()
   }
 }
diff --git a/messaging/testapp/proguard.pro b/messaging/testapp/proguard.pro
@@ -1 +1,2 @@
+-ignorewarnings
 -keep,includedescriptorclasses public class com.google.firebase.example.LoggingUtils { *; }
diff --git a/remote_config/testapp/build.gradle b/remote_config/testapp/build.gradle
@@ -2,6 +2,7 @@
 buildscript {
   repositories {
     mavenLocal()
+    maven { url 'https://maven.google.com'  }
     jcenter()
   }
   dependencies {
@@ -13,6 +14,7 @@ buildscript {
 allprojects {
   repositories {
     mavenLocal()
+    maven { url 'https://maven.google.com'  }
     jcenter()
   }
 }
diff --git a/remote_config/testapp/proguard.pro b/remote_config/testapp/proguard.pro
@@ -1 +1,2 @@
+-ignorewarnings
 -keep,includedescriptorclasses public class com.google.firebase.example.LoggingUtils { *; }
diff --git a/storage/testapp/build.gradle b/storage/testapp/build.gradle
@@ -2,6 +2,7 @@
 buildscript {
   repositories {
     mavenLocal()
+    maven { url 'https://maven.google.com'  }
     jcenter()
   }
   dependencies {
@@ -13,6 +14,7 @@ buildscript {
 allprojects {
   repositories {
     mavenLocal()
+    maven { url 'https://maven.google.com'  }
     jcenter()
   }
 }
diff --git a/storage/testapp/proguard.pro b/storage/testapp/proguard.pro
@@ -1 +1,2 @@
--keep,includedescriptorclasses public class com.google.firebase.example.LoggingUtils { *; }
+-ignorewarnings
+-keep,includedescriptorclasses public class com.google.firebase.example.LoggingUtils { * ; }

Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,7 @@`
`2`	`2`	`buildscript {`
`3`	`3`	`repositories {`
`4`	`4`	`mavenLocal()`
	`5`	`+ maven { url 'https://maven.google.com' }`
`5`	`6`	`jcenter()`
`6`	`7`	`}`
`7`	`8`	`dependencies {`
`@@ -13,6 +14,7 @@ buildscript {`
`13`	`14`	`allprojects {`
`14`	`15`	`repositories {`
`15`	`16`	`mavenLocal()`
	`17`	`+ maven { url 'https://maven.google.com' }`
`16`	`18`	`jcenter()`
`17`	`19`	`}`
`18`	`20`	`}`
`@@ -83,6 +85,7 @@ android {`
`83`	`85`	`proguardFile getDefaultProguardFile('proguard-android.txt')`
`84`	`86`	`proguardFile file(project.ext.firebase_cpp_sdk_dir + "/libs/android/app.pro")`
`85`	`87`	`proguardFile file(project.ext.firebase_cpp_sdk_dir + "/libs/android/admob.pro")`
	`88`	`+ proguardFile file('proguard.pro')`
`86`	`89`	`}`
`87`	`90`	`}`
`88`	`91`	`}`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+-ignorewarnings`
	`2`	`+-keep,includedescriptorclasses public class com.google.firebase.example.LoggingUtils { *; }`
Original file line number	Diff line number	Diff line change
`@@ -1 +1,2 @@`
	`1`	`+-ignorewarnings`
`1`	`2`	`-keep,includedescriptorclasses public class com.google.firebase.example.LoggingUtils { *; }`
Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,3 @@`
	`1`	`+-ignorewarnings`
`1`	`2`	`-keep,includedescriptorclasses public class com.google.firebase.example.LoggingUtils { *; }`
`2`	`3`	`-keep,includedescriptorclasses public class com.google.firebase.example.TextEntryField { *; }`
Original file line number	Diff line number	Diff line change
`@@ -1 +1,2 @@`
`1`		`--keep,includedescriptorclasses public class com.google.firebase.example.LoggingUtils { *; }`
	`1`	`+-ignorewarnings`
	`2`	`+-keep,includedescriptorclasses public class com.google.firebase.example.LoggingUtils { * ; }`