Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion .github/workflows/clang-format.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ on:
# reproducible between contributors and CI. Bump CLANG_FORMAT_VERSION here and in
# CLAUDE.md (Code Formatting) together, then reformat the tree with the same version.
env:
CLANG_FORMAT_VERSION: "22.1.5"
CLANG_FORMAT_VERSION: "22.1.8"

jobs:
clang-format:
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -918,7 +918,7 @@ jobs:
- uses: gradle/actions/setup-gradle@v6
with:
# AGP 9.3.0 (the .github/android-consumer-test fixture) requires Gradle >= 9.5.0.
gradle-version: "9.5.0"
gradle-version: "9.6.1"
- name: Build core jar (byte-identical classes payload for the AAR)
run: >
mvn -B --no-transfer-progress -pl llama -am -DskipTests -Denforcer.skip=true
Expand Down Expand Up @@ -1049,7 +1049,7 @@ jobs:
- uses: gradle/actions/setup-gradle@v6
with:
# AGP 9.3.0 (the .github/android-consumer-test fixture) requires Gradle >= 9.5.0.
gradle-version: "9.5.0"
gradle-version: "9.6.1"
- name: Enable KVM group permissions (GitHub-hosted runner)
run: |
echo 'KERNEL=="kvm", GROUP="kvm", MODE="0666", OPTIONS+="static_node=kvm"' | sudo tee /etc/udev/rules.d/99-kvm4all.rules
Expand Down Expand Up @@ -1145,7 +1145,7 @@ jobs:
# AGP 9.3.0 (android-llmservice) requires Gradle >= 9.5.0; also satisfies Kotlin
# 2.4's Gradle-plugin floor. The AAR/lib-only jobs stay on an older Gradle since
# they build no AGP project.
gradle-version: "9.5.0"
gradle-version: "9.6.1"
- name: Build core jar + install llama-kotlin facade to mavenLocal
# install (not package) so the app's Gradle build resolves llama-kotlin +
# the core POM from mavenLocal. llama-kotlin's core dep is provided-scope, so the
Expand Down Expand Up @@ -1229,7 +1229,7 @@ jobs:
- uses: gradle/actions/setup-gradle@v6
with:
# AGP 9.3.0 (android-llmservice) requires Gradle >= 9.5.0.
gradle-version: "9.5.0"
gradle-version: "9.6.1"
- name: Enable KVM group permissions (GitHub-hosted runner)
run: |
echo 'KERNEL=="kvm", GROUP="kvm", MODE="0666", OPTIONS+="static_node=kvm"' | sudo tee /etc/udev/rules.d/99-kvm4all.rules
Expand Down
4 changes: 2 additions & 2 deletions CLAUDE.md
Original file line number Diff line number Diff line change
Expand Up @@ -948,12 +948,12 @@ not track the loader's own Java package). This is the same
### Code Formatting

C++ formatting is **enforced in CI** (`.github/workflows/clang-format.yml`) with a **pinned**
clang-format — currently **22.1.5**, installed via `pip install clang-format==22.1.5`. Format with
clang-format — currently **22.1.8**, installed via `pip install clang-format==22.1.8`. Format with
that exact version before committing; a different clang-format version reflows code differently and
will fail the check.

```bash
pip install "clang-format==22.1.5"
pip install "clang-format==22.1.8"
clang-format -i src/main/cpp/*.cpp src/main/cpp/*.hpp src/test/cpp/*.cpp # Format C++ code
```

Expand Down
3 changes: 1 addition & 2 deletions llama/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,6 @@ SPDX-License-Identifier: MIT

<properties>
<sonar.organization>bernardladenthin</sonar.organization>
<jna.version>5.19.1</jna.version>
<jspecify.version>1.0.0</jspecify.version>
<lombok.version>1.18.46</lombok.version>
<errorprone.version>2.50.0</errorprone.version>
Expand Down Expand Up @@ -85,7 +84,7 @@ SPDX-License-Identifier: MIT
<spotbugs.version>4.10.3.0</spotbugs.version>
<fb-contrib.version>7.7.4</fb-contrib.version>
<findsecbugs.version>1.14.0</findsecbugs.version>
<spotless.version>3.8.0</spotless.version>
<spotless.version>3.9.0</spotless.version>
<palantir-java-format.version>2.96.0</palantir-java-format.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.build.outputTimestamp>2026-07-07T07:32:17Z</project.build.outputTimestamp>
Expand Down
Loading