Skip to content

Commit

Permalink
Merge pull request #8 from umjammer/0.14.8v
Browse files Browse the repository at this point in the history
0.14.8v
  • Loading branch information
umjammer committed Feb 9, 2024
2 parents 244cd92 + b94f637 commit 93361cf
Show file tree
Hide file tree
Showing 6 changed files with 15 additions and 11 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ on:
jobs:
analyze:
name: Analyze
runs-on: macos-13
runs-on: macos-14

strategy:
fail-fast: false
Expand All @@ -30,7 +30,7 @@ jobs:

steps:
- name: Checkout repository
uses: actions/checkout@v3
uses: actions/checkout@v4

# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
Expand Down Expand Up @@ -62,7 +62,7 @@ jobs:
# make bootstrap
# make release
- name: Build with Maven
run: mvn -B package --file pom.xml
run: mvn -B package --file pom.xml -Dmaven.test.skip=true

- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v2
4 changes: 2 additions & 2 deletions .github/workflows/maven.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@ on: [push]
jobs:
build:

runs-on: macos-13
runs-on: macos-14

steps:
- name: Checkout repository
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Check w/o SNAPSHOT when "bump version"
if: ${{ contains(github.event.head_commit.message, 'bump version') }}
Expand Down
2 changes: 2 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,8 @@
* windows/linux not tested yet
* dig into the difference between static and instance method reference
* ~~spi attach/detach controller~~
* gyro
* https://github.com/keijiro/GyroInputTest

## LESSON

Expand Down
8 changes: 4 additions & 4 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

<groupId>org.hid4java</groupId>
<artifactId>hid4java</artifactId>
<version>0.14.7v</version>
<version>0.14.8v</version>

<name>hid4java</name>
<description>A cross-platform hidapi like library (depends on jna but hidapi native library)</description>
Expand Down Expand Up @@ -36,7 +36,7 @@

<properties>
<jinput.groupId>com.github.umjammer.jinput</jinput.groupId> <!-- net.java.jinput / com.github.umjammer.jinput -->
<jinput.version>2.0.16v</jinput.version>
<jinput.version>2.0.18v</jinput.version>
</properties>

<profiles>
Expand Down Expand Up @@ -108,7 +108,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>3.1.2</version>
<version>3.2.2</version>
<configuration>
<excludes>
<exclude>**/*FunctionalTest.java</exclude>
Expand Down Expand Up @@ -189,7 +189,7 @@
<dependency>
<groupId>org.junit</groupId>
<artifactId>junit-bom</artifactId>
<version>5.10.0</version>
<version>5.10.1</version>
<type>pom</type>
<scope>import</scope>
</dependency>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

import net.java.games.input.Component;
import net.java.games.input.Controller;
import net.java.games.input.ControllerEnvironment;
import net.java.games.input.ControllerListenerSupport;
import net.java.games.input.DeviceSupportPlugin;
import net.java.games.input.Rumbler;
import net.java.games.input.usb.GenericDesktopUsageId;
Expand All @@ -39,7 +39,7 @@
* @author <a href="mailto:[email protected]">Naohide Sano</a> (nsano)
* @version 0.00 230927 nsano initial version <br>
*/
public final class Hid4JavaEnvironmentPlugin extends ControllerEnvironment implements HidControllerEnvironment, Closeable {
public final class Hid4JavaEnvironmentPlugin extends ControllerListenerSupport implements HidControllerEnvironment, Closeable {

/** */
private List<Hid4JavaController> controllers;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
import net.java.games.input.osx.plugin.DualShock4Plugin;
import org.junit.jupiter.api.DisplayName;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.condition.EnabledIfSystemProperty;


/**
Expand All @@ -23,6 +24,7 @@ public class ReadAllEvents {

/** the most typical test for jinput */
@Test
@EnabledIfSystemProperty(named = "vavi.test", matches = "ide")
@DisplayName("jinput sample powered by hid4java spi")
void readAllEvents() throws Exception {
/* Get the available controllers */
Expand Down

0 comments on commit 93361cf

Please sign in to comment.