Skip to content

Commit eeef364

Browse files
authored
Smoke test maintenance (#3379)
- Upgrade dependency versions - Replace jcenter with maven central repository - Revive temporarily disabled Messaging test cases
1 parent e0d23be commit eeef364

File tree

4 files changed

+20
-28
lines changed

4 files changed

+20
-28
lines changed

smoke-tests/build.gradle

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,13 @@ import java.nio.file.Paths
1919
buildscript {
2020
repositories {
2121
google()
22-
jcenter()
22+
mavenCentral()
2323
}
2424

2525
dependencies {
2626
classpath "com.android.tools.build:gradle:3.4.3"
27-
classpath "com.google.gms:google-services:4.3.0"
28-
classpath "com.google.firebase:firebase-crashlytics-gradle:2.7.0"
27+
classpath "com.google.gms:google-services:4.3.10"
28+
classpath "com.google.firebase:firebase-crashlytics-gradle:2.8.1"
2929
}
3030
}
3131

@@ -77,22 +77,21 @@ dependencies {
7777
implementation "com.google.firebase:firebase-firestore"
7878
implementation "com.google.firebase:firebase-functions"
7979
implementation "com.google.firebase:firebase-inappmessaging"
80-
// TODO(yifany): Restore after messaging in github is up to date
81-
// implementation "com.google.firebase:firebase-messaging"
80+
implementation "com.google.firebase:firebase-messaging"
8281
implementation "com.google.firebase:firebase-ml-modeldownloader"
8382
implementation "com.google.firebase:firebase-perf"
8483
implementation "com.google.firebase:firebase-storage"
8584

8685
// Common utilities (application side)
87-
implementation "androidx.test:rules:1.2.0"
88-
implementation "androidx.test:runner:1.2.0"
89-
implementation "com.google.truth:truth:0.44"
90-
implementation "junit:junit:4.12"
91-
implementation "androidx.test:core:1.3.0"
86+
implementation "androidx.test:rules:1.4.0"
87+
implementation "androidx.test:runner:1.4.0"
88+
implementation "com.google.truth:truth:1.0.1"
89+
implementation "junit:junit:4.13.2"
90+
implementation "androidx.test:core:1.4.0"
9291

9392
// Common utilities (instrumentation side)
94-
androidTestImplementation "androidx.test:runner:1.2.0"
95-
androidTestImplementation "junit:junit:4.12"
93+
androidTestImplementation "androidx.test:runner:1.4.0"
94+
androidTestImplementation "junit:junit:4.13.2"
9695
}
9796

9897
clean.doLast {

smoke-tests/configure.gradle

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -19,15 +19,8 @@ def configurePlatform() {
1919
bom = project.getProperty("firebase-bom")
2020
}
2121

22-
def version = project.gradle.gradleVersion
23-
if (version.startsWith("4.")) {
24-
project.dependencies.add("implementation", bom)
25-
} else {
26-
def platform = project.dependencies.platform(bom)
27-
project.dependencies.add("implementation", platform)
28-
logger.warn("Congrats on switching to Gradle 5.y!")
29-
logger.warn("Perhaps remove the Gradle 4.x compat layer?")
30-
}
22+
def platform = project.dependencies.platform(bom)
23+
project.dependencies.add("implementation", platform)
3124
}
3225

3326
def configureRepositories() {
@@ -44,7 +37,7 @@ def configureRepositories() {
4437
}
4538

4639
google()
47-
jcenter()
40+
mavenCentral()
4841
}
4942
}
5043

smoke-tests/gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,4 +15,4 @@
1515
android.enableR8=true
1616
android.useAndroidX=true
1717

18-
org.gradle.jvmargs=-Xmx4g -XX:MaxPermSize=4g
18+
org.gradle.jvmargs=-Xmx8g -XX:MaxPermSize=8g

smoke-tests/src/main/java/com/google/firebase/testing/BuildOnlyTest.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818

1919
import com.google.firebase.appindexing.FirebaseAppIndex;
2020
import com.google.firebase.inappmessaging.FirebaseInAppMessaging;
21-
// import com.google.firebase.messaging.FirebaseMessaging;
21+
import com.google.firebase.messaging.FirebaseMessaging;
2222
import com.google.firebase.ml.modeldownloader.FirebaseModelDownloader;
2323
import com.google.firebase.perf.FirebasePerformance;
2424
import org.junit.Test;
@@ -41,10 +41,10 @@ public void inappmessaging_IsNotNull() {
4141
assertThat(FirebaseInAppMessaging.getInstance()).isNotNull();
4242
}
4343

44-
// @Test
45-
// public void messaging_IsNotNull() {
46-
// assertThat(FirebaseMessaging.getInstance()).isNotNull();
47-
// }
44+
@Test
45+
public void messaging_IsNotNull() {
46+
assertThat(FirebaseMessaging.getInstance()).isNotNull();
47+
}
4848

4949
@Test
5050
public void modelDownloader_IsNotNull() {

0 commit comments

Comments
 (0)