simplify publish model for photon-lib

PhotonVision · Nov 19, 2023 · f48e655 · f48e655
1 parent 0364e14
commit f48e655
Showing 1 changed file with 14 additions and 15 deletions.
diff --git a/photon-lib/build.gradle b/photon-lib/build.gradle
@@ -70,22 +70,11 @@ cppHeadersZip {
     }
 }
 
-model {
-    components {
-        all {
-            it.sources.each {
-                it.exportedHeaders {
-                    srcDirs "src/main/native/include"
-                    srcDirs "src/generate/native/include"
-                }
-            }
-        }
-    }
-}
-
 def photonlibFileInput = file("src/generate/photonlib.json.in")
 ext.photonlibFileOutput = file("$buildDir/generated/vendordeps/photonlib.json")
 
+def vendorJson = artifacts.add('archives', file("$photonlibFileOutput"))
+
 task generateVendorJson() {
     description = "Generates the vendor JSON file"
     group = "PhotonVision"
@@ -121,9 +110,19 @@ task writeCurrentVersion {
 
 build.mustRunAfter writeCurrentVersion
 
-def vendorJson = artifacts.add('archives', file("$photonlibFileOutput"))
-
 model {
+    components {
+        all {
+            it.sources.each {
+                it.exportedHeaders {
+                    srcDirs "src/main/native/include"
+                    srcDirs "src/generate/native/include"
+                }
+            }
+        }
+    }
+
+    // Publish the vendordep json
     publishing {
         publications {
             vendorjson(MavenPublication) {