Skip to content

Commit a7e91f9

Browse files
committed
Merge remote-tracking branch 'origin/main' into g/20250226/compat-kmp
// Conflicts: // src/main/kotlin/com/github/jengelman/gradle/plugins/shadow/ShadowJavaPlugin.kt
2 parents 0240988 + f1f8736 commit a7e91f9

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

.github/workflows/ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
build:
1212
strategy:
1313
matrix:
14-
os: [ ubuntu-latest, windows-latest ]
14+
os: [ ubuntu-24.04-arm, windows-latest ]
1515
# Always test on the latest version and some LTS.
1616
java: [ 17, 21, 23 ]
1717
runs-on: ${{ matrix.os }}
@@ -26,7 +26,7 @@ jobs:
2626

2727
publish-snapshot:
2828
needs: build
29-
runs-on: ubuntu-latest
29+
runs-on: ubuntu-24.04-arm
3030
if: github.repository == 'GradleUp/shadow' && github.ref == 'refs/heads/main'
3131
steps:
3232
- uses: actions/checkout@v4

.github/workflows/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ on:
77

88
jobs:
99
release:
10-
runs-on: ubuntu-latest
10+
runs-on: ubuntu-24.04-arm
1111
if: github.repository == 'GradleUp/shadow'
1212
permissions:
1313
contents: write

src/docs/changes/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
- **BREAKING CHANGE:** Move tracking unused classes logic out of `ShadowCopyAction`. ([#1257](https://github.com/GradleUp/shadow/pull/1257))
2020
- Reduce duplicated `SimpleRelocator` to improve performance. ([#1271](https://github.com/GradleUp/shadow/pull/1271))
2121
- **BREAKING CHANGE:** Move `DependencyFilter` from `com.github.jengelman.gradle.plugins.shadow.internal` into `com.github.jengelman.gradle.plugins.shadow.tasks`. ([#1272](https://github.com/GradleUp/shadow/pull/1272))
22-
- Handle file unzipping via `Project.zipTree`. ([#1233](https://github.com/GradleUp/shadow/pull/1233))
22+
- Refactor file visiting logic in `StreamAction`, handle file unzipping via `Project.zipTree`. ([#1233](https://github.com/GradleUp/shadow/pull/1233))
2323

2424
**Fixed**
2525

0 commit comments

Comments
 (0)