Merge branch 'debazel' into debazel-actions

Mechanical-Advantage · Nov 30, 2024 · 6139021 · 6139021
2 parents 4ebd0b7 + ec84223
commit 6139021
Showing 1 changed file with 17 additions and 14 deletions.
diff --git a/akit/publish.gradle b/akit/publish.gradle
@@ -77,6 +77,7 @@ model {
     publishing {
         def wpilibioTaskList = createComponentZipTasks($.components, ['wpilibio'], wpilibioZipBaseName, Zip, project, includeStandardZipFormat)
         println(wpilibioTaskList)
+        def skipJava = project.hasProperty("skipJava")
         publications {
             wpilibio(MavenPublication) {
                 wpilibioTaskList.each {
@@ -88,23 +89,25 @@ model {
                 version pubVersion
             }
 
-            java(MavenPublication) {
-                artifact jar
-                artifact sourcesJar
-                artifact javadocJar
+            if (!skipJava) {
+                java(MavenPublication) {
+                    artifact jar
+                    artifact sourcesJar
+                    artifact javadocJar
 
-                artifactId = javaArtifactId
-                groupId artifactGroupId
-                version pubVersion
-            }
+                    artifactId = javaArtifactId
+                    groupId artifactGroupId
+                    version pubVersion
+                }
 
-            autolog(MavenPublication) {
-                artifact project(":autolog").jar
+                autolog(MavenPublication) {
+                    artifact project(":autolog").jar
 
-                artifactId = "junction-autolog"
-                groupId "${artifactGroupId}.junction"
-                version pubVersion
+                    artifactId = "junction-autolog"
+                    groupId "${artifactGroupId}.junction"
+                    version pubVersion
+                }
             }
         }
     }
-}
+}