Enable Java unit test coverage report (youtube#530)

Co-authored-by: Colin Liang <[email protected]>
kaidokert · Jul 10, 2023 · a210e66 · a210e66
1 parent 4e1e814
commit a210e66
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/starboard/android/apk/app/build.gradle b/starboard/android/apk/app/build.gradle
@@ -109,7 +109,7 @@ android {
                 cmake.arguments "-DCOBALT_CONFIG=debug"
             }
             signingConfig signingConfigs.debugConfig
-            testCoverageEnabled true
+            enableUnitTestCoverage true
         }
         devel {
             debuggable true
@@ -118,14 +118,14 @@ android {
                 cmake.arguments "-DCOBALT_CONFIG=devel"
             }
             signingConfig signingConfigs.debugConfig
-            testCoverageEnabled true
+            enableUnitTestCoverage true
         }
         qa {
             externalNativeBuild {
                 cmake.arguments "-DCOBALT_CONFIG=qa"
             }
             signingConfig signingConfigs.debugConfig
-            testCoverageEnabled true
+            enableUnitTestCoverage true
         }
         release {
             minifyEnabled true
@@ -149,16 +149,16 @@ android {
         }
         // Add the directories symlinked by the CMake "cobalt_content" custom command.
         debug {
-            assets.srcDir "${buildDir}/intermediates/cxx/debug/cobalt_content"
+            assets.srcDir "${cobaltContentDir}"
         }
         devel {
-            assets.srcDir "${buildDir}/intermediates/cxx/devel/cobalt_content"
+            assets.srcDir "${cobaltContentDir}"
         }
         qa {
-            assets.srcDir "${buildDir}/intermediates/cxx/qa/cobalt_content"
+            assets.srcDir "${cobaltContentDir}"
         }
         release {
-            assets.srcDir "${buildDir}/intermediates/cxx/gold/cobalt_content"
+            assets.srcDir "${cobaltContentDir}"
         }
     }
     externalNativeBuild {

diff --git a/starboard/android/apk/build.gradle b/starboard/android/apk/build.gradle
@@ -20,7 +20,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.0.2'
+        classpath 'com.android.tools.build:gradle:7.4.2'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files

diff --git a/starboard/android/apk/gradle/wrapper/gradle-wrapper.properties b/starboard/android/apk/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.1-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists