Apply to all java modules, usually excluding the root project in multi-module sets. * *
Versions: + * - 1.13: indentWithSpaces -> leadingTabsToSpaces and a few others * - 1.12: XML reporting for spotbugs * - 1.11: Add explicit checkstyle tool version - * - 1.10: Add ability to exclude containerised tests + * - 1.10: Add the ability to exclude containerised tests * - 1.9: Add `allDeps` task. * - 1.8: Tweak test config to reduce build speed. - * - 1.7: Switch to setting Java version via toolchain + * - 1.7: Switch to setting the Java version via toolchain * - 1.6: Remove GitHub packages for snapshots * - 1.5: Add filters to exclude generated sources * - 1.4: Add findsecbugs-plugin @@ -50,7 +51,7 @@ repositories { mavenCentral() maven { - url = uri("https://s01.oss.sonatype.org/content/repositories/snapshots/") + url = uri("https://central.sonatype.com/repository/maven-snapshots/") mavenContent { includeGroup("org.creekservice") snapshotsOnly() @@ -59,12 +60,12 @@ repositories { } dependencies { - spotbugsPlugins("com.h3xstream.findsecbugs:findsecbugs-plugin:1.12.0") - checkstyle("com.puppycrawl.tools:checkstyle:10.17.0") + spotbugsPlugins("com.h3xstream.findsecbugs:findsecbugs-plugin:1.14.0") + checkstyle("com.puppycrawl.tools:checkstyle:10.26.1") } configurations.all { - // Reduce chance of build servers running into compilation issues due to stale snapshots: + // Reduce the chance of build servers running into compilation issues due to stale snapshots: resolutionStrategy.cacheChangingModulesFor(15, TimeUnit.MINUTES) } @@ -80,7 +81,7 @@ tasks.test { } } - setForkEvery(5) + forkEvery = 5 maxParallelForks = Runtime.getRuntime().availableProcessors() testLogging { showStandardStreams = true @@ -94,7 +95,7 @@ tasks.test { spotless { java { googleJavaFormat("1.15.0").aosp().reflowLongStrings() - indentWithSpaces() + leadingTabsToSpaces() importOrder() removeUnusedImports() trimTrailingWhitespace() diff --git a/buildSrc/src/main/kotlin/creek-plugin-publishing-convention.gradle.kts b/buildSrc/src/main/kotlin/creek-plugin-publishing-convention.gradle.kts index ab4abb7..a29dda2 100644 --- a/buildSrc/src/main/kotlin/creek-plugin-publishing-convention.gradle.kts +++ b/buildSrc/src/main/kotlin/creek-plugin-publishing-convention.gradle.kts @@ -20,7 +20,7 @@ *
Versions: * - 1.6: Correct automatic module name * - 1.5: Switch to using `gradlePlugin`, as required by Gradle 8.0 - * - 1.4: Fix website URL to avoid redirect + * - 1.4: Fix website URL to avoid redirect * - 1.3: Switch to setting 'system' from issue-management * *
Apply this plugin to any module publishing a Gradle plugin. diff --git a/buildSrc/src/main/kotlin/creek-publishing-convention.gradle.kts b/buildSrc/src/main/kotlin/creek-publishing-convention.gradle.kts index e3a1b20..a6e793b 100644 --- a/buildSrc/src/main/kotlin/creek-publishing-convention.gradle.kts +++ b/buildSrc/src/main/kotlin/creek-publishing-convention.gradle.kts @@ -17,7 +17,8 @@ /** * Standard configuration for Creek library publishing * - *
Version: 1.2 + *
Version: 1.3 + * - 1.3: Switch to setting 'system' from issue-management * *
Apply this plugin only to subprojects if in multi-module setup. * @@ -113,7 +114,7 @@ publishing { } issueManagement { - name.set("GitHub issues") + system.set("GitHub issues") url.set("https://github.com/creek-service/${rootProject.name}/issues") } } diff --git a/buildSrc/src/main/kotlin/creek-sonatype-publishing-convention.gradle.kts b/buildSrc/src/main/kotlin/creek-sonatype-publishing-convention.gradle.kts index e879ae6..c0173bf 100644 --- a/buildSrc/src/main/kotlin/creek-sonatype-publishing-convention.gradle.kts +++ b/buildSrc/src/main/kotlin/creek-sonatype-publishing-convention.gradle.kts @@ -15,13 +15,13 @@ */ /** - * Standard configuration for Creek library publishing to Maven Central vis SonaType OSSRH + * Standard configuration for Creek library publishing to Maven Central viq the portal * - *
Version: 1.1 + *
Version: 1.2 * *
Apply this plugin only to the root project if in multi-module setup. * - * @see OSSHR Nexus Service + * @see Maven Central Portal */ plugins { @@ -29,11 +29,12 @@ plugins { } nexusPublishing { + packageGroup = "org.creekservice" + repositories { sonatype { - nexusUrl.set(uri("https://s01.oss.sonatype.org/service/local/")) - snapshotRepositoryUrl.set(uri("https://s01.oss.sonatype.org/content/repositories/snapshots/")) - stagingProfileId.set("89a20518f39cd") + nexusUrl.set(uri("https://ossrh-staging-api.central.sonatype.com/service/local/")) + snapshotRepositoryUrl.set(uri("https://central.sonatype.com/repository/maven-snapshots/")) if (project.hasProperty("SONA_USERNAME")) { username.set(project.property("SONA_USERNAME").toString())