Skip to content

Commit 3810924

Browse files
committed
upgrade firebase aars to match android bom 32.7.0 and add new android api usage to emulation layer
1 parent 4b427e1 commit 3810924

File tree

11 files changed

+82
-11
lines changed

11 files changed

+82
-11
lines changed

build.gradle.kts

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ plugins {
1616
`java-library`
1717
`maven-publish`
1818
signing
19-
id("org.jetbrains.kotlin.jvm") version "1.6.10"
20-
kotlin("plugin.serialization") version "1.6.10"
19+
id("org.jetbrains.kotlin.jvm") version "1.7.10"
20+
kotlin("plugin.serialization") version "1.7.10"
2121
id("org.jlleitschuh.gradle.ktlint") version "10.0.0"
2222
id("com.github.ben-manes.versions") version "0.42.0"
2323
}
@@ -150,20 +150,20 @@ dependencies {
150150
testImplementation("junit:junit:4.13.2")
151151
testImplementation("org.jetbrains.kotlinx:kotlinx-coroutines-swing:1.6.0")
152152
// firebase aars
153-
aar("com.google.firebase:firebase-firestore:24.1.2")
154-
aar("com.google.firebase:firebase-functions:20.1.0")
155-
aar("com.google.firebase:firebase-database:20.0.5")
156-
aar("com.google.firebase:firebase-config:21.1.0")
153+
aar("com.google.firebase:firebase-firestore:24.10.0")
154+
aar("com.google.firebase:firebase-functions:20.4.0")
155+
aar("com.google.firebase:firebase-database:20.3.0")
156+
aar("com.google.firebase:firebase-config:21.6.0")
157+
aar("com.google.firebase:firebase-installations:17.2.0")
157158
// extracted aar dependencies
158159
api(fileTree(mapOf("dir" to "build/jar", "include" to listOf("*.jar"))))
159160
// polyfill dependencies
160-
implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8")
161-
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.0")
161+
implementation("org.jetbrains.kotlin:kotlin-stdlib")
162+
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.4")
162163
implementation("org.jetbrains.kotlinx:kotlinx-serialization-core:1.3.2")
163164
implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.3.2")
164-
// firebase dependencies
165165
implementation("com.squareup.okhttp:okhttp:2.7.5")
166-
implementation("com.squareup.okhttp3:okhttp:4.9.3")
166+
// firebase dependencies
167167
implementation("android.arch.lifecycle:common:1.1.1")
168168
implementation("io.grpc:grpc-protobuf-lite:1.52.1")
169169
implementation("io.grpc:grpc-stub:1.52.1")

gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
version=0.2.0
1+
version=0.3.0
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
package android.content;
2+
3+
public abstract class ContentProvider {
4+
}

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ public ServiceInfo getServiceInfo(ComponentName component, int flags) throws Nam
3737
data.put("com.google.firebase.components:com.google.firebase.firestore.FirestoreRegistrar", "com.google.firebase.components.ComponentRegistrar");
3838
data.put("com.google.firebase.components:com.google.firebase.auth.FirebaseAuthRegistrar", "com.google.firebase.components.ComponentRegistrar");
3939
data.put("com.google.firebase.components:com.google.firebase.functions.FunctionsRegistrar", "com.google.firebase.components.ComponentRegistrar");
40+
data.put("com.google.firebase.components:com.google.firebase.installations.FirebaseInstallationsRegistrar", "com.google.firebase.components.ComponentRegistrar");
4041
data.put("com.google.firebase.components:com.google.firebase.iid.Registrar", "com.google.firebase.components.ComponentRegistrar");
4142
return new ServiceInfo(data);
4243
}
@@ -67,6 +68,7 @@ public boolean hasSystemFeature(String name) {
6768
case "android.hardware.type.embedded":
6869
case "android.hardware.type.television":
6970
case "android.hardware.type.automotive":
71+
case "cn.google":
7072
return false;
7173
}
7274
throw new IllegalArgumentException(name);
Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
package android.os;
2+
3+
public class StrictMode {
4+
5+
public static void setThreadPolicy(ThreadPolicy policy) {
6+
7+
}
8+
9+
public static final class ThreadPolicy {
10+
public static final class Builder {
11+
public Builder detectAll() {
12+
return this;
13+
}
14+
public Builder detectNetwork() {
15+
return this;
16+
}
17+
public Builder detectResourceMismatches() {
18+
return this;
19+
}
20+
public Builder detectUnbufferedIo() {
21+
return this;
22+
}
23+
public Builder penaltyLog() {
24+
return this;
25+
}
26+
public ThreadPolicy build() {
27+
return new ThreadPolicy();
28+
}
29+
}
30+
}
31+
}
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
package android.os;
2+
3+
import java.lang.management.ManagementFactory;
4+
5+
public final class SystemClock {
6+
public static long elapsedRealtime() {
7+
return ManagementFactory.getRuntimeMXBean().getUptime();
8+
}
9+
public static long uptimeMillis() {
10+
return ManagementFactory.getRuntimeMXBean().getUptime();
11+
}
12+
}

src/main/java/android/os/Trace.java

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
package android.os;
2+
3+
public final class Trace {
4+
public static void beginSection(String sectionName) {}
5+
public static void endSection() {}
6+
}
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
package com.google.firebase.annotations.concurrent;
2+
3+
public @interface Background {
4+
}
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
package com.google.firebase.annotations.concurrent;
2+
3+
public @interface Blocking {
4+
}
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
package com.google.firebase.annotations.concurrent;
2+
3+
public @interface Lightweight {
4+
}
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
package com.google.firebase.annotations.concurrent;
2+
3+
public @interface UiThread {
4+
}

0 commit comments

Comments
 (0)