Commit54837cb

authored

Merge branch 'sysfs_perf2' into 735

2 parents74edd0c +ad94ee0 commit54837cbCopy full SHA for 54837cb

File tree

+4518

-124

lines changed

+4518

-124

lines changed

Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -5,12 +5,12 @@ jobs:`
`5`	`5`	`runs-on:ubuntu-latest`
`6`	`6`	`steps:`
`7`	`7`	`-name:Checkout source code`
`8`		`-uses:actions/checkout@v1`
`9`		`-with:`
`10`		`-ref:master`
	`8`	`+uses:actions/checkout@v2`
`11`	`9`	`-name:Set up JDK 11`
`12`	`10`	`uses:actions/setup-java@v1`
`13`	`11`	`with:`
`14`	`12`	`java-version:11`
`15`	`13`	`-name:Build with Gradle`
`16`	`14`	`run:./gradlew test checkstyleMain`
	`15`	`+ -name:Checkout source code`
	`16`	`+uses:codecov/codecov-action@v1`

Lines changed: 0 additions & 23 deletions

This file was deleted.

Lines changed: 1 addition & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -4,8 +4,7 @@`
`4`	`4`	`& the[LeJOS](http://www.lejos.org/) way.`
`5`	`5`
`6`	`6`	`[![License: MIT](https://img.shields.io/badge/License-MIT-blue.svg)](/LICENSE)`
`7`		`-[![Travis CI](https://travis-ci.org/ev3dev-lang-java/ev3dev-lang-java.svg?branch=develop)](https://travis-ci.org/ev3dev-lang-java/ev3dev-lang-java)`
`8`		`-`
	`7`	`+![Java CI](https://github.com/ev3dev-lang-java/ev3dev-lang-java/workflows/Java%20CI/badge.svg)`
`9`	`8`	`![ScreenShot](https://raw.githubusercontent.com/jabrena/ev3dev-lang-java/master/docs/images/theThreeAmigos.jpg)`
`10`	`9`
`11`	`10`	`#How to test?`

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: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -48,6 +48,7 @@`
`48`	`48`	`\|.*/Sound.java\|`
`49`	`49`	`\|.*/EV3Led.java\|`
`50`	`50`	`\|.*/Battery.java\|`
	`51`	`+ \|.*/BatteryOld.java\|`
`51`	`52`	`\|.*/NativeFramebuffer.java" />`
`52`	`53`	`<suppresschecks="VariableDeclarationUsageDistanceCheck"`
`53`	`54`	`files=".*/OwnedDisplay.java`

Comments

(0)