Fix build error and add coroutines fix and lint ignore.

jonsimantov · jonsimantov · commit 85cd69aec9d1 · 2024-05-22T11:22:46.000-07:00
diff --git a/admob/testapp/build.gradle b/admob/testapp/build.gradle
@@ -55,6 +55,12 @@ android {
       proguardFile file('proguard.pro')
     }
   }
+  packagingOptions {
+    pickFirst 'META-INF/**/coroutines.pro'
+  }
+  lintOptions {
+      abortOnError false
+  }
 }
 
 apply from: "$gradle.firebase_cpp_sdk_dir/Android/firebase_dependencies.gradle"
diff --git a/analytics/testapp/build.gradle b/analytics/testapp/build.gradle
@@ -59,6 +59,12 @@ android {
       proguardFile file('proguard.pro')
     }
   }
+  packagingOptions {
+    pickFirst 'META-INF/**/coroutines.pro'
+  }
+  lintOptions {
+      abortOnError false
+  }
 }
 
 apply from: "$gradle.firebase_cpp_sdk_dir/Android/firebase_dependencies.gradle"
diff --git a/auth/testapp/build.gradle b/auth/testapp/build.gradle
@@ -60,6 +60,12 @@ android {
       proguardFile file('proguard.pro')
     }
   }
+  packagingOptions {
+    pickFirst 'META-INF/**/coroutines.pro'
+  }
+  lintOptions {
+    abortOnError false
+  }
 }
 
 apply from: "$gradle.firebase_cpp_sdk_dir/Android/firebase_dependencies.gradle"
diff --git a/auth/testapp/src/common_main.cc b/auth/testapp/src/common_main.cc
@@ -647,7 +647,7 @@ extern "C" int common_main(int argc, const char* argv[]) {
                             kAuthErrorNone, auth);
         if (phone_future.error() == kAuthErrorNone) {
           User user = *phone_future.result();
-          Future<AuthResult> update_future =
+          Future<User> update_future =
               user.UpdatePhoneNumberCredential(phone_credential);
           WaitForSignInFuture(
               update_future,
diff --git a/database/testapp/build.gradle b/database/testapp/build.gradle
@@ -59,6 +59,12 @@ android {
       proguardFile file('proguard.pro')
     }
   }
+  packagingOptions {
+    pickFirst 'META-INF/**/coroutines.pro'
+  }
+  lintOptions {
+      abortOnError false
+  }
 }
 
 apply from: "$gradle.firebase_cpp_sdk_dir/Android/firebase_dependencies.gradle"
diff --git a/dynamic_links/testapp/build.gradle b/dynamic_links/testapp/build.gradle
@@ -59,6 +59,12 @@ android {
       proguardFile file('proguard.pro')
     }
   }
+  packagingOptions {
+    pickFirst 'META-INF/**/coroutines.pro'
+  }
+  lintOptions {
+      abortOnError false
+  }
 }
 
 apply from: "$gradle.firebase_cpp_sdk_dir/Android/firebase_dependencies.gradle"
diff --git a/firestore/testapp/build.gradle b/firestore/testapp/build.gradle
@@ -60,6 +60,12 @@ android {
       proguardFile file('proguard.pro')
     }
   }
+  packagingOptions {
+    pickFirst 'META-INF/**/coroutines.pro'
+  }
+  lintOptions {
+      abortOnError false
+  }
 }
 
 apply from: "$gradle.firebase_cpp_sdk_dir/Android/firebase_dependencies.gradle"
diff --git a/functions/testapp/build.gradle b/functions/testapp/build.gradle
@@ -59,6 +59,12 @@ android {
       proguardFile file('proguard.pro')
     }
   }
+  packagingOptions {
+    pickFirst 'META-INF/**/coroutines.pro'
+  }
+  lintOptions {
+      abortOnError false
+  }
 }
 
 apply from: "$gradle.firebase_cpp_sdk_dir/Android/firebase_dependencies.gradle"
diff --git a/gma/testapp/build.gradle b/gma/testapp/build.gradle
@@ -60,6 +60,12 @@ android {
       proguardFile file('proguard.pro')
     }
   }
+  packagingOptions {
+    pickFirst 'META-INF/**/coroutines.pro'
+  }
+  lintOptions {
+      abortOnError false
+  }
 }
 
 apply from: "$gradle.firebase_cpp_sdk_dir/Android/firebase_dependencies.gradle"
diff --git a/messaging/testapp/build.gradle b/messaging/testapp/build.gradle
@@ -59,6 +59,12 @@ android {
       proguardFile file('proguard.pro')
     }
   }
+  packagingOptions {
+    pickFirst 'META-INF/**/coroutines.pro'
+  }
+  lintOptions {
+      abortOnError false
+  }
 }
 
 apply from: "$gradle.firebase_cpp_sdk_dir/Android/firebase_dependencies.gradle"
diff --git a/remote_config/testapp/build.gradle b/remote_config/testapp/build.gradle
@@ -59,6 +59,12 @@ android {
       proguardFile file('proguard.pro')
     }
   }
+  packagingOptions {
+    pickFirst 'META-INF/**/coroutines.pro'
+  }
+  lintOptions {
+      abortOnError false
+  }
 }
 
 apply from: "$gradle.firebase_cpp_sdk_dir/Android/firebase_dependencies.gradle"
diff --git a/storage/testapp/build.gradle b/storage/testapp/build.gradle
@@ -59,6 +59,12 @@ android {
       proguardFile file('proguard.pro')
     }
   }
+  packagingOptions {
+    pickFirst 'META-INF/**/coroutines.pro'
+  }
+  lintOptions {
+      abortOnError false
+  }
 }
 
 apply from: "$gradle.firebase_cpp_sdk_dir/Android/firebase_dependencies.gradle"

Original file line number	Diff line number	Diff line change
`@@ -55,6 +55,12 @@ android {`
`55`	`55`	`proguardFile file('proguard.pro')`
`56`	`56`	`}`
`57`	`57`	`}`
	`58`	`+ packagingOptions {`
	`59`	`+ pickFirst 'META-INF/**/coroutines.pro'`
	`60`	`+ }`
	`61`	`+ lintOptions {`
	`62`	`+ abortOnError false`
	`63`	`+ }`
`58`	`64`	`}`
`59`	`65`
`60`	`66`	`apply from: "$gradle.firebase_cpp_sdk_dir/Android/firebase_dependencies.gradle"`
Original file line number	Diff line number	Diff line change
`@@ -59,6 +59,12 @@ android {`
`59`	`59`	`proguardFile file('proguard.pro')`
`60`	`60`	`}`
`61`	`61`	`}`
	`62`	`+ packagingOptions {`
	`63`	`+ pickFirst 'META-INF/**/coroutines.pro'`
	`64`	`+ }`
	`65`	`+ lintOptions {`
	`66`	`+ abortOnError false`
	`67`	`+ }`
`62`	`68`	`}`
`63`	`69`
`64`	`70`	`apply from: "$gradle.firebase_cpp_sdk_dir/Android/firebase_dependencies.gradle"`
Original file line number	Diff line number	Diff line change
`@@ -60,6 +60,12 @@ android {`
`60`	`60`	`proguardFile file('proguard.pro')`
`61`	`61`	`}`
`62`	`62`	`}`
	`63`	`+ packagingOptions {`
	`64`	`+ pickFirst 'META-INF/**/coroutines.pro'`
	`65`	`+ }`
	`66`	`+ lintOptions {`
	`67`	`+ abortOnError false`
	`68`	`+ }`
`63`	`69`	`}`
`64`	`70`
`65`	`71`	`apply from: "$gradle.firebase_cpp_sdk_dir/Android/firebase_dependencies.gradle"`