Correct rebase errors

gradle · May 23, 2024 · fd9ac12 · fd9ac12
1 parent 23fb1df
commit fd9ac12
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 2 deletions.
diff --git a/...roid/src/main/java/org/gradle/api/experimental/android/AbstractAndroidSoftwarePlugin.java b/...roid/src/main/java/org/gradle/api/experimental/android/AbstractAndroidSoftwarePlugin.java
@@ -202,7 +202,6 @@ protected void linkBuildTypeDependencies(BuildType buildType, AndroidSoftwareDep
         configurations.getByName(name + "RuntimeOnly").fromDependencyCollector(dependencies.getRuntimeOnly());
     }
 
-
     protected <T> void ifPresent(Property<T> property, Action<T> action) {
         if (property.isPresent()) {
             action.execute(property.get());

diff --git a/...a/org/gradle/api/experimental/android/application/StandaloneAndroidApplicationPlugin.java b/...a/org/gradle/api/experimental/android/application/StandaloneAndroidApplicationPlugin.java
@@ -7,6 +7,7 @@
 import org.gradle.api.attributes.AttributeContainer;
 import org.gradle.api.experimental.android.AbstractAndroidSoftwarePlugin;
 import org.gradle.api.experimental.android.AndroidSoftware;
+import org.gradle.api.experimental.android.nia.NiaSupport;
 import org.gradle.api.internal.plugins.software.SoftwareType;
 
 import java.util.Objects;
@@ -57,10 +58,13 @@ private void linkDslModelToPlugin(Project project, AndroidApplication dslModel)
             return null;
         });
 
-        if (Objects.equals(project.getRootProject().getName(), "nowinandroid")) {
+        // TODO: All this configuration should be moved to the NiA project
+        if (NiaSupport.isNiaProject(project)) {
             // ProductFlavors are automatically added by the LIBRARY plugin via NiA support only, ATM, so we
             // need to make sure any Android APPLICATION projects have the necessary attributes for project deps to work.
             configureContentTypeAttributes(project);
+
+            NiaSupport.configureNiaApplication(project, dslModel);
         }
     }
 

diff --git a/...main/java/org/gradle/api/experimental/android/library/StandaloneAndroidLibraryPlugin.java b/...main/java/org/gradle/api/experimental/android/library/StandaloneAndroidLibraryPlugin.java
@@ -6,6 +6,7 @@
 import org.gradle.api.artifacts.ConfigurationContainer;
 import org.gradle.api.experimental.android.AbstractAndroidSoftwarePlugin;
 import org.gradle.api.experimental.android.AndroidSoftware;
+import org.gradle.api.experimental.android.nia.NiaSupport;
 import org.gradle.api.internal.plugins.software.SoftwareType;
 
 /**
@@ -38,6 +39,11 @@ public void apply(Project project) {
 
         // After AGP creates configurations, link deps to the collectors
         linkCommonDependencies(dslModel.getDependencies(), project.getConfigurations());
+
+        // TODO: All this configuration should be moved to the NiA project
+        if (NiaSupport.isNiaProject(project)) {
+            NiaSupport.configureNiaApplication(project, dslModel);
+        }
     }
 
     /**