Skip to content

Commit c5562c7

Browse files
cursoragenttimfox
andcommitted
fix(android): align JoyStick Gradle wrapper with root (8.13)
JoyStick still used Gradle 8.2 while resolving AGP 8.13 deps; Gradle 8.2 could not instrument bcprov 1.79 (Java 21). Copy wrapper jar and bump distribution URL to match the root project. Co-authored-by: Tim Fox <timfox@outlook.com>
1 parent 503acda commit c5562c7

4 files changed

Lines changed: 3 additions & 3 deletions

File tree

CONTRIBUTING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ Optional **variable** `COVERITY_PROJECT` (repository **Actions → Variables**)
6666

6767
## ANDROID JOYSTICK (VENDORED)
6868

69-
The on-screen joystick library is kept under **`app/libs/joystick/`** as normal project files (not a git submodule). **`app/libs/joystick/gradle/wrapper/gradle-wrapper.properties`** must remain committed (the repo-wide **`gradle/`** ignore rule is negated for that path so CI can run `./gradlew`). When upgrading Android Gradle Plugin or the library itself, keep **`app/libs/joystick/build.gradle`** in step with the root **`build.gradle`** `classpath` version. Optional: compare with [etlegacy/JoyStick](https://github.com/etlegacy/JoyStick) upstream and port changes manually.
69+
The on-screen joystick library is kept under **`app/libs/joystick/`** as normal project files (not a git submodule). **`app/libs/joystick/gradle/wrapper/`** (`gradle-wrapper.properties` and **`gradle-wrapper.jar`**) must remain committed (the repo-wide **`gradle/`** ignore rule is negated for that path so CI can run `./gradlew`). Keep the JoyStick **Gradle distribution URL** in step with the root project’s **`gradle/wrapper/gradle-wrapper.properties`** so dependency bytecode matches the wrapper’s ASM. When upgrading Android Gradle Plugin or the library itself, keep **`app/libs/joystick/build.gradle`** in step with the root **`build.gradle`** `classpath` version. Optional: compare with [etlegacy/JoyStick](https://github.com/etlegacy/JoyStick) upstream and port changes manually.
7070

7171
## COMMUNICATION
7272

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ See [Development helpers](#development-helpers) and [CONTRIBUTING.md](CONTRIBUTI
102102

103103
## CI and workflows
104104

105-
GitHub Actions on **`main`** / **`master`** run **[`.github/workflows/ci.yml`](.github/workflows/ci.yml)** (Linux containers, macOS, Windows, Android, optional log checks). The **Android** job uses **JDK 21** in CI so Gradle can handle current dependency bytecode (AGP 8.13 pulls libraries with multi-release JARs). **[`build.yml`](.github/workflows/build.yml)** (ETLBuild) runs on tagged releases, a weekly schedule, and manual dispatch. **[`snapcraft.yml`](.github/workflows/snapcraft.yml)** builds the upstream **[etlegacy-snap](https://github.com/etlegacy/etlegacy-snap)** tree after ETLBuild completes; it expects **`SNAPCRAFT_STORE_CREDENTIALS`** where publishing is desired.
105+
GitHub Actions on **`main`** / **`master`** run **[`.github/workflows/ci.yml`](.github/workflows/ci.yml)** (Linux containers, macOS, Windows, Android, optional log checks). The **Android** job uses **JDK 21** in CI, and the vendored **JoyStick** library uses the same **Gradle 8.13** wrapper as the root app so Gradle can instrument current dependency bytecode (for example BouncyCastle multi-release JARs). **[`build.yml`](.github/workflows/build.yml)** (ETLBuild) runs on tagged releases, a weekly schedule, and manual dispatch. **[`snapcraft.yml`](.github/workflows/snapcraft.yml)** builds the upstream **[etlegacy-snap](https://github.com/etlegacy/etlegacy-snap)** tree after ETLBuild completes; it expects **`SNAPCRAFT_STORE_CREDENTIALS`** where publishing is desired.
106106

107107
Forks without **`LEGACY_CI_WEBHOOK`** still get a full CI signal; the optional Discord notify step is skipped when that secret is unset.
108108

-7.79 KB
Binary file not shown.
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
44
networkTimeout=10000
55
zipStoreBase=GRADLE_USER_HOME
66
zipStorePath=wrapper/dists

0 commit comments

Comments
 (0)