From d712b79571a6be60c830b8c37cdd8cbe8272317f Mon Sep 17 00:00:00 2001
From: Matthew Pope <popematt@amazon.com>
Date: Tue, 30 May 2023 20:51:17 -0700
Subject: [PATCH] Fix release artifact upload workflow

---
 .github/workflows/publish-release-artifacts.yml | 6 ++++--
 build.gradle.kts                                | 4 ++--
 ion-java-cli/README.md                          | 2 +-
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/publish-release-artifacts.yml b/.github/workflows/publish-release-artifacts.yml
index a708b057fd..cf71e374b8 100644
--- a/.github/workflows/publish-release-artifacts.yml
+++ b/.github/workflows/publish-release-artifacts.yml
@@ -40,9 +40,11 @@ jobs:
     # only run if `check-tag` completes successfully
     needs: check-tag
     runs-on: ubuntu-latest
+    permissions:
+      content: write
     steps:
         # TODO: replace with artifact upload/download -- make sure there's no race condition with other builds also
-        # uploaading an artifact.
+        # uploading an artifact.
       - uses: actions/checkout@v3
         with:
           submodules: recursive
@@ -54,7 +56,7 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         # TODO - reusability
         # the location of the library(s) should be configurable as an input
-        # parameter rather than being hard coded as `build/lib/ion-java...`
+        # parameter rather than being hard coded as `build/libs/ion-java...`
         # It may also need to be able to upload more than one file.
         run: |
           gh release upload "v$(<project.version)" "build/libs/ion-java-$(<project.version).jar"
diff --git a/build.gradle.kts b/build.gradle.kts
index 6a637759a2..18034aa4c1 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -170,8 +170,8 @@ tasks {
     }
 
     cyclonedxBom {
-        setIncludeConfigs(listOf("runtimeClasspath"))
-        setSkipConfigs(listOf("compileClasspath", "testCompileClasspath"))
+        dependsOn(jar)
+        includeConfigs.set(listOf("runtimeClasspath"))
     }
 }
 
diff --git a/ion-java-cli/README.md b/ion-java-cli/README.md
index 6507f1ee1f..bda227b0b1 100644
--- a/ion-java-cli/README.md
+++ b/ion-java-cli/README.md
@@ -6,7 +6,7 @@ The package is stored under `ion-java/ion-java-cli`.
 ## Setup
 Build ion-java-cli.
 ```
-./gradle ion-java-cli:build
+./gradlew ion-java-cli:build
 ```
 
 ## Getting Started