Merge pull request #184 from usefulness/mateuszkwiecinski-patch-1

Test on macos-latest + authenticate requests

Author: mateuszkwiecinski

.github/workflows/main.yml

@@ -23,6 +23,7 @@ jobs:
           java-version: 23
 
       - name: Downgrade dependency version to see the diff
+        if: runner.os != 'macOS'
         run: sed -i -E 's/androidx.paging:paging-common-ktx:[[:digit:]]+.[[:digit:]]+.[[:digit:]]+/androidx.paging:paging-common-ktx:3.2.0/g' testproject/build.gradle
 
       - uses: gradle/actions/setup-gradle@v4
@@ -145,7 +146,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ macos-14, windows-latest, ubuntu-latest]
+        os: [ macos-latest, windows-latest, ubuntu-latest]
     runs-on: ${{ matrix.os }}
     name: Execute on ${{ matrix.os }} runner
     steps:
@@ -159,9 +160,13 @@ jobs:
           java-version: 23
 
       - name: Downgrade dependency version to see the diff (Unix)
-        if: runner.os != 'Windows'
+        if: runner.os != 'Windows' && runner.os != 'macOS'
         run: sed -i -E 's/androidx.paging:paging-common-ktx:[[:digit:]]+.[[:digit:]]+.[[:digit:]]+/androidx.paging:paging-common-ktx:3.2.0/g' testproject/build.gradle
 
+      - name: Downgrade dependency version to see the diff (macOS)
+        if: runner.os == 'macOS'
+        run: sed -i '' -E 's/androidx.paging:paging-common-ktx:[[:digit:]]+.[[:digit:]]+.[[:digit:]]+/androidx.paging:paging-common-ktx:3.2.0/g' testproject/build.gradle
+
       - name: Downgrade dependency version to see the diff (Windows)
         if: runner.os == 'Windows'
         run: |

Readme.md

@@ -1,11 +1,11 @@
-# Dependency Tree Diff - Github Action
+# Dependency Tree Diff - GitHub Action
 
 ![.github/workflows/main.yml](https://github.com/usefulness/dependency-tree-diff-action/workflows/.github/workflows/main.yml/badge.svg)
 
-Simple Github Action wrapper for Jake Wharton's [Dependency Tree Diff](https://github.com/JakeWharton/dependency-tree-diff) tool.
+Simple GitHub Action wrapper for Jake Wharton's [Dependency Tree Diff](https://github.com/JakeWharton/dependency-tree-diff) tool.
 
 ## Usage 
-The action only exposes _output_ containing the diff, so to effectively consume its output it is highly recommended to use other Github Actions to customize your experience.
+The action only exposes _output_ containing the diff, so to effectively consume its output, it is highly recommended to use other GitHub Actions to customize your experience.
 
 #### Create Pull Request comment on dependency change   
 [See it in action!](https://github.com/mateuszkwiecinski/github_browser/pull/31)  
@@ -69,7 +69,7 @@ All inputs with their default values:
 ```
 
 - **`configuration`** - Selected Gradle configuration, passed to `./gradlew dependencies --configuration xxx`.
-Should correspond to output artifact that is considered output of the project.
+It should correspond to output artifact considered output of the project.
 - **`project`** - Gradle project which dependency tree diff should be generated for. 
 Dependency diff for root projects can be configured using `project: ''`. 
  For Android projects use the one that has `com.android.application` plugin applied.

action.yml

@@ -54,6 +54,7 @@ runs:
         INPUT_VERSION: ${{ inputs.lib-version }}
         INPUT_ADDITIONAL_GRADLE_ARGUMENTS: ${{ inputs.additional-gradle-arguments }}
         INPUT_DEBUG: ${{ inputs.debug }}
+        GITHUB_TOKEN: ${{ github.token }}
       run: $GITHUB_ACTION_PATH/entrypoint.sh
       shell: bash
 
@@ -67,5 +68,6 @@ runs:
         INPUT_VERSION: ${{ inputs.lib-version }}
         INPUT_ADDITIONAL_GRADLE_ARGUMENTS: ${{ inputs.additional-gradle-arguments }}
         INPUT_DEBUG: ${{ inputs.debug }}
+        GITHUB_TOKEN: ${{ github.token }}
       run: "& \"$env:GITHUB_ACTION_PATH/entrypoint.ps1\""
       shell: pwsh

entrypoint.ps1

@@ -5,20 +5,25 @@ param(
     [string]$InputBuildRootDir = $env:INPUT_BUILD_ROOT_DIR,
     [string]$InputVersion = $env:INPUT_VERSION,
     [string]$InputAdditionalGradleArguments = $env:INPUT_ADDITIONAL_GRADLE_ARGUMENTS,
-    [string]$InputDebug = $env:INPUT_DEBUG
+    [string]$InputDebug = $env:INPUT_DEBUG,
+    [string]$GithubToken = $env:GITHUB_TOKEN
 )
 
 $ErrorActionPreference = "Stop"
 
 Set-Location $InputBuildRootDir
 
+$headers = @{
+    Authorization = "Bearer $GithubToken"
+}
+
 if ($InputVersion -eq "latest") {
-    $latestRelease = Invoke-RestMethod -Uri "https://api.github.com/repos/JakeWharton/dependency-tree-diff/releases/latest"
+    $latestRelease = Invoke-RestMethod -Uri "https://api.github.com/repos/JakeWharton/dependency-tree-diff/releases/latest" -Headers $headers
     $downloadUrl = $latestRelease.assets | Where-Object { $_.name -eq "dependency-tree-diff.jar" } | Select-Object -ExpandProperty browser_download_url
-    Invoke-WebRequest -Uri $downloadUrl -OutFile "dependency-tree-diff.jar"
+    Invoke-WebRequest -Uri $downloadUrl -Headers $headers -OutFile "dependency-tree-diff.jar"
 } else {
     $downloadUrl = "https://github.com/JakeWharton/dependency-tree-diff/releases/download/$InputVersion/dependency-tree-diff.jar"
-    Invoke-WebRequest -Uri $downloadUrl -OutFile "dependency-tree-diff.jar"
+    Invoke-WebRequest -Uri $downloadUrl -Headers $headers -OutFile "dependency-tree-diff.jar"
 }
 
 if ($InputProject -eq ":") {
@@ -29,6 +34,7 @@ if ($InputDebug -eq "true") {
     Write-Host "download finished"
     Write-Host "JAVA_HOME: $env:JAVA_HOME"
     java -version
+    Get-Location
 }
 
 $currentHead = git rev-parse HEAD
@@ -61,4 +67,4 @@ $headPath = Resolve-Path "dependency-tree-diff_dependencies-head.txt"
 "file-dependencies-base=$basePath" | Out-File -FilePath $env:GITHUB_OUTPUT -Append -Encoding UTF8
 "file-dependencies-head=$headPath" | Out-File -FilePath $env:GITHUB_OUTPUT -Append -Encoding UTF8
 
-git switch --detach $currentHead 
+git switch --detach $currentHead

entrypoint.sh

@@ -3,13 +3,13 @@
 cd "$INPUT_BUILD_ROOT_DIR"
 
 if [ "$INPUT_VERSION" == "latest" ]; then
-  curl -s https://api.github.com/repos/JakeWharton/dependency-tree-diff/releases/latest \
+  curl -H "Authorization: Bearer $GITHUB_TOKEN" -s https://api.github.com/repos/JakeWharton/dependency-tree-diff/releases/latest \
   | grep "/dependency-tree-diff.jar" \
   | cut -d : -f 2,3 \
   | tr -d \" \
-  | xargs curl -L -s -o dependency-tree-diff.jar
+  | xargs curl -H "Authorization: Bearer $GITHUB_TOKEN" -L -s -o dependency-tree-diff.jar
 else
-  curl -L -s -o dependency-tree-diff.jar "https://github.com/JakeWharton/dependency-tree-diff/releases/download/$INPUT_VERSION/dependency-tree-diff.jar"
+  curl -H "Authorization: Bearer $GITHUB_TOKEN" -L -s -o dependency-tree-diff.jar "https://github.com/JakeWharton/dependency-tree-diff/releases/download/$INPUT_VERSION/dependency-tree-diff.jar"
 fi
 
 if [ "$INPUT_PROJECT" == ":" ]; then
@@ -20,8 +20,11 @@ if [ "$INPUT_DEBUG" == "true" ]; then
   echo "download finished"
   echo "$JAVA_HOME"
   java -version
+  ls -al
 fi
 
+chmod +x dependency-tree-diff.jar
+
 current_head=$(git rev-parse HEAD)
 
 ./gradlew $INPUT_ADDITIONAL_GRADLE_ARGUMENTS "$INPUT_PROJECT":dependencies --configuration "$INPUT_CONFIGURATION" > dependency-tree-diff_dependencies-head.txt

testproject/gradle.properties

@@ -0,0 +1,4 @@
+org.gradle.parallel=true
+org.gradle.caching=true
+org.gradle.configuration-cache=true
+org.gradle.configuration-cache.parallel=true