Skip to content

Commit 4f1cdc8

Browse files
authored
Rollback #2785, which made bom generation and crashlytics smoke test fail. (#2825)
Revert "Decouple smoke tests from SDK gradle version (#2785)" This reverts commit 20cd7fa.
1 parent 0d95ad5 commit 4f1cdc8

File tree

4 files changed

+24
-15
lines changed

4 files changed

+24
-15
lines changed

smoke-tests/build.gradle

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -13,17 +13,18 @@
1313
// limitations under the License.
1414

1515
import java.nio.file.Files
16+
import java.nio.file.Path
1617
import java.nio.file.Paths
1718

1819
buildscript {
1920
repositories {
2021
google()
21-
mavenCentral()
22+
jcenter()
2223
}
2324

2425
dependencies {
25-
classpath "com.android.tools.build:gradle:4.2.2"
26-
classpath "com.google.gms:google-services:4.3.8"
26+
classpath "com.android.tools.build:gradle:3.4.3"
27+
classpath "com.google.gms:google-services:4.3.0"
2728
classpath "com.google.firebase:firebase-crashlytics-gradle:2.7.0"
2829
}
2930
}
@@ -83,15 +84,15 @@ dependencies {
8384
implementation "com.google.firebase:firebase-storage"
8485

8586
// Common utilities (application side)
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"
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"
9192

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

9798
clean.doLast {

smoke-tests/configure.gradle

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,20 @@
1414

1515

1616
def configurePlatform() {
17-
def bom = "com.google.firebase:firebase-bom:28.2.0"
17+
def bom = "com.google.firebase:firebase-bom:20.0.0"
1818
if (project.hasProperty("firebase-bom")) {
1919
bom = project.getProperty("firebase-bom")
2020
}
2121

22-
def platform = project.dependencies.platform(bom)
23-
project.dependencies.add("implementation", platform)
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+
}
2431
}
2532

2633
def configureRepositories() {
@@ -37,7 +44,7 @@ def configureRepositories() {
3744
}
3845

3946
google()
40-
mavenCentral()
47+
jcenter()
4148
}
4249
}
4350

smoke-tests/gradle.properties

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414

15+
android.enableR8=true
1516
android.useAndroidX=true
1617

1718
org.gradle.jvmargs=-Xmx4g -XX:MaxPermSize=4g

smoke-tests/settings.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,4 @@
1212
// See the License for the specific language governing permissions and
1313
// limitations under the License.
1414

15-
rootProject.name = 'smoke-tests'
15+
enableFeaturePreview("IMPROVED_POM_SUPPORT")

0 commit comments

Comments
 (0)