adds provider API setter/getters for setting the preinstalled upm pac…

…akges in the paket plugin extension (#102)
wooga · Oct 4, 2023 · 1f0dab6 · 1f0dab6
1 parent dd1b078
commit 1f0dab6
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 10 deletions.
diff --git 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<String> preInstalledPackages);
-}
+    void setPreInstalledUpmPackages(List<String> preInstalledPackages)
+
+    /**
+     * Sets list of pre-installed upm package id's, that should not be modified by the PaketUnityInstall task
+     * @param preInstalledPackages
+     */
+    void setPreInstalledUpmPackages(Provider<List<String>> value)
+
+    /**
+     * @return A list of pre-installed upm package id's, that should not be modified by the PaketUnityInstall task
+     */
+    Provider<List<String>> getPreInstalledUpmPackagesProvider()
+}
diff --git 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<String> preInstalledUpmPackages
+    protected ListProperty<String> 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<String> getPreInstalledUpmPackages()
-    {
-        preInstalledUpmPackages
+    List<String> getPreInstalledUpmPackages() {
+        preInstalledUpmPackages.getOrElse([])
     }
 
     @Override
-    void setPreInstalledUpmPackages(List<String> value)
-    {
-        preInstalledUpmPackages = value
+    void setPreInstalledUpmPackages(List<String> value) {
+        preInstalledUpmPackages.set(value)
     }
 
+    @Override
+    void setPreInstalledUpmPackages(Provider<List<String>> value) {
+        preInstalledUpmPackages.set(value)
+    }
+
+    @Override
+    Provider<List<String>> getPreInstalledUpmPackagesProvider() {
+        preInstalledUpmPackages
+    }
+
+
 }