Skip to content

Commit faae775

Browse files
committed
Properly add EOCVSimBuildInfo to the source set
1 parent db8c0f5 commit faae775

2 files changed

Lines changed: 41 additions & 37 deletions

File tree

EOCV-Sim/build.gradle

Lines changed: 40 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
import groovy.json.JsonOutput
12
import io.github.fvarrui.javapackager.gradle.PackageTask
23

34
import java.time.LocalDateTime
@@ -16,12 +17,46 @@ apply from: '../build.common.gradle'
1617

1718
ext.kotest_version = '5.7.2'
1819

19-
def generatedResourcesDir = layout.buildDirectory.dir("generated/resources/buildinfo/main")
20+
def generatedResourcesDirProvider =
21+
layout.buildDirectory.dir("generated/resources/buildinfo/main")
22+
23+
tasks.register('writeBuildInfoJson') {
24+
outputs.dir(generatedResourcesDirProvider)
25+
26+
doLast {
27+
String date = DateTimeFormatter.ofPattern("yyyy-M-d hh:mm:ss")
28+
.format(LocalDateTime.now())
29+
30+
def outputDir = generatedResourcesDirProvider.get().asFile
31+
outputDir.mkdirs()
32+
33+
def buildInfo = [
34+
versionString : "$version",
35+
standardVersionString: "$standardVersion",
36+
buildDate : date,
37+
isDev : version.toString().contains("dev"),
38+
packagePlatform : "${wpilibTools.currentPlatform.platformName}",
39+
opencvVersion : "$opencvVersion",
40+
paperVisionVersion : "$papervision_version"
41+
]
42+
43+
def versionFile = new File(outputDir, "EOCVSimBuildInfo.json")
44+
45+
versionFile.text =
46+
JsonOutput.prettyPrint(
47+
groovy.json.JsonOutput.toJson(buildInfo)
48+
) + System.lineSeparator()
49+
}
50+
}
51+
52+
def generatedResourcesDir = files(
53+
generatedResourcesDirProvider
54+
).builtBy(tasks.named("writeBuildInfoJson"))
2055

2156
sourceSets {
2257
main {
2358
resources {
24-
srcDir generatedResourcesDir
59+
srcDir(generatedResourcesDir)
2560
}
2661
}
2762

@@ -171,38 +206,7 @@ dependencies {
171206
implementation 'org.jboss.shrinkwrap.resolver:shrinkwrap-resolver-depchain:3.3.3'
172207
implementation 'org.jboss.shrinkwrap.resolver:shrinkwrap-resolver-impl-maven-archive:3.3.2'
173208

174-
implementation('org.deltacv.visionloop:streaming:1.2.9') { transitive = false }
175-
}
176-
177-
tasks.register('writeBuildInfoJson') {
178-
outputs.dir(generatedResourcesDir)
179-
180-
doLast {
181-
String date = DateTimeFormatter.ofPattern("yyyy-M-d hh:mm:ss").format(LocalDateTime.now())
182-
183-
def outputDir = file(generatedResourcesDir.get().asFile)
184-
outputDir.mkdirs()
185-
186-
def buildInfo = [
187-
versionString : "$version",
188-
standardVersionString: "$standardVersion",
189-
buildDate : date,
190-
isDev : version.toString().contains("dev"),
191-
packagePlatform : "${wpilibTools.currentPlatform.platformName}",
192-
opencvVersion : "$opencvVersion",
193-
paperVisionVersion : "$papervision_version"
194-
]
195-
196-
def versionFile = file("${outputDir}/EOCVSimBuildInfo.json")
197-
versionFile.text = groovy.json.JsonOutput.prettyPrint(groovy.json.JsonOutput.toJson(buildInfo)) + System.lineSeparator()
209+
implementation('org.deltacv.visionloop:streaming:1.2.9') {
210+
transitive = false
198211
}
199-
}
200-
201-
tasks.named('processResources') {
202-
dependsOn writeBuildInfoJson
203-
}
204-
205-
tasks.named('sourcesJar') {
206-
dependsOn writeBuildInfoJson
207-
}
208-
212+
}

EOCV-Sim/src/main/java/com/github/serivesmejia/eocvsim/util/exception/handling/CrashReportOutputMain.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ object CrashReportOutputMain {
3636

3737
try {
3838
val crashContent = SysUtil.loadFileStr(file)
39-
CrashReportOutput(null, crashContent ?: "")
39+
CrashReportOutput(crashContent ?: "")
4040
} catch (e: Exception) {
4141
System.err.println("Failed to display crash report: ${e.message}")
4242
e.printStackTrace()

0 commit comments

Comments
 (0)