diff --git a/src/main/groovy/wooga/gradle/paket/unity/PaketUnityPluginExtension.groovy b/src/main/groovy/wooga/gradle/paket/unity/PaketUnityPluginExtension.groovy index 116743c..41074ec 100644 --- a/src/main/groovy/wooga/gradle/paket/unity/PaketUnityPluginExtension.groovy +++ b/src/main/groovy/wooga/gradle/paket/unity/PaketUnityPluginExtension.groovy @@ -18,6 +18,7 @@ package wooga.gradle.paket.unity import org.gradle.api.file.FileCollection +import org.gradle.api.provider.Provider import wooga.gradle.paket.base.PaketPluginExtension import wooga.gradle.paket.unity.internal.AssemblyDefinitionFileStrategy @@ -76,5 +77,16 @@ interface PaketUnityPluginExtension extends PaketPluginExtension, PaketUpmPackag * Sets list of pre-installed upm package id's, that should not be modified by the PaketUnityInstall task * @param preInstalledPackages */ - void setPreInstalledUpmPackages(List preInstalledPackages); -} + void setPreInstalledUpmPackages(List preInstalledPackages) + + /** + * Sets list of pre-installed upm package id's, that should not be modified by the PaketUnityInstall task + * @param preInstalledPackages + */ + void setPreInstalledUpmPackages(Provider> value) + + /** + * @return A list of pre-installed upm package id's, that should not be modified by the PaketUnityInstall task + */ + Provider> getPreInstalledUpmPackagesProvider() +} \ No newline at end of file diff --git a/src/main/groovy/wooga/gradle/paket/unity/internal/DefaultPaketUnityPluginExtension.groovy b/src/main/groovy/wooga/gradle/paket/unity/internal/DefaultPaketUnityPluginExtension.groovy index c97e69a..7c9786f 100644 --- a/src/main/groovy/wooga/gradle/paket/unity/internal/DefaultPaketUnityPluginExtension.groovy +++ b/src/main/groovy/wooga/gradle/paket/unity/internal/DefaultPaketUnityPluginExtension.groovy @@ -19,6 +19,8 @@ package wooga.gradle.paket.unity.internal import org.gradle.api.Project import org.gradle.api.file.FileCollection +import org.gradle.api.provider.ListProperty +import org.gradle.api.provider.Provider import wooga.gradle.paket.base.dependencies.PaketDependencyHandler import wooga.gradle.paket.base.internal.DefaultPaketPluginExtension import wooga.gradle.paket.unity.PaketUnityPluginExtension @@ -33,11 +35,11 @@ class DefaultPaketUnityPluginExtension extends DefaultPaketPluginExtension imple protected AssemblyDefinitionFileStrategy assemblyDefinitionFileStrategy protected String customPaketOutputDirectory protected Boolean includeAssemblyDefinitions = false - protected List preInstalledUpmPackages + protected ListProperty preInstalledUpmPackages DefaultPaketUnityPluginExtension(Project project,final PaketDependencyHandler dependencyHandler) { super(project, dependencyHandler) - assemblyDefinitionFileStrategy + preInstalledUpmPackages = project.objects.listProperty(String) } @Override @@ -78,15 +80,24 @@ class DefaultPaketUnityPluginExtension extends DefaultPaketPluginExtension imple } @Override - List getPreInstalledUpmPackages() - { - preInstalledUpmPackages + List getPreInstalledUpmPackages() { + preInstalledUpmPackages.getOrElse([]) } @Override - void setPreInstalledUpmPackages(List value) - { - preInstalledUpmPackages = value + void setPreInstalledUpmPackages(List value) { + preInstalledUpmPackages.set(value) } + @Override + void setPreInstalledUpmPackages(Provider> value) { + preInstalledUpmPackages.set(value) + } + + @Override + Provider> getPreInstalledUpmPackagesProvider() { + preInstalledUpmPackages + } + + }