Un-ignore test, remove unecessary deprecations and restore hilt cover…

…age exclusions
gradle · Nov 5, 2024 · 7496864 · 7496864
1 parent 9f803ed
commit 7496864
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/...ugin/plugin-android/src/main/java/org/gradle/api/experimental/android/nia/NiaSupport.java b/...ugin/plugin-android/src/main/java/org/gradle/api/experimental/android/nia/NiaSupport.java
@@ -220,7 +220,6 @@ private static void configureBadgingTasks(Project project, ApplicationAndroidCom
         });
     }
 
-    @SuppressWarnings("deprecation")
     private static void disableUnnecessaryAndroidTests(Project project, LibraryAndroidComponentsExtension androidLibComponents) {
         androidLibComponents.beforeVariants(androidLibComponents.selector().all(), it -> {
             it.setEnableAndroidTest(it.getEnableAndroidTest() && project.getLayout().getProjectDirectory().file("src/androidTest").getAsFile().exists());
@@ -416,11 +415,12 @@ private static List<String> coverageExclusions() {
                 "**/R.class",
                 "**/R$*.class",
                 "**/BuildConfig.*",
-                "**/Manifest*.*"
+                "**/Manifest*.*",
+                "**/*_Hilt*.class",
+                "**/Hilt_*.class"
         );
     }
 
-    @SuppressWarnings("deprecation")
     private static void configureJacoco(Project project, AndroidSoftware dslModel, CommonExtension<?, ?, ?, ?, ?, ?> android) {
         if (dslModel.getTesting().getJacoco().getEnabled().get()) {
             project.getLogger().info("JaCoCo is enabled in: " + project.getPath());
@@ -468,7 +468,7 @@ private static void configureJacoco(Project project, AndroidSoftware dslModel, C
                     .toGet(ScopedArtifact.CLASSES.INSTANCE, ignore -> allJars, ignore -> allDirectories);
             });
 
-            project.getTasks().withType(Test.class, test -> {
+            project.getTasks().withType(Test.class).configureEach(test -> {
                 JacocoTaskExtension jacocoTaskExtension = test.getExtensions().getByType(JacocoTaskExtension.class);
 
                 // Required for JaCoCo + Robolectric

diff --git a/.../integTest/groovy/org/gradle/api/experimental/kmp/KotlinApplicationInitProjectSpec.groovy b/.../integTest/groovy/org/gradle/api/experimental/kmp/KotlinApplicationInitProjectSpec.groovy
@@ -2,9 +2,7 @@ package org.gradle.api.experimental.kmp
 
 import org.gradle.integtests.fixtures.AbstractBuildInitSpecification
 import org.gradle.testkit.runner.GradleRunner
-import org.junit.Ignore
 
-@Ignore
 class KotlinApplicationInitProjectSpec extends AbstractBuildInitSpecification {
     @Override
     protected String getEcosystemPluginId() {