From bb71e21e0c6fe35a3259821936633571567068ef Mon Sep 17 00:00:00 2001
From: Jan Wyszynski <wyszynski@google.com>
Date: Wed, 22 Feb 2023 17:17:34 -0500
Subject: [PATCH 1/2] Remove redundant testUtil sourceset from
 firebase-database

---
 firebase-database/firebase-database.gradle | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/firebase-database/firebase-database.gradle b/firebase-database/firebase-database.gradle
index f19c95f4d3f..965cb4dcb5f 100644
--- a/firebase-database/firebase-database.gradle
+++ b/firebase-database/firebase-database.gradle
@@ -47,11 +47,6 @@ android {
             java {
                 srcDir 'src/testUtil/java'
             }
-        }
-        test {
-            java {
-                srcDir 'src/testUtil/java'
-            }
             resources {
                 srcDirs "src/test/resources"
             }

From 9dde2b554487be01c6ee06207196f5e731c91693 Mon Sep 17 00:00:00 2001
From: Jan Wyszynski <wyszynski@google.com>
Date: Wed, 22 Feb 2023 17:27:35 -0500
Subject: [PATCH 2/2] changelog

---
 firebase-database/CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/firebase-database/CHANGELOG.md b/firebase-database/CHANGELOG.md
index ebb5b3ed8f5..d18c418bd3e 100644
--- a/firebase-database/CHANGELOG.md
+++ b/firebase-database/CHANGELOG.md
@@ -3,6 +3,7 @@
 # 20.1.0
 * [unchanged] Updated to accommodate the release of the updated
 [database] Kotlin extensions library.
+* [fixed] Remove redundant gradle sourceSet to clear spurious Android Studio unbound reference errors.
 
 
 ## Kotlin