Skip to content

Commit a698d2a

Browse files
Update
1 parent 9ecbc73 commit a698d2a

15 files changed

+47
-18
lines changed

.github/workflows/[A] build and test, release if requested.yml

Lines changed: 32 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ jobs:
5252
matrix:
5353
architecture: [x64]
5454
os: [ubuntu-latest, macOS-latest, windows-latest]
55-
java: [18]
55+
java: [19]
5656
runs-on: ${{ matrix.os }}
5757
steps:
5858
- uses: actions/checkout@v2
@@ -114,9 +114,38 @@ jobs:
114114
git pull origin ${{github.ref}}
115115
- name: Build and test with Java 7 target
116116
run: mvn -B clean test -DskipTests=false --file ./java/pom.xml
117+
118+
build-and-test-with-JDK-group-2:
119+
name: ${{ matrix.os }} ${{ matrix.architecture }}, JVM ${{ matrix.distribution }} ${{ matrix.java }}
120+
needs: [elaborate-java-hook-module]
121+
strategy:
122+
fail-fast: false
123+
max-parallel: 15
124+
matrix:
125+
architecture: [x86, x64]
126+
distribution: [zulu]
127+
os: [ubuntu-latest, macOS-latest, windows-latest]
128+
java: [20-ea]
129+
runs-on: ${{ matrix.os }}
130+
steps:
131+
- uses: actions/checkout@v2
132+
- name: Set up JDK ${{ matrix.java }}
133+
uses: actions/setup-java@v3
134+
with:
135+
java-version: ${{ matrix.java }}
136+
distribution: ${{ matrix.distribution }}
137+
architecture: ${{ matrix.architecture }}
138+
- name: Update repositories
139+
run: |
140+
git config user.name "${{ github.event.head_commit.committer.name }}"
141+
git config user.email "${{ github.event.head_commit.committer.email }}"
142+
git pull origin ${{github.ref}}
143+
- name: Build and test with Java 8 target
144+
run: mvn -B clean test -DskipTests=false -Dproject_jdk_version=8 --file ./java/pom.xml
145+
117146

118147

119-
build-and-test-with-JDK-group-2:
148+
build-and-test-with-JDK-group-3:
120149
name: ${{ matrix.os }} ${{ matrix.architecture }}, JVM ${{ matrix.distribution }} ${{ matrix.java }}
121150
needs: [elaborate-java-hook-module]
122151
strategy:
@@ -157,7 +186,7 @@ jobs:
157186

158187

159188
release:
160-
needs: [build-and-test-with-JDK-group-1, build-and-test-with-JDK-group-2]
189+
needs: [build-and-test-with-JDK-group-1, build-and-test-with-JDK-group-2, build-and-test-with-JDK-group-3]
161190
name: Release if requested
162191
runs-on: ubuntu-latest
163192
if: github.event_name == 'push' && endsWith(github.event.head_commit.message, 'Releasing new version')

java/src/main/java/io/github/toolfactory/jvm/function/catalog/ConstructorInvokeFunction.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939

4040
public interface ConstructorInvokeFunction extends ThrowingBiFunction<Constructor<?>, Object[], Object, Throwable> {
4141

42-
public static abstract class Abst implements ConstructorInvokeFunction {
42+
public abstract static class Abst implements ConstructorInvokeFunction {
4343

4444
protected MethodHandle methodHandle;
4545

java/src/main/java/io/github/toolfactory/jvm/function/catalog/ConsulterSupplier.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646
@SuppressWarnings("all")
4747
public interface ConsulterSupplier extends Supplier<MethodHandles.Lookup> {
4848

49-
public static abstract class Abst implements ConsulterSupplier {
49+
public abstract static class Abst implements ConsulterSupplier {
5050
protected MethodHandles.Lookup consulter;
5151

5252
public Abst(Map<Object, Object> context) {
@@ -202,7 +202,7 @@ public ForSemeru(Map<Object, Object> context) throws NoSuchFieldException, Secur
202202

203203
public static interface Native extends ConsulterSupplier {
204204

205-
public static abstract class Abst extends ConsulterSupplier.Abst {
205+
public abstract static class Abst extends ConsulterSupplier.Abst {
206206

207207
public Abst(Map<Object, Object> context) throws InitializeException {
208208
super(context);

java/src/main/java/io/github/toolfactory/jvm/function/catalog/ConsulterSupplyFunction.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
@SuppressWarnings("unchecked")
4242
public interface ConsulterSupplyFunction extends ThrowingFunction<Class<?>, MethodHandles.Lookup, Throwable> {
4343

44-
public static abstract class Abst<F> extends ThrowingFunctionAdapter<F, Class<?>, MethodHandles.Lookup, Throwable> implements ConsulterSupplyFunction {
44+
public abstract static class Abst<F> extends ThrowingFunctionAdapter<F, Class<?>, MethodHandles.Lookup, Throwable> implements ConsulterSupplyFunction {
4545

4646
}
4747

java/src/main/java/io/github/toolfactory/jvm/function/catalog/DeepConsulterSupplyFunction.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
@SuppressWarnings("unchecked")
4242
public interface DeepConsulterSupplyFunction extends ThrowingFunction<Class<?>, MethodHandles.Lookup, Throwable> {
4343

44-
public static abstract class Abst<F> extends ThrowingFunctionAdapter<F, Class<?>, MethodHandles.Lookup, Throwable> implements DeepConsulterSupplyFunction {
44+
public abstract static class Abst<F> extends ThrowingFunctionAdapter<F, Class<?>, MethodHandles.Lookup, Throwable> implements DeepConsulterSupplyFunction {
4545

4646
}
4747

java/src/main/java/io/github/toolfactory/jvm/function/catalog/DefineHookClassFunction.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
@SuppressWarnings("all")
4242
public interface DefineHookClassFunction extends ThrowingBiFunction<Class<?>, byte[], Class<?>, Throwable> {
4343

44-
public static abstract class Abst implements DefineHookClassFunction {
44+
public abstract static class Abst implements DefineHookClassFunction {
4545
protected MethodHandle defineHookClassMethodHandle;
4646

4747
public Abst(Map<Object, Object> context) {

java/src/main/java/io/github/toolfactory/jvm/function/catalog/GetDeclaredConstructorsFunction.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939

4040
public interface GetDeclaredConstructorsFunction extends ThrowingFunction<Class<?>, Constructor<?>[], Throwable> {
4141

42-
public static abstract class Abst implements GetDeclaredConstructorsFunction {
42+
public abstract static class Abst implements GetDeclaredConstructorsFunction {
4343
protected MethodHandle methodHandle;
4444

4545
protected Abst(Map<Object, Object> context) {}

java/src/main/java/io/github/toolfactory/jvm/function/catalog/GetDeclaredFieldsFunction.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939

4040
public interface GetDeclaredFieldsFunction extends ThrowingFunction<Class<?>, Field[], Throwable> {
4141

42-
public static abstract class Abst implements GetDeclaredFieldsFunction{
42+
public abstract static class Abst implements GetDeclaredFieldsFunction{
4343
protected MethodHandle methodHandle;
4444

4545
protected Abst(Map<Object, Object> context) {}

java/src/main/java/io/github/toolfactory/jvm/function/catalog/GetDeclaredMethodsFunction.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939

4040
public interface GetDeclaredMethodsFunction extends ThrowingFunction<Class<?>, Method[], Throwable> {
4141

42-
public static abstract class Abst implements GetDeclaredMethodsFunction {
42+
public abstract static class Abst implements GetDeclaredMethodsFunction {
4343
protected MethodHandle methodHandle;
4444

4545
protected Abst(Map<Object, Object> context) {}

java/src/main/java/io/github/toolfactory/jvm/function/catalog/GetLoadedClassesRetrieverFunction.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,7 @@ private Hashtable<String, Object> getClassNameBasedLock() {
181181
};
182182
}
183183

184-
protected static abstract class ClassNameBasedLockSupplier {
184+
protected abstract static class ClassNameBasedLockSupplier {
185185

186186
protected abstract Hashtable<String, Object> get(ClassLoader classLoader);
187187

0 commit comments

Comments
 (0)