diff --git a/ci/fireci/fireciplugins/macrobenchmark/run/test_project_builder.py b/ci/fireci/fireciplugins/macrobenchmark/run/test_project_builder.py index c384dcb86f3..9ece6b6f5fd 100644 --- a/ci/fireci/fireciplugins/macrobenchmark/run/test_project_builder.py +++ b/ci/fireci/fireciplugins/macrobenchmark/run/test_project_builder.py @@ -60,7 +60,7 @@ def _copy_template_project(self): self.logger.debug(f'Copied project template files into "{self.project_dir}"') def _download_gradle_wrapper(self): - args = ['wrapper', '--gradle-version', '7.5.1', '--project-dir', str(self.project_dir)] + args = ['wrapper', '--gradle-version', '8.4', '--project-dir', str(self.project_dir)] execute('./gradlew', *args, logger=self.logger) self.logger.debug(f'Created gradle wrapper in "{self.project_dir}"') diff --git a/health-metrics/benchmark/template/app/build.gradle.mustache b/health-metrics/benchmark/template/app/build.gradle.mustache index 3bc2a6f4339..77279ae25d9 100644 --- a/health-metrics/benchmark/template/app/build.gradle.mustache +++ b/health-metrics/benchmark/template/app/build.gradle.mustache @@ -23,6 +23,8 @@ plugins { android { compileSdkVersion 32 + namespace "com.google.firebase.benchmark" + defaultConfig { applicationId 'com.google.firebase.benchmark' minSdkVersion 29 @@ -70,7 +72,7 @@ dependencies { implementation 'androidx.appcompat:appcompat:1.5.0' implementation 'com.google.android.material:material:1.6.1' implementation 'androidx.constraintlayout:constraintlayout:2.1.4' - testImplementation libs.junit + testImplementation 'junit:junit:4.13.2' androidTestImplementation "androidx.test.ext:junit:1.1.5" androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0' } diff --git a/health-metrics/benchmark/template/app/src/main/AndroidManifest.xml b/health-metrics/benchmark/template/app/src/main/AndroidManifest.xml index 400075eb9c4..096ba949f2d 100644 --- a/health-metrics/benchmark/template/app/src/main/AndroidManifest.xml +++ b/health-metrics/benchmark/template/app/src/main/AndroidManifest.xml @@ -1,7 +1,6 @@ + xmlns:tools="http://schemas.android.com/tools"> - +