@invarn/cibuild 2.6.6 → 2.6.7

package/dist/src/commands/android-java-version.test.js

@@ -45,14 +45,21 @@ describe('gradleJavaCeiling / gradleJavaFloor', () => {
     });
 });
 describe('runnableJavaVersion', () => {
-    test('raises a declared version to the oldest installed JDK that covers it', () => {
+    test('stays on the default when the default covers the declaration', () => {
+        // 11 is installed, but AGP 8.x cannot run on it — a project declaring
+        // sourceCompatibility 11 must still be built on 17.
         expect(runnableJavaVersion(11)).toBe(17);
         expect(runnableJavaVersion(17)).toBe(17);
         expect(runnableJavaVersion(21)).toBe(21);
     });
-    test('defaults to the oldest installed JDK when nothing is declared', () => {
+    test('defaults to the preferred JDK when nothing is declared', () => {
         expect(runnableJavaVersion(undefined)).toBe(17);
     });
+    test('steps down to 11 only when the wrapper rules the default out', () => {
+        expect(runnableJavaVersion(undefined, '5.2.1')).toBe(11);
+        expect(runnableJavaVersion(11, '5.2.1')).toBe(11);
+        expect(runnableJavaVersion(undefined, '6.9')).toBe(11);
+    });
     test('never names a JDK no build machine has', () => {
         expect(AVAILABLE_JAVA_VERSIONS).toContain(runnableJavaVersion(23));
         expect(AVAILABLE_JAVA_VERSIONS).toContain(runnableJavaVersion(25, '8.9'));
@@ -67,19 +74,22 @@ describe('runnableJavaVersion', () => {
 });
 describe('javaVersionProblem', () => {
     test('names a Gradle version no installed JDK can run', () => {
-        const problem = javaVersionProblem(undefined, '5.2.1');
-        expect(problem).toContain('Gradle 5.2.1');
-        expect(problem).toContain('Java 11');
+        // 4.10.2 tops out at Java 8, and no image carries 8.
+        const problem = javaVersionProblem(undefined, '4.10.2');
+        expect(problem).toContain('Gradle 4.10.2');
+        expect(problem).toContain('Java 8');
     });
     test('names a declaration above every installed JDK', () => {
         const problem = javaVersionProblem(23, '8.9');
         expect(problem).toContain('Java 23');
-        expect(problem).toContain('17 and 21');
+        expect(problem).toContain('11, 17 and 21');
     });
     test('is silent when every constraint was honoured', () => {
         expect(javaVersionProblem(17, '8.9')).toBeUndefined();
         expect(javaVersionProblem(undefined, '8.9')).toBeUndefined();
         expect(javaVersionProblem(undefined, undefined)).toBeUndefined();
+        // 5.2.1 used to be a problem. The images carry 11 now, so it is not.
+        expect(javaVersionProblem(undefined, '5.2.1')).toBeUndefined();
     });
 });
 //# sourceMappingURL=android-java-version.test.js.map

package/dist/src/commands/android-scanner.d.ts

@@ -67,12 +67,26 @@ export declare function gradleJavaFloor(gradleVersion: string | undefined): numb
 /**
  * The JDKs a build machine installs, and therefore the only values the
  * generated `set-java-version` step can satisfy.
+ *
+ * 11 joined the images on 2026-09-05, for Gradle 5.x and 6.x — which cannot
+ * *start* on 17, whatever the sources declare. It is a fallback, never a
+ * preference; see `PREFERRED_JAVA_VERSION`.
  */
 export declare const AVAILABLE_JAVA_VERSIONS: number[];
 /**
- * The Java version to write into a generated pipeline: the oldest available
- * JDK that satisfies both what the sources declare and what the Gradle
- * wrapper can run on.
+ * The JDK to write whenever nothing forces otherwise.
+ *
+ * This is what makes 11 safe to list. The selection below used to answer with
+ * the *lowest* usable JDK, which was harmless while the lowest was 17. With 11
+ * installed that rule would write `JAVA_VERSION: 11` for every project whose
+ * `sourceCompatibility` is 11 — and AGP 8.x will not run on JDK 11, so
+ * pipelines that build today would stop building.
+ */
+export declare const PREFERRED_JAVA_VERSION = 17;
+/**
+ * The Java version to write into a generated pipeline: `PREFERRED_JAVA_VERSION`
+ * whenever it satisfies both what the sources declare and what the Gradle
+ * wrapper can run on, and the nearest available JDK that does when it cannot.
  *
  * Source compatibility is a floor, not an exact request — a project
  * declaring 11 compiles fine on 17 — but it is not the only constraint.
@@ -80,8 +94,10 @@ export declare const AVAILABLE_JAVA_VERSIONS: number[];
  * pinning an old Gradle caps the JDK no matter what the sources say, and a
  * declaration above every installed JDK cannot be honoured at all.
  *
- * Falls back to the lowest available JDK when the constraints cannot all be
- * met, because a pipeline has to name something; `javaVersionProblem` says
+ * Falls back to the preferred JDK — not the lowest — when the constraints
+ * cannot all be met, because a pipeline has to name something and the
+ * unsatisfiable cases are overwhelmingly "declared something newer than we
+ * have", where 17 is a far better guess than 11. `javaVersionProblem` says
  * what was given up so the caller can warn.
  */
 export declare function runnableJavaVersion(detectedJavaVersion: number | undefined, gradleVersion?: string): number;

package/dist/src/commands/android-scanner.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"android-scanner.d.ts","sourceRoot":"","sources":["../../../src/commands/android-scanner.ts"],"names":[],"mappings":"AAGA,MAAM,MAAM,eAAe,GAAG,SAAS,GAAG,MAAM,CAAC;AAEjD,MAAM,MAAM,eAAe,GACvB,cAAc,GACd,SAAS,GACT,iBAAiB,GACjB,gBAAgB,GAChB,cAAc,GACd,UAAU,GACV,gBAAgB,CAAC;AAErB,MAAM,WAAW,YAAY;IAC3B,QAAQ,EAAE,eAAe,CAAC;IAC1B,QAAQ,EAAE,eAAe,CAAC;IAC1B,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB;AAED,MAAM,WAAW,UAAU;IACzB,QAAQ,EAAE,YAAY,EAAE,CAAC;IACzB,+EAA+E;IAC/E,mBAAmB,CAAC,EAAE,MAAM,CAAC;IAC7B,uFAAuF;IACvF,qBAAqB,CAAC,EAAE,MAAM,CAAC;IAC/B,2FAA2F;IAC3F,aAAa,EAAE,aAAa,CAAC;CAC9B;AAED,MAAM,WAAW,aAAa;IAC5B,gGAAgG;IAChG,UAAU,EAAE,MAAM,EAAE,CAAC;IACrB,wFAAwF;IACxF,cAAc,EAAE,MAAM,EAAE,CAAC;IACzB,uFAAuF;IACvF,QAAQ,EAAE,MAAM,EAAE,CAAC;CACpB;AA+JD;;;;;;;;;;;;;;;;;;GAkBG;AACH,wBAAgB,2BAA2B,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,CAcnE;AAoKD;;;;;;;;;;;GAWG;AACH,wBAAgB,yBAAyB,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAG7E;AAQD;;;GAGG;AACH,wBAAgB,iBAAiB,CAAC,aAAa,EAAE,MAAM,GAAG,SAAS,GAAG,MAAM,GAAG,SAAS,CASvF;AAED,oEAAoE;AACpE,wBAAgB,eAAe,CAAC,aAAa,EAAE,MAAM,GAAG,SAAS,GAAG,MAAM,GAAG,SAAS,CAIrF;AAED;;;GAGG;AACH,eAAO,MAAM,uBAAuB,UAAW,CAAC;AAEhD;;;;;;;;;;;;;;GAcG;AACH,wBAAgB,mBAAmB,CACjC,mBAAmB,EAAE,MAAM,GAAG,SAAS,EACvC,aAAa,CAAC,EAAE,MAAM,GACrB,MAAM,CAQR;AAED;;;GAGG;AACH,wBAAgB,kBAAkB,CAChC,mBAAmB,EAAE,MAAM,GAAG,SAAS,EACvC,aAAa,CAAC,EAAE,MAAM,GACrB,MAAM,GAAG,SAAS,CAYpB;AA6FD;;;GAGG;AACH,wBAAgB,mBAAmB,CAAC,WAAW,EAAE,MAAM,EAAE,GAAG,aAAa,CAmCxE;AAMD,wBAAsB,kBAAkB,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,UAAU,CAAC,CA4PjF;AAgBD,wBAAgB,gBAAgB,CAAC,MAAM,EAAE,UAAU,GAAG,MAAM,CAyD3D"}
+{"version":3,"file":"android-scanner.d.ts","sourceRoot":"","sources":["../../../src/commands/android-scanner.ts"],"names":[],"mappings":"AAGA,MAAM,MAAM,eAAe,GAAG,SAAS,GAAG,MAAM,CAAC;AAEjD,MAAM,MAAM,eAAe,GACvB,cAAc,GACd,SAAS,GACT,iBAAiB,GACjB,gBAAgB,GAChB,cAAc,GACd,UAAU,GACV,gBAAgB,CAAC;AAErB,MAAM,WAAW,YAAY;IAC3B,QAAQ,EAAE,eAAe,CAAC;IAC1B,QAAQ,EAAE,eAAe,CAAC;IAC1B,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB;AAED,MAAM,WAAW,UAAU;IACzB,QAAQ,EAAE,YAAY,EAAE,CAAC;IACzB,+EAA+E;IAC/E,mBAAmB,CAAC,EAAE,MAAM,CAAC;IAC7B,uFAAuF;IACvF,qBAAqB,CAAC,EAAE,MAAM,CAAC;IAC/B,2FAA2F;IAC3F,aAAa,EAAE,aAAa,CAAC;CAC9B;AAED,MAAM,WAAW,aAAa;IAC5B,gGAAgG;IAChG,UAAU,EAAE,MAAM,EAAE,CAAC;IACrB,wFAAwF;IACxF,cAAc,EAAE,MAAM,EAAE,CAAC;IACzB,uFAAuF;IACvF,QAAQ,EAAE,MAAM,EAAE,CAAC;CACpB;AA+JD;;;;;;;;;;;;;;;;;;GAkBG;AACH,wBAAgB,2BAA2B,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,CAcnE;AAoKD;;;;;;;;;;;GAWG;AACH,wBAAgB,yBAAyB,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAG7E;AAQD;;;GAGG;AACH,wBAAgB,iBAAiB,CAAC,aAAa,EAAE,MAAM,GAAG,SAAS,GAAG,MAAM,GAAG,SAAS,CASvF;AAED,oEAAoE;AACpE,wBAAgB,eAAe,CAAC,aAAa,EAAE,MAAM,GAAG,SAAS,GAAG,MAAM,GAAG,SAAS,CAIrF;AAED;;;;;;;GAOG;AACH,eAAO,MAAM,uBAAuB,UAAe,CAAC;AAEpD;;;;;;;;GAQG;AACH,eAAO,MAAM,sBAAsB,KAAK,CAAC;AAEzC;;;;;;;;;;;;;;;;GAgBG;AACH,wBAAgB,mBAAmB,CACjC,mBAAmB,EAAE,MAAM,GAAG,SAAS,EACvC,aAAa,CAAC,EAAE,MAAM,GACrB,MAAM,CAYR;AAED;;;GAGG;AACH,wBAAgB,kBAAkB,CAChC,mBAAmB,EAAE,MAAM,GAAG,SAAS,EACvC,aAAa,CAAC,EAAE,MAAM,GACrB,MAAM,GAAG,SAAS,CAkBpB;AA6FD;;;GAGG;AACH,wBAAgB,mBAAmB,CAAC,WAAW,EAAE,MAAM,EAAE,GAAG,aAAa,CAmCxE;AAMD,wBAAsB,kBAAkB,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,UAAU,CAAC,CA4PjF;AAgBD,wBAAgB,gBAAgB,CAAC,MAAM,EAAE,UAAU,GAAG,MAAM,CAyD3D"}

package/dist/src/commands/android-scanner.js

@@ -375,12 +375,26 @@ export function gradleJavaFloor(gradleVersion) {
 /**
  * The JDKs a build machine installs, and therefore the only values the
  * generated `set-java-version` step can satisfy.
+ *
+ * 11 joined the images on 2026-09-05, for Gradle 5.x and 6.x — which cannot
+ * *start* on 17, whatever the sources declare. It is a fallback, never a
+ * preference; see `PREFERRED_JAVA_VERSION`.
  */
-export const AVAILABLE_JAVA_VERSIONS = [17, 21];
+export const AVAILABLE_JAVA_VERSIONS = [11, 17, 21];
 /**
- * The Java version to write into a generated pipeline: the oldest available
- * JDK that satisfies both what the sources declare and what the Gradle
- * wrapper can run on.
+ * The JDK to write whenever nothing forces otherwise.
+ *
+ * This is what makes 11 safe to list. The selection below used to answer with
+ * the *lowest* usable JDK, which was harmless while the lowest was 17. With 11
+ * installed that rule would write `JAVA_VERSION: 11` for every project whose
+ * `sourceCompatibility` is 11 — and AGP 8.x will not run on JDK 11, so
+ * pipelines that build today would stop building.
+ */
+export const PREFERRED_JAVA_VERSION = 17;
+/**
+ * The Java version to write into a generated pipeline: `PREFERRED_JAVA_VERSION`
+ * whenever it satisfies both what the sources declare and what the Gradle
+ * wrapper can run on, and the nearest available JDK that does when it cannot.
  *
  * Source compatibility is a floor, not an exact request — a project
  * declaring 11 compiles fine on 17 — but it is not the only constraint.
@@ -388,23 +402,36 @@ export const AVAILABLE_JAVA_VERSIONS = [17, 21];
  * pinning an old Gradle caps the JDK no matter what the sources say, and a
  * declaration above every installed JDK cannot be honoured at all.
  *
- * Falls back to the lowest available JDK when the constraints cannot all be
- * met, because a pipeline has to name something; `javaVersionProblem` says
+ * Falls back to the preferred JDK — not the lowest — when the constraints
+ * cannot all be met, because a pipeline has to name something and the
+ * unsatisfiable cases are overwhelmingly "declared something newer than we
+ * have", where 17 is a far better guess than 11. `javaVersionProblem` says
  * what was given up so the caller can warn.
  */
 export function runnableJavaVersion(detectedJavaVersion, gradleVersion) {
-    const lowest = Math.min(...AVAILABLE_JAVA_VERSIONS);
     const ceiling = gradleJavaCeiling(gradleVersion) ?? Infinity;
     const floor = Math.max(detectedJavaVersion ?? 0, gradleJavaFloor(gradleVersion) ?? 0);
     const usable = AVAILABLE_JAVA_VERSIONS.filter((v) => v >= floor && v <= ceiling).sort((a, b) => a - b);
-    return usable.length > 0 ? usable[0] : lowest;
+    if (usable.length === 0)
+        return PREFERRED_JAVA_VERSION;
+    if (usable.includes(PREFERRED_JAVA_VERSION))
+        return PREFERRED_JAVA_VERSION;
+    // Forced off the default: below it take the newest that fits under the
+    // ceiling, above it the oldest that clears the floor.
+    const below = usable.filter((v) => v < PREFERRED_JAVA_VERSION);
+    return below.length > 0 ? below[below.length - 1] : usable[0];
 }
 /**
  * What `runnableJavaVersion` could not honour, as a sentence, or undefined
  * when it honoured everything.
  */
 export function javaVersionProblem(detectedJavaVersion, gradleVersion) {
-    const installed = AVAILABLE_JAVA_VERSIONS.join(" and ");
+    // "11, 17 and 21", not "11 and 17 and 21" — a human reads this next to a
+    // build that will not start.
+    const sorted = [...AVAILABLE_JAVA_VERSIONS].sort((a, b) => a - b);
+    const installed = sorted.length > 1
+        ? `${sorted.slice(0, -1).join(", ")} and ${sorted[sorted.length - 1]}`
+        : String(sorted[0]);
     const ceiling = gradleJavaCeiling(gradleVersion);
     const lowest = Math.min(...AVAILABLE_JAVA_VERSIONS);
     if (ceiling !== undefined && ceiling < lowest) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@invarn/cibuild",
-  "version": "2.6.6",
+  "version": "2.6.7",
   "description": "CI Build CLI — local pipeline orchestration and validation",
   "type": "module",
   "main": "dist/cli.cjs",