Skip to content

Commit 901995c

Browse files
build!: upgrade jextract to v25
1 parent 93884b9 commit 901995c

File tree

4 files changed

+12
-17
lines changed

4 files changed

+12
-17
lines changed

.github/workflows/ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,10 +82,10 @@ jobs:
8282
JEXTRACT_URL+=_windows-x64_bin.tar.gz
8383
fi
8484
curl -LSs "$JEXTRACT_URL" | tar xzf - -C "$RUNNER_TOOL_CACHE"
85-
printf '%s/jextract-22/bin\n' "$RUNNER_TOOL_CACHE" >> "$GITHUB_PATH"
85+
printf '%s/jextract-25/bin\n' "$RUNNER_TOOL_CACHE" >> "$GITHUB_PATH"
8686
env:
8787
# NOTE: keep this in sync with deploy, docs
88-
JEXTRACT_URL: https://download.java.net/java/early_access/jextract/22/6/openjdk-22-jextract+6-47
88+
JEXTRACT_URL: https://download.java.net/java/early_access/jextract/25/1/openjdk-25-jextract+1-1
8989
- name: Run tests
9090
run: mvn --no-transfer-progress test
9191
- name: Patch SpotBugs SARIF report

.github/workflows/deploy.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,10 +46,10 @@ jobs:
4646
- name: Set up jextract
4747
run: |-
4848
curl -LSs '${{env.JEXTRACT_URL}}' | tar xzf - -C "$RUNNER_TOOL_CACHE"
49-
printf '%s/jextract-22/bin\n' "$RUNNER_TOOL_CACHE" >> "$GITHUB_PATH"
49+
printf '%s/jextract-25/bin\n' "$RUNNER_TOOL_CACHE" >> "$GITHUB_PATH"
5050
env:
5151
# NOTE: keep this in sync with ci, docs
52-
JEXTRACT_URL: https://download.java.net/java/early_access/jextract/22/6/openjdk-22-jextract+6-47_linux-x64_bin.tar.gz
52+
JEXTRACT_URL: https://download.java.net/java/early_access/jextract/25/1/openjdk-25-jextract+1-1
5353
- name: Deploy to Maven Central
5454
run: mvn --no-transfer-progress deploy -Dspotbugs.skip=true
5555
env:

.github/workflows/docs.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,10 +48,10 @@ jobs:
4848
- name: Set up jextract
4949
run: |-
5050
curl -LSs '${{env.JEXTRACT_URL}}' | tar xzf - -C "$RUNNER_TOOL_CACHE"
51-
printf '%s/jextract-22/bin\n' "$RUNNER_TOOL_CACHE" >> "$GITHUB_PATH"
51+
printf '%s/jextract-25/bin\n' "$RUNNER_TOOL_CACHE" >> "$GITHUB_PATH"
5252
env:
5353
# NOTE: keep this in sync with ci, deploy
54-
JEXTRACT_URL: https://download.java.net/java/early_access/jextract/22/6/openjdk-22-jextract+6-47_linux-x64_bin.tar.gz
54+
JEXTRACT_URL: https://download.java.net/java/early_access/jextract/25/1/openjdk-25-jextract+1-1
5555
- name: Build javadoc
5656
run: mvn --no-transfer-progress javadoc:javadoc antrun:run@fix-javadoc
5757
- name: Upload pages artifact

scripts/TreeSitter_java.patch

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,17 @@
11
--- a/generated-sources/jextract/io/github/treesitter/jtreesitter/internal/TreeSitter.java
22
+++ b/generated-sources/jextract/io/github/treesitter/jtreesitter/internal/TreeSitter.java
3-
@@ -55,9 +55,7 @@
4-
};
5-
}
3+
@@ -20,9 +20,11 @@ public class TreeSitter extends TreeSitter$shared {
4+
5+
static final Arena LIBRARY_ARENA = Arena.ofAuto();
66

77
- static final SymbolLookup SYMBOL_LOOKUP = SymbolLookup.libraryLookup(System.mapLibraryName("tree-sitter"), LIBRARY_ARENA)
88
- .or(SymbolLookup.loaderLookup())
99
- .or(Linker.nativeLinker().defaultLookup());
1010
+ static final SymbolLookup SYMBOL_LOOKUP = ChainedLibraryLookup.INSTANCE.get(LIBRARY_ARENA);
11-
12-
public static final ValueLayout.OfBoolean C_BOOL = ValueLayout.JAVA_BOOLEAN;
13-
public static final ValueLayout.OfByte C_CHAR = ValueLayout.JAVA_BYTE;
14-
@@ -8599,4 +8606,8 @@ public class TreeSitter {
15-
throw new AssertionError("should not reach here", ex$);
16-
}
17-
}
1811
+
1912
+ static {
2013
+ ts_set_allocator(malloc$address(), calloc$address(), realloc$address(), free$address());
2114
+ }
22-
}
15+
16+
private static final int TREE_SITTER_LANGUAGE_VERSION = (int)15L;
17+
/**

0 commit comments

Comments
 (0)