implab/gradle-common Commit - r54:3469331e3c4b

variants: enforce source configuration policies

cin -

r54:3469331e3c4b default

parent child

Context file:

r54:3469331e3c4b

Collapse all files

variants/src/main/java/org/implab/gradle/variants/VariantSourcesPlugin.java +3 -2

                          // create registries
                          var sourceSetRegistry = new SourceSetRegistry(objectFactory);
+                         lateConfigurationPolicy.finalizePolicy();
                          var sourceSetConfiguration = new SourceSetConfigurationRegistry(lateConfigurationPolicy::mode);
                          // build compile unit namer
                      return variants.getLayers().stream()
                              .filter(named(name))
                              .findAny()
-                             .orElseThrow(() -> new IllegalArgumentException("Layer '" + name + "' isn't declared"));
+                             .orElseThrow(() -> new InvalidUserDataException("Layer '" + name + "' isn't declared"));
                  }
                  private static Variant resolveVariant(VariantsView variants, String name) {
                      return variants.getVariants().stream()
                              .filter(named(name))
                              .findAny()
-                             .orElseThrow(() -> new IllegalArgumentException("Variant '" + name + "' is't declared"));
+                             .orElseThrow(() -> new InvalidUserDataException("Variant '" + name + "' isn't declared"));
                  }
                  private static CompileUnit resolveCompileUnit(VariantSourcesContext ctx, String variantName, String layerName) {

variants/src/main/java/org/implab/gradle/variants/sources/VariantSourcesExtension.java +4 -1

                   * <li>it must be selected before the first selector rule is registered via
                   * {@link #variant(String, Action)}, {@link #layer(String, Action)} or
                   * {@link #unit(String, String, Action)};</li>
-                  * <li>once selected, it cannot be changed later;</li>
+                  * <li>it must be selected before the finalized context becomes observable via
+                  * {@link #whenFinalized(Action)};</li>
+                  * <li>once selected or once the finalized context is being created, it cannot
+                  * be changed later;</li>
                   * <li>the policy controls both diagnostics and late-application semantics.</li>
                   * </ul>
                   *

variants/src/main/java/org/implab/gradle/variants/sources/internal/DefaultLateConfigurationPolicySpec.java +1 0

                  private boolean policyApplied = false;
                  public LateConfigurationMode mode() {
+                     finalizePolicy();
                      return policyMode;
                  }

variants/src/test/java/org/implab/gradle/variants/VariantSourcesPluginFunctionalTest.java +24 -1

                              }
                              """);
-                     assertBuildFails("Variant 'missing' is't declared", "help");
+                     assertBuildFails("Variant 'missing' isn't declared", "help");
                  }
                  @Test
                      assertBuildFails("Naming policy already applied", "help");
                  }
+                 @Test
+                 void rejectsChangingLateConfigurationPolicyAfterContextBecomesObservable() throws Exception {
+                     writeSettings("variant-sources-late-policy-context-fixed");
+                     writeBuildFile("""
+                             apply plugin: org.implab.gradle.variants.VariantSourcesPlugin
+                             def variantsExt = extensions.getByType(org.implab.gradle.variants.core.VariantsExtension)
+                             variantsExt.layers.create('main')
+                             variantsExt.roles.create('production')
+                             variantsExt.variant('browser') {
+                                 role('production') { layers('main') }
+                             }
+                             variantSources.whenFinalized {
+                                 variantSources.lateConfigurationPolicy {
+                                     allowLateConfiguration()
+                                 }
+                             }
+                             """);
+                     assertBuildFails("Lazy configuration policy already applied", "help");
+                 }
              }

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages