Skip to content

Commit 667acaf

Browse files
kevcodezkevcodez
committed
chore: housekeeping
1 parent 5b1c017 commit 667acaf

File tree

12 files changed

+2440
-8367
lines changed

12 files changed

+2440
-8367
lines changed

‎README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ Easily upgrade your dependencies and Gradle itself by simply selecting what you
1111

1212
## Requirements
1313

14-
- NodeJS 10+
14+
- NodeJS 18+
1515
- [gradle-versions-plugin](https://github.com/ben-manes/gradle-versions-plugin)
1616

1717
## Installation
@@ -22,7 +22,7 @@ build.gradle
2222

2323
```groovy
2424
plugins {
25-
id "com.github.ben-manes.versions" version "0.39.0"
25+
id "com.github.ben-manes.versions" version "0.49.0"
2626
}
2727
```
2828

‎ReplaceVersion.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
module.exports = {
1+
export default {
22
replace: function replaceVersion(body, dependency) {
33
const oldVersion = dependency.oldVersion;
44
const newVersion = dependency.version;

‎__tests__/ReplaceVersion.test.js‎

Lines changed: 99 additions & 81 deletions
Original file line numberDiff line numberDiff line change
@@ -1,116 +1,134 @@
1-
const ReplaceVersion = require('../ReplaceVersion')
1+
import ReplaceVersion from "../ReplaceVersion.js";
22

33
const dependency = {
4-
group: 'de.kevcodez',
5-
name: 'pubg-api-wrapper',
6-
oldVersion: '0.8.1',
7-
version: '1.0.0'
8-
}
4+
group: "de.kevcodez",
5+
name: "pubg-api-wrapper",
6+
oldVersion: "0.8.1",
7+
version: "1.0.0",
8+
};
99

10-
test('Replace inline version', () => {
11-
const replacedVersion = replaceText(`compile 'de.kevcodez:pubg-api-wrapper:0.8.1'`, dependency)
10+
test("Replace inline version", () => {
11+
const replacedVersion = replaceText(`compile 'de.kevcodez:pubg-api-wrapper:0.8.1'`, dependency);
1212

13-
expect(replacedVersion).toBe(`compile 'de.kevcodez:pubg-api-wrapper:1.0.0'`)
14-
})
15-
test('Replace version with variable and single quotation marks', () => {
16-
const replacedVersion = replaceText(`
13+
expect(replacedVersion).toBe(`compile 'de.kevcodez:pubg-api-wrapper:1.0.0'`);
14+
});
15+
test("Replace version with variable and single quotation marks", () => {
16+
const replacedVersion = replaceText(
17+
`
1718
myVar = '0.8.1'
1819
compile 'de.kevcodez:pubg-api-wrapper:$myVar'
19-
`, dependency)
20+
`,
21+
dependency
22+
);
2023

21-
expect(replacedVersion).toContain(`myVar = '1.0.0'`)
22-
})
23-
test('Replace version with variable and double quotation marks', () => {
24-
const replacedVersion = replaceText(`
24+
expect(replacedVersion).toContain(`myVar = '1.0.0'`);
25+
});
26+
test("Replace version with variable and double quotation marks", () => {
27+
const replacedVersion = replaceText(
28+
`
2529
myVar = "0.8.1"
2630
compile 'de.kevcodez:pubg-api-wrapper:$myVar'
27-
`, dependency)
31+
`,
32+
dependency
33+
);
2834

29-
expect(replacedVersion).toContain(`myVar = "1.0.0"`)
30-
})
31-
test('Replace version with variable with parenthensis and double quotation marks', () => {
32-
const replacedVersion = replaceText(`
35+
expect(replacedVersion).toContain(`myVar = "1.0.0"`);
36+
});
37+
test("Replace version with variable with parenthensis and double quotation marks", () => {
38+
const replacedVersion = replaceText(
39+
`
3340
myVar = "0.8.1"
3441
compile 'de.kevcodez:pubg-api-wrapper:\$\{myVar\}'
35-
`, dependency)
42+
`,
43+
dependency
44+
);
3645

37-
expect(replacedVersion).toContain(`myVar = "1.0.0"`)
38-
})
39-
test('Replace leave variable if it is already updated', () => {
40-
const replacedVersion = replaceText(`
46+
expect(replacedVersion).toContain(`myVar = "1.0.0"`);
47+
});
48+
test("Replace leave variable if it is already updated", () => {
49+
const replacedVersion = replaceText(
50+
`
4151
myVar = "1.0.0"
4252
compile 'de.kevcodez:pubg-api-wrapper:\$\{myVar\}'
43-
`, dependency)
53+
`,
54+
dependency
55+
);
4456

45-
expect(replacedVersion).toContain(`myVar = "1.0.0"`)
46-
})
47-
test('Replace plugin version with single quotation marks', () => {
48-
const pluginDependency = {
49-
group: 'com.github.ben-manes.versions',
50-
name: 'com.github.ben-manes.versions.gradle.plugin',
51-
oldVersion: '0.21.0',
52-
version: '0.22.0'
53-
}
54-
const replacedVersion = replaceText(`id 'com.github.ben-manes.versions' version '0.21.0'`, pluginDependency)
57+
expect(replacedVersion).toContain(`myVar = "1.0.0"`);
58+
});
59+
test("Replace plugin version with single quotation marks", () => {
60+
const pluginDependency = {
61+
group: "com.github.ben-manes.versions",
62+
name: "com.github.ben-manes.versions.gradle.plugin",
63+
oldVersion: "0.21.0",
64+
version: "0.22.0",
65+
};
66+
const replacedVersion = replaceText(`id 'com.github.ben-manes.versions' version '0.21.0'`, pluginDependency);
5567

56-
expect(replacedVersion).toBe(`id 'com.github.ben-manes.versions' version '0.22.0'`)
57-
})
58-
test('Replace plugin version with double quotation marks', () => {
59-
const pluginDependency = {
60-
group: 'com.github.ben-manes.versions',
61-
name: 'com.github.ben-manes.versions.gradle.plugin',
62-
oldVersion: '0.21.0',
63-
version: '0.22.0'
64-
}
65-
const replacedVersion = replaceText(`id 'com.github.ben-manes.versions' version "0.21.0"`, pluginDependency)
68+
expect(replacedVersion).toBe(`id 'com.github.ben-manes.versions' version '0.22.0'`);
69+
});
70+
test("Replace plugin version with double quotation marks", () => {
71+
const pluginDependency = {
72+
group: "com.github.ben-manes.versions",
73+
name: "com.github.ben-manes.versions.gradle.plugin",
74+
oldVersion: "0.21.0",
75+
version: "0.22.0",
76+
};
77+
const replacedVersion = replaceText(`id 'com.github.ben-manes.versions' version "0.21.0"`, pluginDependency);
6678

67-
expect(replacedVersion).toBe(`id 'com.github.ben-manes.versions' version "0.22.0"`)
68-
})
69-
test('Replace version with version prefix in dependency', () => {
70-
const replacedVersion = replaceText(`compile group: 'de.kevcodez.pubg', name: 'pubg-api-wrapper', version: '0.8.1'`, dependency)
79+
expect(replacedVersion).toBe(`id 'com.github.ben-manes.versions' version "0.22.0"`);
80+
});
81+
test("Replace version with version prefix in dependency", () => {
82+
const replacedVersion = replaceText(`compile group: 'de.kevcodez.pubg', name: 'pubg-api-wrapper', version: '0.8.1'`, dependency);
7183

72-
expect(replacedVersion).toBe(`compile group: 'de.kevcodez.pubg', name: 'pubg-api-wrapper', version: '1.0.0'`)
73-
})
74-
test('Replace kotlin plugin version', () => {
75-
const pluginDependency = {
76-
group: 'com.github.ben-manes.versions',
77-
name: 'com.github.ben-manes.versions.gradle.plugin',
78-
oldVersion: '0.22.0',
79-
version: '0.24.0'
80-
}
81-
const replacedVersion = replaceText(`id("com.github.ben-manes.versions") version "0.22.0"`, pluginDependency)
82-
expect(replacedVersion).toBe(`id("com.github.ben-manes.versions") version "0.24.0"`)
83-
})
84-
test('Replace kotlin version with extra val without braces in reference', () => {
85-
const replacedVersion = replaceText(`
84+
expect(replacedVersion).toBe(`compile group: 'de.kevcodez.pubg', name: 'pubg-api-wrapper', version: '1.0.0'`);
85+
});
86+
test("Replace kotlin plugin version", () => {
87+
const pluginDependency = {
88+
group: "com.github.ben-manes.versions",
89+
name: "com.github.ben-manes.versions.gradle.plugin",
90+
oldVersion: "0.22.0",
91+
version: "0.24.0",
92+
};
93+
const replacedVersion = replaceText(`id("com.github.ben-manes.versions") version "0.22.0"`, pluginDependency);
94+
expect(replacedVersion).toBe(`id("com.github.ben-manes.versions") version "0.24.0"`);
95+
});
96+
test("Replace kotlin version with extra val without braces in reference", () => {
97+
const replacedVersion = replaceText(
98+
`
8699
val PUBG_API_WRAPPER by extra("0.8.1")
87100
88101
dependencies {
89102
implementation("de.kevcodez:pubg-api-wrapper:$PUBG_API_WRAPPER")
90103
}
91-
`, dependency)
104+
`,
105+
dependency
106+
);
92107

93-
expect(replacedVersion).toContain(`val PUBG_API_WRAPPER by extra("1.0.0")`)
94-
})
95-
test('Replace kotlin version with extra val with braces in reference', () => {
96-
const replacedVersion = replaceText(`
108+
expect(replacedVersion).toContain(`val PUBG_API_WRAPPER by extra("1.0.0")`);
109+
});
110+
test("Replace kotlin version with extra val with braces in reference", () => {
111+
const replacedVersion = replaceText(
112+
`
97113
val PUBG_API_WRAPPER by extra("0.8.1")
98114
99115
dependencies {
100116
implementation("de.kevcodez:pubg-api-wrapper:$\{PUBG_API_WRAPPER\}")
101117
}
102-
`, dependency)
118+
`,
119+
dependency
120+
);
103121

104-
expect(replacedVersion).toContain(`val PUBG_API_WRAPPER by extra("1.0.0")`)
105-
})
122+
expect(replacedVersion).toContain(`val PUBG_API_WRAPPER by extra("1.0.0")`);
123+
});
106124

107125
function replaceText(source, dependency) {
108-
const replaceVersionActions = ReplaceVersion.replace(source, dependency)
126+
const replaceVersionActions = ReplaceVersion.replace(source, dependency);
109127

110-
let modifiedSource = source
111-
replaceVersionActions.forEach(replaceAction => {
112-
modifiedSource = modifiedSource.replace(replaceAction.searchValue, replaceAction.replaceValue)
113-
})
128+
let modifiedSource = source;
129+
replaceVersionActions.forEach((replaceAction) => {
130+
modifiedSource = modifiedSource.replace(replaceAction.searchValue, replaceAction.replaceValue);
131+
});
114132

115-
return modifiedSource
116-
}
133+
return modifiedSource;
134+
}

‎args.js‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
1-
const argv = require("yargs")
1+
import yargs from "yargs";
2+
import { hideBin } from "yargs/helpers";
3+
4+
const argv = yargs(hideBin(process.argv))
25
.option("resolution", {
36
alias: "r",
47
describe:
@@ -43,6 +46,4 @@ const argv = require("yargs")
4346
demand: false,
4447
}).argv;
4548

46-
module.exports = {
47-
argv,
48-
};
49+
export { argv };

‎buildFiles.js‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
const { existsSync } = require("fs");
2-
const { resolve } = require("path");
3-
const fs = require("fs");
1+
import { existsSync } from "fs";
2+
import { resolve } from "path";
3+
import fs from "fs";
44

55
function getBuildFiles(externalFiles, debugLog) {
66
let buildFiles = [];
@@ -50,6 +50,4 @@ const getAllBuildFiles = function (dirPath, arrayOfFiles) {
5050
return arrayOfFiles;
5151
};
5252

53-
module.exports = {
54-
getBuildFiles,
55-
};
53+
export { getBuildFiles };

‎gradleCommand.js‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
const { spawnSync } = require("child_process");
2-
const { existsSync } = require("fs");
1+
import { spawnSync } from "child_process";
2+
import { existsSync } from "fs";
33

44
function determineGradleCommand(debugLog) {
55
let gradleCommand = null;
@@ -40,6 +40,4 @@ function determineGradleCommand(debugLog) {
4040
};
4141
}
4242

43-
module.exports = {
44-
determineGradleCommand,
45-
};
43+
export { determineGradleCommand };

‎index.js‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,28 @@
11
#! /usr/bin/env node
22

3-
const colors = require("colors");
4-
const semver = require("semver");
5-
const ora = require("ora");
3+
"use strict";
64

7-
const { argv } = require("./args");
5+
import semver from "semver";
6+
import ora from "ora";
7+
8+
import { argv } from "./args.js";
89

910
function debugLog(message) {
1011
if (argv.debug) {
1112
console.log(message.blue);
1213
}
1314
}
1415

15-
const prompts = require("prompts");
16-
const { existsSync, readFileSync, writeFileSync } = require("fs");
17-
const { subDirectories } = require("./io");
18-
const { join } = require("path");
19-
const { spawn } = require("child_process");
20-
const { version } = require("./package.json");
16+
import prompts from "prompts";
17+
import { existsSync, readFileSync, writeFileSync } from "fs";
18+
import { join } from "path";
19+
import { spawn } from "child_process";
20+
import { subDirectories } from "./io.js";
2121

22-
const ReplaceVersion = require("./ReplaceVersion");
22+
import ReplaceVersion from "./ReplaceVersion.js";
2323

24-
const { determineGradleCommand } = require("./gradleCommand");
25-
const { getBuildFiles } = require("./buildFiles");
24+
import { determineGradleCommand } from "./gradleCommand.js";
25+
import { getBuildFiles } from "./buildFiles.js";
2626

2727
const { gradleCommand, gradleWrapper } = determineGradleCommand(debugLog);
2828

@@ -33,7 +33,7 @@ if (!gradleCommand) {
3333

3434
const externalFiles = argv["external-file"];
3535
const pathOfReport = argv["path-of-report"];
36-
const outputDir = pathOfReport || "build/dependencyUpdates"
36+
const outputDir = pathOfReport || "build/dependencyUpdates";
3737
const buildFiles = getBuildFiles(externalFiles, debugLog);
3838
debugLog(`Build Files:\n ${buildFiles.join("\n")}`);
3939
if (!buildFiles.length) {
@@ -74,7 +74,7 @@ async function executeCommandAndWaitForExitCode(command, args) {
7474
}
7575

7676
(async () => {
77-
console.log(`gradle-upgrade-interactive v${version}
77+
console.log(`gradle-upgrade-interactive
7878
${"info".blue} Color legend :
7979
"${"<red>".red}" : Major Update backward-incompatible updates
8080
"${"<yellow>".yellow}" : Minor Update backward-compatible features
@@ -85,7 +85,7 @@ ${"info".blue} Color legend :
8585

8686
// info Color legend :
8787

88-
const gradleDependencyUpdateArgs = ["dependencyUpdates", "-DoutputFormatter=json", "-DoutputDir=${outputDir}"];
88+
const gradleDependencyUpdateArgs = ["dependencyUpdates", "-DoutputFormatter=json", `-DoutputDir=${outputDir}`];
8989
const gradleDependencyUpdateResolution = argv.resolution;
9090
if (gradleDependencyUpdateResolution) {
9191
gradleDependencyUpdateArgs.push(`-Drevision=${gradleDependencyUpdateResolution}`);
@@ -303,7 +303,7 @@ function findUpgradeJsonReportFiles() {
303303
}
304304

305305
function informUserAboutInstallingUpdatePlugin(exitCode) {
306-
const newestVersion = "0.39.0";
306+
const newestVersion = "0.49.0";
307307

308308
console.log(`Error executing gradle dependency updates (StatusCode=${exitCode})`.bgRed);
309309
console.log(

‎io.js‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
1-
const { readdirSync, lstatSync } = require("fs");
1+
import { readdirSync, lstatSync } from "fs";
22

33
const isDirectory = (source) => lstatSync(source).isDirectory();
44

55
const subDirectories = (path) => readdirSync(path).filter(isDirectory);
66

7-
module.exports = {
8-
subDirectories,
9-
};
7+
export { subDirectories };

‎jest.config.js‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
export default {
2+
testEnvironment: "jest-environment-node",
3+
transform: {},
4+
};

0 commit comments

Comments
 (0)