Merge pull request #157 from gradle/jb/convert-file-properties

Convert some file name string properties to RegularFileProperty

Author: jbartok

unified-prototype/gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions-snapshots/gradle-8.12-20241105002153+0000-bin.zip
+distributionUrl=https\://services.gradle.org/distributions-snapshots/gradle-8.13-20250127102731+0000-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

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

@@ -149,7 +149,7 @@ protected void configureSecrets(Project project, AndroidSoftware dslModel) {
             project.getPlugins().apply("com.google.android.libraries.mapsplatform.secrets-gradle-plugin");
 
             SecretsPluginExtension secrets = project.getExtensions().getByType(SecretsPluginExtension.class);
-            ifPresent(dslModel.getSecrets().getDefaultPropertiesFileName(), secrets::setDefaultPropertiesFileName);
+            ifPresent(dslModel.getSecrets().getDefaultPropertiesFile(), file -> secrets.setDefaultPropertiesFileName(file.getAsFile().getName()));
         }
     }
 

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

@@ -1,5 +1,6 @@
 package org.gradle.api.experimental.android.extensions;
 
+import org.gradle.api.file.RegularFileProperty;
 import org.gradle.api.provider.Property;
 import org.gradle.declarative.dsl.model.annotations.Restricted;
 
@@ -9,5 +10,5 @@ public interface Secrets {
     Property<Boolean> getEnabled();
 
     @Restricted
-    Property<String> getDefaultPropertiesFileName();
+    RegularFileProperty getDefaultPropertiesFile();
 }

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

@@ -18,6 +18,7 @@
 
 import org.gradle.api.Action;
 import org.gradle.api.experimental.android.AndroidSoftware;
+import org.gradle.api.file.RegularFileProperty;
 import org.gradle.api.provider.Property;
 import org.gradle.api.experimental.android.extensions.Protobuf;
 import org.gradle.api.tasks.Nested;
@@ -46,7 +47,7 @@ default void buildTypes(Action<? super AndroidLibraryBuildTypes> action) {
 
     // TODO:DG We really want to model a list of consumer proguard files here, but can't yet
     @Restricted
-    Property<String> getConsumerProguardFile();
+    RegularFileProperty getConsumerProguardFile();
 
     @Nested
     Protobuf getProtobuf();