Skip to content

Commit 14f219e

Browse files
committed
update
1 parent 5b8b8b0 commit 14f219e

File tree

2 files changed

+6
-29
lines changed

2 files changed

+6
-29
lines changed

buildSrc/src/main/java/com/google/firebase/gradle/plugins/PackageTransform.kt

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -125,11 +125,12 @@ abstract class PackageTransform : DefaultTask() {
125125
if (!cont) return
126126
val dir: File = File(src.parent.toString())
127127
if (dir.exists() && dir.isDirectory) {
128-
dir.listFiles().forEach { x ->
129-
if (x.isDirectory) return
130-
val destination = dest.resolve(dir.toPath().relativize(x.toPath()))
131-
Files.createDirectories(destination.parent)
132-
Files.copy(x.toPath(), destination, StandardCopyOption.COPY_ATTRIBUTES)
128+
for (file in Files.walk(dir.toPath())) {
129+
if (!Files.isDirectory(file) && !file.toAbsolutePath().contains(src.toAbsolutePath())) {
130+
val destination = dest.resolve(dir.toPath().relativize(file))
131+
Files.createDirectories(destination.parent)
132+
Files.copy(file, destination, StandardCopyOption.REPLACE_EXISTING)
133+
}
133134
}
134135
}
135136
}

firebase-common/src/main/java/com/google/firebase/ktx/Firebase.kt

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -85,27 +85,3 @@ val Firebase.options: FirebaseOptions
8585

8686
internal const val LIBRARY_NAME: String = "fire-core-ktx"
8787

88-
/** @suppress */
89-
@Deprecated(
90-
"Use `com.google.firebase.FirebaseCommonKtxRegistrar`",
91-
ReplaceWith("com.google.firebase.FirebaseCommonKtxRegistrar")
92-
)
93-
@Keep
94-
class FirebaseCommonKtxRegistrar : ComponentRegistrar {
95-
override fun getComponents(): List<Component<*>> {
96-
return listOf(
97-
coroutineDispatcher<Background>(),
98-
coroutineDispatcher<Lightweight>(),
99-
coroutineDispatcher<Blocking>(),
100-
coroutineDispatcher<UiThread>()
101-
)
102-
}
103-
}
104-
105-
private inline fun <reified T : Annotation> coroutineDispatcher(): Component<CoroutineDispatcher> =
106-
Component.builder(Qualified.qualified(T::class.java, CoroutineDispatcher::class.java))
107-
.add(Dependency.required(Qualified.qualified(T::class.java, Executor::class.java)))
108-
.factory { c ->
109-
c.get(Qualified.qualified(T::class.java, Executor::class.java)).asCoroutineDispatcher()
110-
}
111-
.build()

0 commit comments

Comments
 (0)