diff --git a/unified-prototype/gradle/wrapper/gradle-wrapper.properties b/unified-prototype/gradle/wrapper/gradle-wrapper.properties index cf738f2..1be4b96 100644 --- a/unified-prototype/gradle/wrapper/gradle-wrapper.properties +++ b/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 diff --git a/unified-prototype/unified-plugin/plugin-android/src/main/java/org/gradle/api/experimental/android/AbstractAndroidSoftwarePlugin.java b/unified-prototype/unified-plugin/plugin-android/src/main/java/org/gradle/api/experimental/android/AbstractAndroidSoftwarePlugin.java index 13392de..4ea95c1 100644 --- a/unified-prototype/unified-plugin/plugin-android/src/main/java/org/gradle/api/experimental/android/AbstractAndroidSoftwarePlugin.java +++ b/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())); } } diff --git a/unified-prototype/unified-plugin/plugin-android/src/main/java/org/gradle/api/experimental/android/extensions/Secrets.java b/unified-prototype/unified-plugin/plugin-android/src/main/java/org/gradle/api/experimental/android/extensions/Secrets.java index 6c74017..d810ead 100644 --- a/unified-prototype/unified-plugin/plugin-android/src/main/java/org/gradle/api/experimental/android/extensions/Secrets.java +++ b/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 getEnabled(); @Restricted - Property getDefaultPropertiesFileName(); + RegularFileProperty getDefaultPropertiesFile(); } diff --git a/unified-prototype/unified-plugin/plugin-android/src/main/java/org/gradle/api/experimental/android/library/AndroidLibrary.java b/unified-prototype/unified-plugin/plugin-android/src/main/java/org/gradle/api/experimental/android/library/AndroidLibrary.java index 5aa3ec2..1b96108 100644 --- a/unified-prototype/unified-plugin/plugin-android/src/main/java/org/gradle/api/experimental/android/library/AndroidLibrary.java +++ b/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 action) { // TODO:DG We really want to model a list of consumer proguard files here, but can't yet @Restricted - Property getConsumerProguardFile(); + RegularFileProperty getConsumerProguardFile(); @Nested Protobuf getProtobuf();