Skip to content

Rollback #2785, which made bom generation and crashlytics smoke test fail. #2825

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jul 13, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 11 additions & 10 deletions smoke-tests/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -13,17 +13,18 @@
// limitations under the License.

import java.nio.file.Files
import java.nio.file.Path
import java.nio.file.Paths

buildscript {
repositories {
google()
mavenCentral()
jcenter()
}

dependencies {
classpath "com.android.tools.build:gradle:4.2.2"
classpath "com.google.gms:google-services:4.3.8"
classpath "com.android.tools.build:gradle:3.4.3"
classpath "com.google.gms:google-services:4.3.0"
classpath "com.google.firebase:firebase-crashlytics-gradle:2.7.0"
}
}
Expand Down Expand Up @@ -83,15 +84,15 @@ dependencies {
implementation "com.google.firebase:firebase-storage"

// Common utilities (application side)
implementation "androidx.test:rules:1.4.0"
implementation "androidx.test:runner:1.4.0"
implementation "com.google.truth:truth:1.0.1"
implementation "junit:junit:4.13.2"
implementation "androidx.test:core:1.4.0"
implementation "androidx.test:rules:1.2.0"
implementation "androidx.test:runner:1.2.0"
implementation "com.google.truth:truth:0.44"
implementation "junit:junit:4.12"
implementation "androidx.test:core:1.3.0"

// Common utilities (instrumentation side)
androidTestImplementation "androidx.test:runner:1.4.0"
androidTestImplementation "junit:junit:4.13.2"
androidTestImplementation "androidx.test:runner:1.2.0"
androidTestImplementation "junit:junit:4.12"
}

clean.doLast {
Expand Down
15 changes: 11 additions & 4 deletions smoke-tests/configure.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,20 @@


def configurePlatform() {
def bom = "com.google.firebase:firebase-bom:28.2.0"
def bom = "com.google.firebase:firebase-bom:20.0.0"
if (project.hasProperty("firebase-bom")) {
bom = project.getProperty("firebase-bom")
}

def platform = project.dependencies.platform(bom)
project.dependencies.add("implementation", platform)
def version = project.gradle.gradleVersion
if (version.startsWith("4.")) {
project.dependencies.add("implementation", bom)
} else {
def platform = project.dependencies.platform(bom)
project.dependencies.add("implementation", platform)
logger.warn("Congrats on switching to Gradle 5.y!")
logger.warn("Perhaps remove the Gradle 4.x compat layer?")
}
}

def configureRepositories() {
Expand All @@ -37,7 +44,7 @@ def configureRepositories() {
}

google()
mavenCentral()
jcenter()
}
}

Expand Down
1 change: 1 addition & 0 deletions smoke-tests/gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.

android.enableR8=true
android.useAndroidX=true

org.gradle.jvmargs=-Xmx4g -XX:MaxPermSize=4g
2 changes: 1 addition & 1 deletion smoke-tests/settings.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,4 @@
// See the License for the specific language governing permissions and
// limitations under the License.

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