Skip to content

Commit aaee580

Browse files
committed
Remove java library
Has been replaced in allwpilib
1 parent 9eb96d7 commit aaee580

File tree

2 files changed

+4
-216
lines changed

2 files changed

+4
-216
lines changed

build.gradle

+4-32
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
plugins {
22
id 'base'
3-
id 'java'
43
id 'maven-publish'
5-
id 'ru.vyarus.use-python' version '1.2.0'
64
}
75

86
publishing {
@@ -16,14 +14,6 @@ publishing {
1614
}
1715
}
1816

19-
def genNetcomm = tasks.register('generateNetcomm', PythonTask) {
20-
inputs.file "$rootDir/gen/wpilibj_frcnetcomm.py"
21-
outputs.file "$rootDir/src/main/java/edu/wpi/first/wpilibj/hal/FRCNetComm.java"
22-
23-
command = "gen/wpilibj_frcnetcomm.py"
24-
}
25-
26-
compileJava.dependsOn genNetcomm
2717

2818
def allOutputsFolder = file("$buildDir/allOutputs")
2919

@@ -39,17 +29,14 @@ ext.addTaskToCopyAllOutputs = { task ->
3929
copyAllOutputs.from task.archivePath
4030
}
4131

42-
def pubVersion = '2018.17.0'
32+
def pubVersion = '2018.17.1'
4333

4434
def baseArtifactId = 'chipobject'
4535
def artifactGroupId = 'edu.wpi.first.ni-libraries'
4636
def zipBaseName = '_GROUP_edu_wpi_first_ni-libraries_ID_chipobject_CLS'
4737

48-
def netcommBaseArtifactId = 'netcomm-cpp'
49-
def netcommZipBaseName = '_GROUP_edu_wpi_first_ni-libraries_ID_netcomm-cpp_CLS'
50-
51-
def netcommJavaBaseArtifactId = 'netcomm-java'
52-
def netcommJavaZipBaseName = '_GROUP_edu_wpi_first_ni-libraries_ID_netcomm-java_CLS'
38+
def netcommBaseArtifactId = 'netcomm'
39+
def netcommZipBaseName = '_GROUP_edu_wpi_first_ni-libraries_ID_netcomm_CLS'
5340

5441
def outputsFolder = file("$project.buildDir/outputs")
5542

@@ -115,23 +102,15 @@ task netCommHeaders(type: Zip) {
115102
}
116103
}
117104

118-
task outputJar(type: Jar, dependsOn: classes) {
119-
baseName netcommJavaZipBaseName
120-
destinationDir outputsFolder
121-
from sourceSets.main.output
122-
}
123-
124105
build.dependsOn netCommLib
125106
build.dependsOn headersZip
126107
build.dependsOn netCommHeaders
127108
build.dependsOn libZip
128-
build.dependsOn outputJar
129109

130110
addTaskToCopyAllOutputs(netCommLib)
131111
addTaskToCopyAllOutputs(headersZip)
132112
addTaskToCopyAllOutputs(libZip)
133113
addTaskToCopyAllOutputs(netCommHeaders)
134-
addTaskToCopyAllOutputs(outputJar)
135114

136115
publishing {
137116
publications {
@@ -143,21 +122,14 @@ publishing {
143122
groupId artifactGroupId
144123
version pubVersion
145124
}
146-
netcommCpp(MavenPublication) {
125+
netcomm(MavenPublication) {
147126
artifact netCommLib
148127
artifact netCommHeaders
149128

150129
artifactId = "${netcommBaseArtifactId}"
151130
groupId artifactGroupId
152131
version pubVersion
153132
}
154-
netcommJava(MavenPublication) {
155-
artifact outputJar
156-
157-
artifactId = "${netcommJavaBaseArtifactId}"
158-
groupId artifactGroupId
159-
version pubVersion
160-
}
161133
}
162134
}
163135

gen/wpilibj_frcnetcomm.py

-184
This file was deleted.

0 commit comments

Comments
 (0)