Skip to content

Debian Buster JDK 17 Compat #822

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Redstoneguy129 wants to merge 7 commits into
base: master
Choose a base branch
from
Open

Debian Buster JDK 17 Compat #822

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
c670d4c
Update gradle, make compilable with jdk17
snuyanzin Jul 7, 2022
710fb94
Merge pull request #1 from Redstoneguy129/gradle742
Redstoneguy129 Feb 26, 2024
c0b5f83
feat: Add NXTSoundSensor
Redstoneguy129 Feb 29, 2024
d9410d5
feat: Add JDK 17
Redstoneguy129 Feb 29, 2024
fbf0ddd
feat: Add Debian Buster
Redstoneguy129 Feb 29, 2024
baa4a27
fix(refactor): Building issues resolved
Redstoneguy129 Feb 29, 2024
96ab553
feat: All LCDs now extend LCD.java
Redstoneguy129 Mar 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 10 additions & 5 deletions CONTRIBUTORS.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ EV3Dev-lang-java contributors (sorted alphabetically)
* **[Aswin Bouwmeester](https://nxttime.wordpress.com/)**

* LeJOS sensor framework
* LeJOS navigation stack
* LeJOS navigation stack

* **[Andy Shaw](http://www.gloomy-place.com/legoindex.htm)**

Expand All @@ -19,6 +19,11 @@ EV3Dev-lang-java contributors (sorted alphabetically)

* LeJOS navigation stack

* **[Cameron Whyte](https://cameronwhyte.me)**

* Debian Buster Support
* OpenJDK 17 for EV3Dev

* **[David Lechner](https://github.com/dlech)**

* Main developer of EV3Dev
Expand All @@ -43,14 +48,14 @@ EV3Dev-lang-java contributors (sorted alphabetically)

* **[Lawrie Griffiths](https://github.com/lawrie)**

* LeJOS navigation stack
* LeJOS navigation stack

* **[Peter Abeles](https://github.com/lessthanoptimal)**

* Initial RPLidar support
* Initial RPLidar support

* **[Roger Glassey](http://ieor.berkeley.edu/people/faculty/glassey)**

* LeJOS navigation stack

**[Full contributors list](https://github.com/ev3dev-lang-java/ev3dev-lang-java/graphs/contributors).**
**[Full contributors list](https://github.com/ev3dev-lang-java/ev3dev-lang-java/graphs/contributors).**
5 changes: 2 additions & 3 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ plugins {
version = '2.7.0-SNAPSHOT'

repositories {
jcenter()
mavenCentral()
maven { url "https://jitpack.io" }
}
Expand Down Expand Up @@ -84,7 +83,7 @@ test.testLogging {
//Coverage
jacoco {
toolVersion = "0.8.2"
reportsDir = file("$buildDir/customJacocoReportDir")
reportsDirectory = file("$buildDir/customJacocoReportDir")
}

jacocoTestReport {
Expand Down Expand Up @@ -118,7 +117,7 @@ test.finalizedBy jacocoTestCoverageVerification

//Jar
jar {
baseName = "${rootProject.name}"
archiveBaseName = "${rootProject.name}"
manifest {
from file("${projectDir}/src/main/resources/META-INF/MANIFEST.MF")
}
Expand Down
Binary file modified gradle/wrapper/gradle-wrapper.jar
View file
Open in desktop
Binary file not shown.
5 changes: 2 additions & 3 deletions gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
#Mon Dec 02 19:24:34 CET 2019
distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.1-all.zip
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-all.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
33 changes: 15 additions & 18 deletions gradlew
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

27 changes: 8 additions & 19 deletions gradlew.bat
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

17 changes: 9 additions & 8 deletions src/main/java/ev3dev/actuators/LCD.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,24 +1,25 @@
package ev3dev.actuators;

import ev3dev.hardware.EV3DevDistro;
import ev3dev.hardware.EV3DevDevice;
import ev3dev.hardware.EV3DevDistros;
import lejos.hardware.lcd.GraphicsLCD;

public class LCD {
public abstract class LCD extends EV3DevDevice implements GraphicsLCD {

/**
* Factory
*
* @return GraphicsLCD
*/
public static GraphicsLCD getInstance() {

if (EV3DevDistros.getInstance().getDistro().equals(EV3DevDistro.STRETCH)) {
return LCDStretch.getInstance();
} else {
return LCDJessie.getInstance();
switch (EV3DevDistros.getInstance().getDistro()) {
case BUSTER:
return LCDBuster.getInstance();
case STRETCH:
return LCDStretch.getInstance();
default:
return LCDJessie.getInstance();
}

}

}
Loading