From 7577bde0ca4d70faf9d129a2d68d9593a9f38057 Mon Sep 17 00:00:00 2001
From: Matt Peterson <matt.peterson@swirldslabs.com>
Date: Wed, 21 Aug 2024 15:59:22 -0600
Subject: [PATCH] fix: code review changes

Signed-off-by: Matt Peterson <matt.peterson@swirldslabs.com>
---
 .github/workflows/pr-checks.yaml                             | 2 ++
 .github/workflows/release-push-image.yaml                    | 3 ++-
 server/src/test/resources/consumer.sh                        | 2 +-
 .../src/test/resources/templates/block_proof_template.json   | 2 +-
 server/src/test/resources/templates/event_template.json      | 2 +-
 server/src/test/resources/templates/header_template.json     | 2 +-
 settings.gradle.kts                                          | 5 -----
 7 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/pr-checks.yaml b/.github/workflows/pr-checks.yaml
index a10047784..af3d7e960 100644
--- a/.github/workflows/pr-checks.yaml
+++ b/.github/workflows/pr-checks.yaml
@@ -72,6 +72,7 @@ jobs:
       - name: Build
         id: gradle-build
         run: ${GRADLE_EXEC} build
+
       - name: Style Check
         id: spotless-check
         run: ${GRADLE_EXEC} spotlessCheck
@@ -79,6 +80,7 @@ jobs:
       - name: Unit Tests
         id: unit-tests
         run: ${GRADLE_EXEC} check
+
       - name: Upload coverage report
         uses: codecov/codecov-action@e28ff129e5465c2c0dcc6f003fc735cb6ae0c673 # v4.5.0
         with:
diff --git a/.github/workflows/release-push-image.yaml b/.github/workflows/release-push-image.yaml
index c60e6b650..ef2de4da8 100644
--- a/.github/workflows/release-push-image.yaml
+++ b/.github/workflows/release-push-image.yaml
@@ -62,7 +62,8 @@ jobs:
           java-version: 21
 
       - name: Build
-        run: ./gradlew clean build -x :stream:test # TODO: Remove -x :stream:test when PBJ bug is fixed
+        run: ./gradlew clean build
+
       - name: Login to GitHub Container Registry
         uses: docker/login-action@0d4c9c5ea7693da7b068278f7b52bda2a190a446 # v3.2.0
         with:
diff --git a/server/src/test/resources/consumer.sh b/server/src/test/resources/consumer.sh
index a26403db5..1d3fbdb2a 100755
--- a/server/src/test/resources/consumer.sh
+++ b/server/src/test/resources/consumer.sh
@@ -35,4 +35,4 @@ grp_pid=$!
 echo "Started consumer with PID: $grp_pid"
 
 # Wait for the background process to complete
-wait "$grp_pid"
\ No newline at end of file
+wait "$grp_pid"
diff --git a/server/src/test/resources/templates/block_proof_template.json b/server/src/test/resources/templates/block_proof_template.json
index 2fa50cb2c..ca1f17e1d 100644
--- a/server/src/test/resources/templates/block_proof_template.json
+++ b/server/src/test/resources/templates/block_proof_template.json
@@ -4,4 +4,4 @@
       "block": -1
     }
   }
-}
\ No newline at end of file
+}
diff --git a/server/src/test/resources/templates/event_template.json b/server/src/test/resources/templates/event_template.json
index ad05a6e34..2efbcc741 100644
--- a/server/src/test/resources/templates/event_template.json
+++ b/server/src/test/resources/templates/event_template.json
@@ -9,4 +9,4 @@
         }
     }
   }
-}
\ No newline at end of file
+}
diff --git a/server/src/test/resources/templates/header_template.json b/server/src/test/resources/templates/header_template.json
index 8b9ccf350..2484e0f85 100644
--- a/server/src/test/resources/templates/header_template.json
+++ b/server/src/test/resources/templates/header_template.json
@@ -18,4 +18,4 @@
       }
     }
   }
-}
\ No newline at end of file
+}
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 12469fa99..28546250d 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -117,8 +117,3 @@ buildCache {
         }
     }
 }
-
-fun include(name: String, path: String) {
-    include(name)
-    project(name).projectDir = File(rootDir, path)
-}