* Fix PlatformPlugin evaluating javacppPlatform too early (issue #8

)
bytedeco · Nov 8, 2020 · 8b97e37 · 8b97e37
1 parent 3bfc84a
commit 8b97e37
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,4 +1,5 @@
 
+ * Fix `PlatformPlugin` evaluating `javacppPlatform` too early ([issue #8](https://github.com/bytedeco/gradle-javacpp/issues/8))
  * Honor the `skip` property in `BuildTask` ([pull #7](https://github.com/bytedeco/gradle-javacpp/issues/7))
  * Add `BuildExtension` helper for `maven-publish` and update zlib sample project
  * Add builds for Android to zlib sample project ([issue #5](https://github.com/bytedeco/gradle-javacpp/issues/5))

diff --git a/src/main/java/org/bytedeco/gradle/javacpp/PlatformPlugin.java b/src/main/java/org/bytedeco/gradle/javacpp/PlatformPlugin.java
@@ -45,8 +45,10 @@ public class PlatformPlugin implements Plugin<Project> {
             project.getExtensions().getExtraProperties().set("javacppPlatform", Loader.Detector.getPlatform());
         }
 
-        project.getDependencies().getComponents().all(PlatformRule.class, rule -> {
-            rule.setParams(project.findProperty("javacppPlatform"));
+        project.afterEvaluate(p -> {
+            p.getDependencies().getComponents().all(PlatformRule.class, rule -> {
+                rule.setParams(p.findProperty("javacppPlatform"));
+            });
         });
     }
 }
diff --git a/src/test/java/org/bytedeco/gradle/javacpp/BuildPluginTest.java b/src/test/java/org/bytedeco/gradle/javacpp/BuildPluginTest.java
@@ -34,6 +34,7 @@ public class BuildPluginTest {
         project.getPlugins().apply("org.bytedeco.gradle-javacpp-build");
 
         assertEquals(Loader.Detector.getPlatform(), project.findProperty("javacppPlatform"));
+        assertTrue(project.getExtensions().findByName("javacppBuild") instanceof BuildExtension);
         assertNotNull(project.getTasks().findByName("javacppBuildCommand"));
         assertNotNull(project.getTasks().findByName("javacppCompileJava"));
         assertNotNull(project.getTasks().findByName("javacppBuildParser"));

diff --git a/src/test/java/org/bytedeco/gradle/javacpp/PlatformPluginTest.java b/src/test/java/org/bytedeco/gradle/javacpp/PlatformPluginTest.java
@@ -28,6 +28,7 @@
 import org.gradle.api.Project;
 import org.gradle.api.artifacts.dsl.ComponentMetadataHandler;
 import org.gradle.api.internal.artifacts.dsl.DefaultComponentMetadataHandler;
+import org.gradle.api.internal.project.DefaultProject;
 import org.junit.Test;
 import static org.junit.Assert.*;
 
@@ -38,6 +39,10 @@ public class PlatformPluginTest {
         project.getPlugins().apply("org.bytedeco.gradle-javacpp-platform");
 
         assertEquals(Loader.Detector.getPlatform(), project.findProperty("javacppPlatform"));
+        project.getExtensions().getExtraProperties().set("javacppPlatform", "linux-armhf,linux-arm64");
+        ((DefaultProject)project).evaluate();
+        assertEquals("linux-armhf,linux-arm64", project.findProperty("javacppPlatform"));
+
         ComponentMetadataHandler h = project.getDependencies().getComponents();
         Field f = DefaultComponentMetadataHandler.class.getDeclaredField("metadataRuleContainer");
         f.setAccessible(true);