Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

#

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Convert some file name string properties to RegularFileProperty #157

Merged
merged 2 commits into from
Jan 27, 2025
Merged

Convert some file name string properties to RegularFileProperty #157

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
82ff31c
Convert some file based properties
jbartok Jan 16, 2025
add1ba1
Upgrade Gradle Wrapper to fix a bug
jbartok Jan 27, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion unified-prototype/gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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-20250116001458+0000-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down
2 changes: 1 addition & 1 deletion ...roid/src/main/java/org/gradle/api/experimental/android/AbstractAndroidSoftwarePlugin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()));
}
}

Expand Down
3 changes: 2 additions & 1 deletion .../plugin-android/src/main/java/org/gradle/api/experimental/android/extensions/Secrets.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;

Expand All @@ -9,5 +10,5 @@ public interface Secrets {
Property<Boolean> getEnabled();

@Restricted
Property<String> getDefaultPropertiesFileName();
RegularFileProperty getDefaultPropertiesFile();
}
3 changes: 2 additions & 1 deletion ...gin-android/src/main/java/org/gradle/api/experimental/android/library/AndroidLibrary.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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();
Expand Down
Loading