Skip to content

Commit 20cd7fa

Browse files
authored
Decouple smoke tests from SDK gradle version (#2785)
1 parent 5dfdf2a commit 20cd7fa

File tree

4 files changed

+15
-24
lines changed

4 files changed

+15
-24
lines changed

smoke-tests/build.gradle

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

1515
import java.nio.file.Files
16-
import java.nio.file.Path
1716
import java.nio.file.Paths
1817

1918
buildscript {
2019
repositories {
2120
google()
22-
jcenter()
21+
mavenCentral()
2322
}
2423

2524
dependencies {
26-
classpath "com.android.tools.build:gradle:3.4.3"
27-
classpath "com.google.gms:google-services:4.3.0"
25+
classpath "com.android.tools.build:gradle:4.2.2"
26+
classpath "com.google.gms:google-services:4.3.8"
2827
}
2928
}
3029

@@ -81,15 +80,15 @@ dependencies {
8180
implementation "com.google.firebase:firebase-storage"
8281

8382
// Common utilities (application side)
84-
implementation "androidx.test:rules:1.2.0"
85-
implementation "androidx.test:runner:1.2.0"
86-
implementation "com.google.truth:truth:0.44"
87-
implementation "junit:junit:4.12"
88-
implementation "androidx.test:core:1.3.0"
83+
implementation "androidx.test:rules:1.4.0"
84+
implementation "androidx.test:runner:1.4.0"
85+
implementation "com.google.truth:truth:1.0.1"
86+
implementation "junit:junit:4.13.2"
87+
implementation "androidx.test:core:1.4.0"
8988

9089
// Common utilities (instrumentation side)
91-
androidTestImplementation "androidx.test:runner:1.2.0"
92-
androidTestImplementation "junit:junit:4.12"
90+
androidTestImplementation "androidx.test:runner:1.4.0"
91+
androidTestImplementation "junit:junit:4.13.2"
9392
}
9493

9594
clean.doLast {

smoke-tests/configure.gradle

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

1515

1616
def configurePlatform() {
17-
def bom = "com.google.firebase:firebase-bom:20.0.0"
17+
def bom = "com.google.firebase:firebase-bom:28.2.0"
1818
if (project.hasProperty("firebase-bom")) {
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: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414

15-
android.enableR8=true
1615
android.useAndroidX=true
1716

1817
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-
enableFeaturePreview("IMPROVED_POM_SUPPORT")
15+
rootProject.name = 'smoke-tests'

0 commit comments

Comments
 (0)