[build] Make devImplementation inherit from implementation (#5450)

Remove manually adding dependencies to devImplementation.
Fix wpilibNewCommands devMain package.
This commit is contained in:
Joseph Eng
2023-07-17 17:19:03 -07:00
committed by GitHub
parent 9b8d90b852
commit daf022d3da
5 changed files with 5 additions and 20 deletions

View File

@@ -35,7 +35,6 @@ apply from: "${rootDir}/shared/opencv.gradle"
dependencies {
implementation project(':wpimath')
devImplementation project(':wpimath')
}
sourceSets {

View File

@@ -14,10 +14,6 @@ dependencies {
implementation project(':wpinet')
implementation project(':ntcore')
implementation project(':cscore')
devImplementation project(':wpiutil')
devImplementation project(':wpinet')
devImplementation project(':ntcore')
devImplementation project(':cscore')
}
ext {

View File

@@ -96,6 +96,10 @@ sourceSets {
dev
}
configurations {
devImplementation.extendsFrom(implementation)
}
tasks.withType(JavaCompile).configureEach {
options.compilerArgs = [
'--release',

View File

@@ -1,6 +1,6 @@
ext {
nativeName = 'wpilibNewCommands'
devMain = 'edu.wpi.first.wpilibj.commands.DevMain'
devMain = 'edu.wpi.first.wpilibj2.commands.DevMain'
}
evaluationDependsOn(':ntcore')
@@ -21,13 +21,6 @@ dependencies {
implementation project(':hal')
implementation project(':wpimath')
implementation project(':wpilibj')
devImplementation project(':wpiutil')
devImplementation project(':wpinet')
devImplementation project(':ntcore')
devImplementation project(':cscore')
devImplementation project(':hal')
devImplementation project(':wpimath')
devImplementation project(':wpilibj')
testImplementation 'org.mockito:mockito-core:4.1.0'
}

View File

@@ -70,13 +70,6 @@ dependencies {
implementation project(':cscore')
implementation project(':cameraserver')
testImplementation 'org.mockito:mockito-core:4.1.0'
devImplementation project(':hal')
devImplementation project(':wpiutil')
devImplementation project(':wpinet')
devImplementation project(':wpimath')
devImplementation project(':ntcore')
devImplementation project(':cscore')
devImplementation project(':cameraserver')
devImplementation sourceSets.main.output
}