Update to latest conventions (#135)

creek-service · Jan 30, 2023 · a11f9df · a11f9df
1 parent 6b0fb97
commit a11f9df
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 11 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -17,7 +17,7 @@ updates:
   - package-ecosystem: github-actions
     directory: /
     schedule:
-      interval: weekly
+      interval: monthly
   - package-ecosystem: gradle
     directory: /
     registries:

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -40,7 +40,7 @@ jobs:
       - name: Build
         env:
           COVERALLS_REPO_TOKEN: ${{ secrets.COVERALLS_REPO_TOKEN }}
-        run: ./gradlew javadoc check coveralls
+        run: ./gradlew build coveralls
       - name: Publish
         if: github.event_name == 'push' || github.event.inputs.publish_artifacts == 'true'
         env:

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -26,7 +26,7 @@ jobs:
           distribution: 'adopt'
           cache: gradle
       - name: Ensure build is green
-        run: ./gradlew check
+        run: ./gradlew build
       - name: Release
         run: |
           # The following command will trigger the build.yml workflow as it pushes a release tag

diff --git a/buildSrc/src/main/kotlin/creek-common-convention.gradle.kts b/buildSrc/src/main/kotlin/creek-common-convention.gradle.kts
@@ -17,9 +17,11 @@
 /**
  * Standard configuration of Creek projects
  *
- * <p>Version: 1.2
- *
  * <p>Apply to all java modules, usually excluding the root project in multi-module sets.
+ *
+ * <p>Version: 1.4
+ *  - 1.4: Add findsecbugs-plugin
+ *  - 1.3: Fail on warnings for test code too.
  */
 
 plugins {
@@ -64,12 +66,16 @@ repositories {
     mavenCentral()
 }
 
+dependencies {
+    spotbugsPlugins("com.h3xstream.findsecbugs:findsecbugs-plugin:1.12.0")
+}
+
 configurations.all {
     // Reduce chance of build servers running into compilation issues due to stale snapshots:
     resolutionStrategy.cacheChangingModulesFor(15, TimeUnit.MINUTES)
 }
 
-tasks.compileJava {
+tasks.withType<JavaCompile> {
     options.compilerArgs.add("-Xlint:all,-serial,-requires-automatic,-requires-transitive-automatic,-module")
     options.compilerArgs.add("-Werror")
 }

diff --git a/buildSrc/src/main/kotlin/creek-plugin-publishing-convention.gradle.kts b/buildSrc/src/main/kotlin/creek-plugin-publishing-convention.gradle.kts
@@ -17,11 +17,12 @@
 /**
  * Configuration for Creek Gradle plugin publishing.
  *
- * <p>Version: 1.2
+ * <p>Version: 1.3
+ *  - 1.3: Switch to setting 'system' from issue-management
  *
  * <p>Apply this plugin to any module publishing a Gradle plugin.
  *
- * <p>Do NOT ally the `creek-publishing-convention`.
+ * <p>Do NOT apply the `creek-publishing-convention`.
  */
 
 plugins {
@@ -115,7 +116,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-publishing-convention.gradle.kts b/buildSrc/src/main/kotlin/creek-publishing-convention.gradle.kts
@@ -17,7 +17,8 @@
 /**
  * Standard configuration for Creek library publishing
  *
- * <p>Version: 1.2
+ * <p>Version: 1.3
+ *  - 1.3: Switch to setting 'system' from issue-management
  *
  * <p> 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")
                 }
             }