Skip to content

Commit a2f7a0c

Browse files
authored
Merge pull request #44 from pontomedon/cramsan/storage_jvm
Adding JVM support for Firebase Storage
2 parents 07a7140 + e96d865 commit a2f7a0c

File tree

10 files changed

+2250
-24
lines changed

10 files changed

+2250
-24
lines changed

build.gradle.kts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,7 @@ val jar by tasks.getting(Jar::class) {
8282
it.path.startsWith("${projectDir.path}${File.separator}build${File.separator}jar")
8383
}.map { zipTree(it) }
8484
})
85+
duplicatesStrategy = DuplicatesStrategy.EXCLUDE
8586
}
8687

8788
val sourceSets = project.the<SourceSetContainer>()
@@ -157,8 +158,9 @@ dependencies {
157158
aar(libs.google.firebase.database)
158159
aar(libs.google.firebase.config)
159160
aar(libs.google.firebase.installations)
161+
aar(libs.google.firebase.storage)
160162
// extracted aar dependencies
161-
// exclude lifecycle libs due to https://github.com/GitLiveApp/firebase-java-sdk/pull/15 - remove the exclude once the dependencies in the aars are updated to the required version
163+
// exclude lifecycle libs due to https://github.com/GitLiveApp/firebase-java-sdk/pull/15 - remove the exclude once the dependencies in the aars are updated to the required version
162164
api(fileTree(mapOf("dir" to "build/jar", "include" to listOf("*.jar"), "exclude" to listOf("lifecycle-*"))))
163165
// polyfill dependencies
164166
implementation(libs.kotlinx.coroutines.core)

gradle/libs.versions.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ google-firebase-database = { module = "com.google.firebase:firebase-database" }
1919
google-firebase-firestore = { module = "com.google.firebase:firebase-firestore" }
2020
google-firebase-functions = { module = "com.google.firebase:firebase-functions" }
2121
google-firebase-installations = { module = "com.google.firebase:firebase-installations" }
22+
google-firebase-storage = { module = "com.google.firebase:firebase-storage" }
2223
io-grpc-okhttp = { module = "io.grpc:grpc-okhttp", version.ref = "io-grpc" }
2324
io-grpc-protobuf-lite = { module = "io.grpc:grpc-protobuf-lite", version.ref = "io-grpc" }
2425
io-grpc-stub = { module = "io.grpc:grpc-stub", version.ref = "io-grpc" }

src/main/java/android/content/pm/PackageManager.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ public ServiceInfo getServiceInfo(ComponentName component, int flags) throws Nam
3939
data.put("com.google.firebase.components:com.google.firebase.functions.FunctionsRegistrar", "com.google.firebase.components.ComponentRegistrar");
4040
data.put("com.google.firebase.components:com.google.firebase.installations.FirebaseInstallationsRegistrar", "com.google.firebase.components.ComponentRegistrar");
4141
data.put("com.google.firebase.components:com.google.firebase.iid.Registrar", "com.google.firebase.components.ComponentRegistrar");
42+
data.put("com.google.firebase.components:com.google.firebase.storage.StorageRegistrar", "com.google.firebase.components.ComponentRegistrar");
4243
return new ServiceInfo(data);
4344
}
4445
throw new IllegalArgumentException(component.cls);

src/main/java/android/net/ConnectivityManager.kt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,10 @@ class ConnectivityManager private constructor() {
2121
connected.removeEventListener(networkCallback)
2222
}
2323

24+
fun getActiveNetworkInfo(): NetworkInfo {
25+
return NetworkInfo()
26+
}
27+
2428
open class NetworkCallback : ValueEventListener {
2529
override fun onDataChange(data: DataSnapshot) {
2630
when (data.getValue(Boolean::class.java)) {
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
package android.net
2+
3+
class NetworkInfo {
4+
var type: Int = 1 // ConnectivityManager.TYPE_WIFI
5+
val isConnectedOrConnecting: Boolean = true
6+
val isConnected: Boolean = true
7+
val isSuspended: Boolean = false
8+
val isAvailable: Boolean = true
9+
}

0 commit comments

Comments
 (0)