From c9b8fa90960168d4531a404e937bf4e7cbd63694 Mon Sep 17 00:00:00 2001 From: Alex Nordlund Date: Sat, 22 Apr 2023 21:14:44 +0200 Subject: [PATCH] Rename package.json extension to packageJson #232 --- CHANGELOG.md | 6 +++++- .../kotlin/com/github/gradle/node/PackageJsonExtension.kt | 2 +- .../github/gradle/node/PackageJsonExtensionTest.groovy | 8 ++++---- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7978464d..082238a8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,10 @@ # Changelog -## Version 3.x *(unreleased)* +## Version 4.x *(unreleased)* + +## Version 4.0.0 *(unreleased)* +* Drop support for versions lower than Gradle 6.6 +* Rename `package.json` extension to `packageJson` [#232](https://github.com/node-gradle/gradle-node-plugin/issues/232) ## Version 3.6.0 *(2023-04-20)* * Allow task rules to be disabled [#116](https://github.com/node-gradle/gradle-node-plugin/issues/116) diff --git a/src/main/kotlin/com/github/gradle/node/PackageJsonExtension.kt b/src/main/kotlin/com/github/gradle/node/PackageJsonExtension.kt index 88688ae8..5f7be65d 100644 --- a/src/main/kotlin/com/github/gradle/node/PackageJsonExtension.kt +++ b/src/main/kotlin/com/github/gradle/node/PackageJsonExtension.kt @@ -60,6 +60,6 @@ open class PackageJsonExtension(project: Project) { /** * Extension name in Gradle */ - const val NAME = "package.json" + const val NAME = "packageJson" } } \ No newline at end of file diff --git a/src/test/groovy/com/github/gradle/node/PackageJsonExtensionTest.groovy b/src/test/groovy/com/github/gradle/node/PackageJsonExtensionTest.groovy index a2f0c683..52b7a5ce 100644 --- a/src/test/groovy/com/github/gradle/node/PackageJsonExtensionTest.groovy +++ b/src/test/groovy/com/github/gradle/node/PackageJsonExtensionTest.groovy @@ -14,7 +14,7 @@ class PackageJsonExtensionTest extends AbstractProjectTest { project.evaluate() then: - def ext = project.extensions.getByName('package.json') as PackageJsonExtension + def ext = project.extensions.getByName(PackageJsonExtension.NAME) as PackageJsonExtension ext.name.get() == "test" ext.version.get() == "1.10.2" ext.private.get() == false @@ -27,7 +27,7 @@ class PackageJsonExtensionTest extends AbstractProjectTest { """ project.apply plugin: 'com.github.node-gradle.node' project.evaluate() - def ext = project.extensions.getByName('package.json') as PackageJsonExtension + def ext = project.extensions.getByName(PackageJsonExtension.NAME) as PackageJsonExtension ext.homepage.get() == null then: @@ -43,7 +43,7 @@ class PackageJsonExtensionTest extends AbstractProjectTest { project.evaluate() then: - def ext = project.extensions.getByName('package.json') as PackageJsonExtension + def ext = project.extensions.getByName(PackageJsonExtension.NAME) as PackageJsonExtension ext.get("name") == "test" ext.getBoolean("private") == false } @@ -59,7 +59,7 @@ class PackageJsonExtensionTest extends AbstractProjectTest { project.evaluate() then: - def ext = project.extensions.getByName('package.json') as PackageJsonExtension + def ext = project.extensions.getByName(PackageJsonExtension.NAME) as PackageJsonExtension ext.get("upper", "lower", "end") == "done" } } \ No newline at end of file