Commit9a452ec

committed

Merge remote-tracking branch 'origin/sysfs_perf2' into channelBattery

2 parentsb8ceb74 +40bc3fe commit9a452ecCopy full SHA for 9a452ec

File tree

+4844

-8

lines changed

+4844

-8

lines changed

Lines changed: 8 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -39,14 +39,21 @@ dependencies {`
`39`	`39`	`api("com.github.ev3dev-lang-java:lejos-commons:0.7.3")`
`40`	`40`	`api("net.java.dev.jna:jna:4.5.2")`
`41`	`41`
`42`		`- testImplementation("ch.qos.logback:logback-classic:1.2.3")`
	`42`	`+ implementation("org.slf4j:slf4j-simple:1.7.25")`
	`43`	`+`
	`44`	`+//testImplementation("ch.qos.logback:logback-classic:1.2.3")`
`43`	`45`	`testImplementation("commons-io:commons-io:2.5")`
`44`	`46`
`45`	`47`	`//TODO: Upgrade to JUnit 5`
`46`	`48`	`testImplementation("junit:junit:4.12")`
`47`	`49`	`//TODO: Review to add Mockito support`
`48`	`50`	`testImplementation("org.hamcrest:hamcrest-all:1.3")`
`49`	`51`	`testImplementation("org.assertj:assertj-core:3.18.1")`
	`52`	`+`
	`53`	`+//TODO: Later this dependencies will be for test only testImplementation`
	`54`	`+ api("org.openjdk.jmh:jmh-core:1.26")`
	`55`	`+ annotationProcessor("org.openjdk.jmh:jmh-generator-annprocess:1.26")`
	`56`	`+`
`50`	`57`	`}`
`51`	`58`
`52`	`59`	`compileJava.options.encoding='UTF-8'`

Lines changed: 2 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -30,6 +30,7 @@`
`30`	`30`	`\|.*/EV3IRSensor.java\|`
`31`	`31`	`\|.*/EV3Key.java\|`
`32`	`32`	`\|.*/Battery.java\|`
	`33`	`+ \|.*/BatteryOld.java\|`
`33`	`34`	`\|.*/BaseRegulatedMotor.java\|`
`34`	`35`	`\|.*/RGBFramebufferProvider.java" />`
`35`	`36`	`<suppresschecks="TypeName"`
`@@ -47,6 +48,7 @@`
`47`	`48`	`\|.*/Sound.java\|`
`48`	`49`	`\|.*/EV3Led.java\|`
`49`	`50`	`\|.*/Battery.java\|`
	`51`	`+ \|.*/BatteryOld.java\|`
`50`	`52`	`\|.*/NativeFramebuffer.java" />`
`51`	`53`	`<suppresschecks="VariableDeclarationUsageDistanceCheck"`
`52`	`54`	`files=".*/OwnedDisplay.java`

Comments

(0)