From af571d639ff6c78af8f2923c309e7b991f0d58e2 Mon Sep 17 00:00:00 2001 From: Jendrik Johannes Date: Thu, 27 Apr 2023 16:39:55 +0200 Subject: [PATCH] Release 1.4 --- README.md | 2 +- build.gradle.kts | 7 ++++++- .../org/gradlex/javamodule/moduleinfo/IdValidator.java | 2 +- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 1bbab60..16eff10 100644 --- a/README.md +++ b/README.md @@ -47,7 +47,7 @@ Add this to the build file of your convention plugin's build ``` dependencies { - implementation("org.gradlex:extra-java-module-info:1.3") + implementation("org.gradlex:extra-java-module-info:1.4") } ``` diff --git a/build.gradle.kts b/build.gradle.kts index 01ce4c1..ccca6dd 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -4,7 +4,7 @@ plugins { } group = "org.gradlex" -version = "1.3" +version = "1.4" java { sourceCompatibility = JavaVersion.VERSION_1_8 @@ -31,6 +31,11 @@ pluginPublishConventions { } } +// TODO This needs to be included in org.gradlex.internal.plugin-publish-conventions +signing { + useInMemoryPgpKeys(providers.environmentVariable("SIGNING_KEY").orNull, providers.environmentVariable("SIGNING_PASSPHRASE").orNull) +} + tasks.test { description = "Runs tests against the Gradle version the plugin is built with" classpath = sourceSets.test.get().runtimeClasspath diff --git a/src/main/java/org/gradlex/javamodule/moduleinfo/IdValidator.java b/src/main/java/org/gradlex/javamodule/moduleinfo/IdValidator.java index 0ddd218..f46a074 100644 --- a/src/main/java/org/gradlex/javamodule/moduleinfo/IdValidator.java +++ b/src/main/java/org/gradlex/javamodule/moduleinfo/IdValidator.java @@ -19,7 +19,7 @@ class IdValidator { static private final String COORDINATES_PATTERN = "^[a-zA-Z0-9._-]+:[a-zA-Z0-9._-]+$"; static private final String FILE_NAME_PATTERN = "^[a-zA-Z0-9._-]+\\.(jar|zip)$"; - static private final String MODULE_NAME_PATTERN = "^[a-z][a-z0-9_]*(\\.[a-z0-9_]+)*$"; + static private final String MODULE_NAME_PATTERN = "^[a-zA-Z][a-zA-Z0-9_]*(\\.[a-zA-Z0-9_]+)*$"; static void validateIdentifier(String identifier) { if (!identifier.matches(COORDINATES_PATTERN) && !identifier.matches(FILE_NAME_PATTERN)) {