Skip to content

fix(android): introduce upper Gradle wrapper versions #2133

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
tido64 merged 3 commits into from
Jul 22, 2024
Merged

fix(android): introduce upper Gradle wrapper versions #2133

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8f88c85
fix(android): introduce upper Gradle wrapper versions
tido64 Jul 19, 2024
8f2f0fb
update wrappers
tido64 Jul 19, 2024
64bce9a
use table
tido64 Jul 19, 2024
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
44 changes: 21 additions & 23 deletions android/gradle-wrapper.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,15 @@ const {
v,
} = require("../scripts/helpers");

/** @type {[number, [number, string], [number, string]][]} */
const GRADLE_VERSIONS = [
[v(0, 76, 0), [v(8, 9, 0), "8.9"], [Number.MAX_SAFE_INTEGER, ""]], // 0.76: [8.9, *)
[v(0, 75, 0), [v(8, 8, 0), "8.8"], [v(8, 9, 0), "8.8"]], // 0.75: [8.8, 8.9)
[v(0, 74, 0), [v(8, 6, 0), "8.6"], [v(8, 9, 0), "8.8"]], // 0.74: [8.6, 8.9)
[v(0, 73, 0), [v(8, 3, 0), "8.3"], [v(8, 9, 0), "8.8"]], // 0.73: [8.3, 8.9)
[v(0, 72, 0), [v(8, 1, 1), "8.1.1"], [v(8, 3, 0), "8.2.1"]], // 0.72: [8.1.1, 8.3)
];

/**
* Configures Gradle wrapper as necessary before the Android app is built.
* @param {string} sourceDir
Expand Down Expand Up @@ -52,30 +61,19 @@ function configureGradleWrapper(sourceDir, fs = nodefs) {

const gradleVersion = (() => {
const gradleVersion = toVersionNumber(m[1]);
const version = toVersionNumber(
getPackageVersion("react-native", sourceDir, fs)
);
if (version === 0 || version >= v(0, 76, 0)) {
if (gradleVersion < v(8, 9, 0)) {
return "8.9";
}
} else if (version >= v(0, 75, 0)) {
if (gradleVersion < v(8, 8, 0)) {
return "8.8";
}
} else if (version >= v(0, 74, 0)) {
if (gradleVersion < v(8, 6, 0)) {
return "8.6";
const versionStr = getPackageVersion("react-native", sourceDir, fs);
const version = toVersionNumber(versionStr);
for (const [rnVersion, lower, upper] of GRADLE_VERSIONS) {
if (version >= rnVersion) {
if (gradleVersion < lower[0]) {
return lower[1];
} else if (gradleVersion >= upper[0]) {
return upper[1];
}
return undefined;
}
} else if (version >= v(0, 73, 0)) {
if (gradleVersion < v(8, 3, 0)) {
return "8.3";
}
} else if (version >= v(0, 72, 0)) {
if (gradleVersion < v(8, 1, 1)) {
return "8.1.1";
}
} else if (gradleVersion < v(7, 5, 1) || gradleVersion >= v(8, 0, 0)) {
}
if (gradleVersion < v(7, 5, 1) || gradleVersion >= v(8, 0, 0)) {
return "7.6.4";
}
return undefined;
Expand Down
Binary file modified example/android/gradle/wrapper/gradle-wrapper.jar
View file
Open in desktop
Binary file not shown.
2 changes: 1 addition & 1 deletion example/android/gradlew
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

14 changes: 9 additions & 5 deletions test/android/gradle-wrapper.test.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ describe("configureGradleWrapper()", () => {
equal(written, "");
});

it("writes if Gradle version is too old", () => {
it("bumps Gradle if the version is too old/recent", () => {
let written = "";
/** @type {(gradleVersion: string, rnVersion: string) => typeof nodefs} */
const mockfs = (gradleVersion, rnVersion) => ({
Expand All @@ -129,9 +129,13 @@ describe("configureGradleWrapper()", () => {

const cases = [
["8.8", "0.76.0", "gradle-8.9-bin.zip"],
["8.9", "0.75.0", "gradle-8.8-bin.zip"],
["8.7", "0.75.0", "gradle-8.8-bin.zip"],
["8.9", "0.74.0", "gradle-8.8-bin.zip"],
["8.5", "0.74.0", "gradle-8.6-bin.zip"],
["8.9", "0.73.0", "gradle-8.8-bin.zip"],
["8.2.1", "0.73.0", "gradle-8.3-bin.zip"],
["8.3", "0.72.0", "gradle-8.2.1-bin.zip"],
["8.1", "0.72.0", "gradle-8.1.1-bin.zip"],
["8.0", "0.71.0", "gradle-7.6.4-bin.zip"],
["7.5", "0.71.0", "gradle-7.6.4-bin.zip"],
Expand Down Expand Up @@ -170,10 +174,10 @@ describe("configureGradleWrapper()", () => {

const cases = [
["8.9", "0.76.0"],
["8.9", "0.75.0"],
["8.7", "0.74.0"],
["8.7", "0.73.0"],
["8.7", "0.72.0"],
["8.8", "0.75.0"],
["8.8", "0.74.0"],
["8.8", "0.73.0"],
["8.2", "0.72.0"],
["8.6", "0.74.0"],
["8.3", "0.73.0"],
["8.1.1", "0.72.0"],
Expand Down