Commit 69351c1
committed
Fix CopyGoogleServicesPlugin for dataconnect
A recent change to `CopyGoogleServicesPlugin.kt` in #7454 caused it to skip all of its logic if the project already had its own `google-services.json` (as firebase-dataconnect _does_). Part of this logic is to apply the `com.google.gms.google-services` Gradle plugin when running (or compiling) tests. The `firebase-dataconnect` project relied on this side effect and the changes to `CopyGoogleServicesPlugin.kt` caused this side effect to no longer happen to firebase-dataconnect, causing the following build error:
```
firebase-dataconnect/src/androidTest/kotlin/com/google/firebase/dataconnect/testutil/FirebaseAppIdTestUtil.kt:23:68 Unresolved reference 'string'.
```
The fix in this commit modifies `CopyGoogleServicesPlugin.kt` to apply the `com.google.gms.google-services` Gradle plugin just as it did before, even if the project defines its own `google-services.json`. This was probably the intended behavior all along.1 parent 5ddcc4b commit 69351c1
File tree
1 file changed
+11
-13
lines changed- plugins/src/main/java/com/google/firebase/gradle/plugins
1 file changed
+11
-13
lines changedLines changed: 11 additions & 13 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
17 | 17 | | |
18 | 18 | | |
19 | 19 | | |
20 | | - | |
21 | 20 | | |
22 | 21 | | |
23 | 22 | | |
| |||
38 | 37 | | |
39 | 38 | | |
40 | 39 | | |
41 | | - | |
42 | | - | |
43 | | - | |
44 | | - | |
45 | | - | |
46 | | - | |
47 | | - | |
48 | | - | |
49 | | - | |
50 | | - | |
51 | | - | |
52 | | - | |
| 40 | + | |
| 41 | + | |
| 42 | + | |
| 43 | + | |
| 44 | + | |
| 45 | + | |
| 46 | + | |
| 47 | + | |
| 48 | + | |
| 49 | + | |
| 50 | + | |
53 | 51 | | |
54 | 52 | | |
55 | 53 | | |
| |||
0 commit comments