Add proguard support for NiA

unified-prototype/unified-plugin/plugin-android/src/main/java/org/gradle/api/experimental/android/AbstractAndroidSoftwarePlugin.java

@@ -4,6 +4,8 @@
 import com.android.build.api.dsl.BuildType;
 import com.android.build.api.dsl.CommonExtension;
 import com.android.build.api.dsl.UnitTestOptions;
+import com.android.build.gradle.BaseExtension;
+import com.android.build.gradle.ProguardFiles;
 import com.google.devtools.ksp.gradle.KspExtension;
 import org.gradle.api.Action;
 import org.gradle.api.JavaVersion;
@@ -17,6 +19,7 @@
 import org.gradle.api.provider.Property;
 import org.jetbrains.kotlin.gradle.dsl.KotlinAndroidProjectExtension;
 
+import java.io.File;
 import java.util.Objects;
 
 import static org.gradle.api.experimental.android.extensions.ComposeSupport.configureCompose;
@@ -100,8 +103,8 @@ protected void linkDslModelToPlugin(Project project, AndroidSoftware dslModel, C
  // Link build types
  AndroidSoftwareBuildTypes modelBuildType = dslModel.getBuildTypes();
  NamedDomainObjectContainer<? extends BuildType> androidBuildTypes = android.getBuildTypes();
- linkBuildType(androidBuildTypes.getByName("debug"), modelBuildType.getDebug(), configurations);
- linkBuildType(androidBuildTypes.getByName("release"), modelBuildType.getRelease(), configurations);
+ linkBuildType(androidBuildTypes.getByName("debug"), modelBuildType.getDebug(), configurations, android);
+ linkBuildType(androidBuildTypes.getByName("release"), modelBuildType.getRelease(), configurations, android);
 
  configureTesting(project, dslModel, android);
 
@@ -197,9 +200,17 @@ protected void configureKotlinSerialization(Project project, AndroidSoftware dsl
  /**
  * Links build types from the model to the android extension.
  */
- protected void linkBuildType(BuildType buildType, AndroidSoftwareBuildType model, ConfigurationContainer configurations) {
+ protected void linkBuildType(BuildType buildType, AndroidSoftwareBuildType model, ConfigurationContainer configurations, CommonExtension<?, ?, ?, ?, ?, ?> android) {
  buildType.setMinifyEnabled(model.getMinify().getEnabled().get());
  linkBuildTypeDependencies(buildType, model.getDependencies(), configurations);
+
+ model.getDefaultProguardFiles().get().forEach(proguardFile -> {
+ File defaultProguardFile = android.getDefaultProguardFile(proguardFile.getName().get());
+ buildType.proguardFile(defaultProguardFile);
+ });
+ model.getProguardFiles().get().forEach(proguardFile -> {
+ buildType.proguardFile(proguardFile.getName().get());
+ });
  }
 
  @SuppressWarnings("UnstableApiUsage")

unified-prototype/unified-plugin/plugin-android/src/main/java/org/gradle/api/experimental/android/AndroidSoftwareBuildType.java

@@ -2,10 +2,15 @@
 
 import org.gradle.api.Action;
 import org.gradle.api.experimental.android.extensions.Minify;
+import org.gradle.api.model.ObjectFactory;
+import org.gradle.api.provider.ListProperty;
 import org.gradle.api.tasks.Nested;
+import org.gradle.declarative.dsl.model.annotations.Adding;
 import org.gradle.declarative.dsl.model.annotations.Configuring;
 import org.gradle.declarative.dsl.model.annotations.Restricted;
 
+import javax.inject.Inject;
+
 @Restricted
 public interface AndroidSoftwareBuildType {
  /**
@@ -20,4 +25,28 @@ public interface AndroidSoftwareBuildType {
  default void minify(Action<? super Minify> action) {
  action.execute(getMinify());
  }
+
+ ListProperty<ProguardFile> getProguardFiles();
+ ListProperty<ProguardFile> getDefaultProguardFiles();
+
+ @Adding
+ default ProguardFile proguardFile(Action<? super ProguardFile> configure) {
+ ProguardFile proguardFile = getObjectFactory().newInstance(ProguardFile.class);
+ proguardFile.getName().convention("<no name>");
+ configure.execute(proguardFile);
+ getProguardFiles().add(proguardFile);
+ return proguardFile;
+ }
+
+ @Adding
+ default ProguardFile defaultProguardFile(Action<? super ProguardFile> configure) {
+ ProguardFile proguardFile = getObjectFactory().newInstance(ProguardFile.class);
+ proguardFile.getName().convention("<no name>");
+ configure.execute(proguardFile);
+ getDefaultProguardFiles().add(proguardFile);
+ return proguardFile;
+ }
+
+ @Inject
+ ObjectFactory getObjectFactory();
 }

unified-prototype/unified-plugin/plugin-android/src/main/java/org/gradle/api/experimental/android/ProguardFile.java

@@ -0,0 +1,26 @@
+/*
+ * Copyright 2024 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.gradle.api.experimental.android;
+
+import org.gradle.api.provider.Property;
+import org.gradle.declarative.dsl.model.annotations.Restricted;
+
+@Restricted
+public interface ProguardFile {
+ @Restricted
+ Property<String> getName();
+}

unified-prototype/unified-plugin/plugin-android/src/main/java/org/gradle/api/experimental/android/extensions/testing/Roborazzi.java

@@ -0,0 +1,2 @@
+package org.gradle.api.experimental.android.extensions.testing;public interface Roborazzi {
+}

unified-prototype/unified-plugin/plugin-android/src/main/java/org/gradle/api/experimental/android/library/StandaloneAndroidLibraryPlugin.java

@@ -5,10 +5,8 @@
 import com.android.build.api.variant.LibraryAndroidComponentsExtension;
 import com.google.protobuf.gradle.ProtobufExtension;
 import org.gradle.api.Project;
-import org.gradle.api.artifacts.Configuration;
 import org.gradle.api.artifacts.ConfigurationContainer;
 import org.gradle.api.artifacts.Dependency;
-import org.gradle.api.artifacts.dsl.DependencyCollector;
 import org.gradle.api.experimental.android.AbstractAndroidSoftwarePlugin;
 import org.gradle.api.experimental.android.AndroidSoftware;
 import org.gradle.api.experimental.android.nia.NiaSupport;
@@ -118,19 +116,6 @@ private static String getProtocDepGAV(AndroidLibrary dslModel) {
  return protocDep.getGroup() + ":" + protocDep.getName() + ":" + protocDep.getVersion();
  }
 
- private File resolveSingleDependency(Project project, DependencyCollector dependencyCollector) {
- Configuration resolver = project.getConfigurations().detachedConfiguration();
- resolver.setCanBeResolved(true);
- resolver.fromDependencyCollector(dependencyCollector);
-
- Set<Dependency> deps = dependencyCollector.getDependencies().get();
- Preconditions.checkState(deps.size() == 1, "Should have a single dependency, but had: " + deps.size());
-
- Set<File> files = resolver.resolve();
- Preconditions.checkState(files.size() == 1, "Should have resolved a single file, but resolved: " + files.size());
- return files.iterator().next();
- }
-
  @SuppressWarnings("UnstableApiUsage")
  private void linkCommonDependencies(AndroidLibraryDependencies dependencies, ConfigurationContainer configurations) {
  super.linkCommonDependencies(dependencies, configurations);

unified-prototype/unified-plugin/plugin-android/src/main/java/org/gradle/api/experimental/android/nia/NiaSupport.java

@@ -81,7 +81,7 @@ public static void configureNiaApplication(Project project, AndroidApplication d
  testOptions.setAnimationsDisabled(true);
 
  configureBadgingTasks(project, androidAppComponents);
- configureDependencyGuard(project, dslModel, androidApp);
+ configureDependencyGuard(project, dslModel);
  }
 
  @SuppressWarnings("UnstableApiUsage")
@@ -341,8 +341,8 @@ private static void configureJacoco(Project project, AndroidSoftware dslModel, C
  JacocoPluginExtension jacocoPluginExtension = project.getExtensions().getByType(JacocoPluginExtension.class);
  jacocoPluginExtension.setToolVersion(dslModel.getTesting().getJacoco().getVersion().get());
 
- LibraryAndroidComponentsExtension androidLibComponents = project.getExtensions().getByType(LibraryAndroidComponentsExtension.class);
- androidLibComponents.onVariants(androidLibComponents.selector().all(), variant -> {
+ AndroidComponentsExtension<?, ?, ?> androidComponentsExtension = project.getExtensions().getByType(AndroidComponentsExtension.class);
+ androidComponentsExtension.onVariants(androidComponentsExtension.selector().all(), variant -> {
  final String testTaskName = "test" + StringUtils.capitalize(variant.getName()) + "UnitTest";
  final File buildDir = project.getLayout().getBuildDirectory().get().getAsFile();
  project.getTasks().register("jacoco" + StringUtils.capitalize(testTaskName) + "Report", JacocoReport.class, task -> {
@@ -382,7 +382,7 @@ private static void configureJacoco(Project project, AndroidSoftware dslModel, C
  }
  }
 
- private static void configureDependencyGuard(Project project, AndroidApplication dslModel, CommonExtension<?, ?, ?, ?, ?, ?> android) {
+ private static void configureDependencyGuard(Project project, AndroidApplication dslModel) {
  if (dslModel.getDependencyGuard().getEnabled().get()) {
  // Slight change of behavior here - NiA just applies this plugin to all applications, which seems unnecessary
  project.getPlugins().apply("com.dropbox.dependency-guard");