Merge pull request #58 from CommonWealthRobotics/kh/fix-build-script-compatibility

madhephaestus · web-flow · commit 73df4fc1f867 · 2025-12-28T14:58:34.000-05:00
Repair the CI build of bowlerstudio from the update
diff --git a/build.gradle b/build.gradle
@@ -1,9 +1,18 @@
+buildscript {
+
+	dependencies {
+		classpath 'com.gradleup.shadow:shadow-gradle-plugin:8.3.9'
+	}
+}
+
 plugins {
     id 'java'
-    id 'java-library'
     id 'signing'
     id 'maven-publish'
-    id 'com.gradleup.shadow' version '8.3.9'
+	id 'java-library'
+}
+if (project == rootProject) {
+	apply plugin: 'com.gradleup.shadow'
 }
 
 tasks.withType(JavaCompile).configureEach {
@@ -296,7 +305,7 @@ jar {
 				)
 	}
 }
-
+if (project == rootProject) {
 shadowJar {
 	zip64 true
 	//mainClassName = 'com.neuronrobotics.bowlerstudio.BowlerKernel'
@@ -310,6 +319,7 @@ shadowJar {
 	}
 	mergeServiceFiles()
 }
+}
 
 group = "com.neuronrobotics"
 

Original file line number	Diff line number	Diff line change
`@@ -1,9 +1,18 @@`
	`1`	`+buildscript {`
	`2`	`+`
	`3`	`+ dependencies {`
	`4`	`+ classpath 'com.gradleup.shadow:shadow-gradle-plugin:8.3.9'`
	`5`	`+ }`
	`6`	`+}`
	`7`	`+`
`1`	`8`	`plugins {`
`2`	`9`	`id 'java'`
`3`		`- id 'java-library'`
`4`	`10`	`id 'signing'`
`5`	`11`	`id 'maven-publish'`
`6`		`- id 'com.gradleup.shadow' version '8.3.9'`
	`12`	`+ id 'java-library'`
	`13`	`+}`
	`14`	`+if (project == rootProject) {`
	`15`	`+ apply plugin: 'com.gradleup.shadow'`
`7`	`16`	`}`
`8`	`17`
`9`	`18`	`tasks.withType(JavaCompile).configureEach {`
`@@ -296,7 +305,7 @@ jar {`
`296`	`305`	`)`
`297`	`306`	`}`
`298`	`307`	`}`
`299`		`-`
	`308`	`+if (project == rootProject) {`
`300`	`309`	`shadowJar {`
`301`	`310`	`zip64 true`
`302`	`311`	`//mainClassName = 'com.neuronrobotics.bowlerstudio.BowlerKernel'`
`@@ -310,6 +319,7 @@ shadowJar {`
`310`	`319`	`}`
`311`	`320`	`mergeServiceFiles()`
`312`	`321`	`}`
	`322`	`+}`
`313`	`323`
`314`	`324`	`group = "com.neuronrobotics"`
`315`	`325`