1
1
plugins {
2
2
id ' base'
3
- id ' java'
4
3
id ' maven-publish'
5
- id ' ru.vyarus.use-python' version ' 1.2.0'
6
4
}
7
5
8
6
publishing {
@@ -16,14 +14,6 @@ publishing {
16
14
}
17
15
}
18
16
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
27
17
28
18
def allOutputsFolder = file(" $buildDir /allOutputs" )
29
19
@@ -39,17 +29,14 @@ ext.addTaskToCopyAllOutputs = { task ->
39
29
copyAllOutputs. from task. archivePath
40
30
}
41
31
42
- def pubVersion = ' 2018.17.0 '
32
+ def pubVersion = ' 2018.17.1 '
43
33
44
34
def baseArtifactId = ' chipobject'
45
35
def artifactGroupId = ' edu.wpi.first.ni-libraries'
46
36
def zipBaseName = ' _GROUP_edu_wpi_first_ni-libraries_ID_chipobject_CLS'
47
37
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'
53
40
54
41
def outputsFolder = file(" $project . buildDir /outputs" )
55
42
@@ -115,23 +102,15 @@ task netCommHeaders(type: Zip) {
115
102
}
116
103
}
117
104
118
- task outputJar (type : Jar , dependsOn : classes) {
119
- baseName netcommJavaZipBaseName
120
- destinationDir outputsFolder
121
- from sourceSets. main. output
122
- }
123
-
124
105
build. dependsOn netCommLib
125
106
build. dependsOn headersZip
126
107
build. dependsOn netCommHeaders
127
108
build. dependsOn libZip
128
- build. dependsOn outputJar
129
109
130
110
addTaskToCopyAllOutputs(netCommLib)
131
111
addTaskToCopyAllOutputs(headersZip)
132
112
addTaskToCopyAllOutputs(libZip)
133
113
addTaskToCopyAllOutputs(netCommHeaders)
134
- addTaskToCopyAllOutputs(outputJar)
135
114
136
115
publishing {
137
116
publications {
@@ -143,21 +122,14 @@ publishing {
143
122
groupId artifactGroupId
144
123
version pubVersion
145
124
}
146
- netcommCpp (MavenPublication ) {
125
+ netcomm (MavenPublication ) {
147
126
artifact netCommLib
148
127
artifact netCommHeaders
149
128
150
129
artifactId = " ${ netcommBaseArtifactId} "
151
130
groupId artifactGroupId
152
131
version pubVersion
153
132
}
154
- netcommJava(MavenPublication ) {
155
- artifact outputJar
156
-
157
- artifactId = " ${ netcommJavaBaseArtifactId} "
158
- groupId artifactGroupId
159
- version pubVersion
160
- }
161
133
}
162
134
}
163
135
0 commit comments