Skip to content

Merge 8.x branch #1221

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Draft
wants to merge 30 commits into
base: main
Choose a base branch
from
Draft

Merge 8.x branch #1221

wants to merge 30 commits into from

Conversation

Goooler
Copy link
Member

@Goooler Goooler commented Feb 2, 2025

For viewing git blames...

Goooler and others added 11 commits February 2, 2025 10:13
@Goooler
Don't deploy website on 8.x branch
b6b90f9
@Goooler
Tweak Gradle flags (#1093)
8f4d4b4 
(cherry picked from commit ccc04a6)
@Goooler
Run CI for 8.x branch
12328c9
@renovate @Goooler
Update dependency gradle to v8.12.1 (#1113)
611253d 
* Update dependency gradle to v8.12

* Space-assignment syntax in Groovy DSL has been deprecated. This is scheduled to be removed in Gradle 10.0.

Consult the upgrading guide for further information: https://docs.gradle.org/8.12/userguide/upgrading_version_8.html#groovy_space_assignment_syntax

* Update dependency gradle to v8.12.1

* Fix `auto relocate plugin dependencies`

---------

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Goooler <wangzongler@gmail.com>

(cherry picked from commit 4ffb34f)
(cherry picked from commit 7c76ebc)
@Goooler
Revert "Remove Develocity integration (#1014)"
eea1451 
This reverts commit e316b14.
@Goooler
Update dependency org.vafer:jdependency to v2.12 (#1222)
79dd223 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

(cherry picked from commit c24a570)
@Goooler
Prepare changelog for version 8.3.6
360e9db
@Goooler
Prepare version 8.3.6
4fda4a5
@Goooler
Prepare next development version
b6d6107
@Goooler
Update RELEASING.md
8446796 
(cherry picked from commit 5247c1e)
@Goooler
Don't note PR 1093 for 8.3.6 changes
457d488 
(cherry picked from commit 8cb0530)
@Goooler Goooler closed this Feb 26, 2025
@Goooler Goooler deleted the 8.x branch February 26, 2025 09:59
@Goooler Goooler restored the 8.x branch June 19, 2025 01:14
@Goooler Goooler reopened this Jun 19, 2025
@Goooler Goooler force-pushed the 8.x branch 2 times, most recently from a72adeb to aea2af2 Compare June 19, 2025 01:50
Goooler added 5 commits June 19, 2025 21:19
@Goooler
Revert "Run CI for 8.x branch"
3df0ea5 
This reverts commit 12328c9.
@Goooler
Eliminate convention plugin
85a0646
@Goooler
Make Shadow 8 be compatible with Gradle 9 (#1470)
a0da04a 
* Bump

https://docs.gradle.org/9.0.0-rc-1/release-notes.html

* Mark `ShadowJar` as abstract

* Remove Java 11 and add Java 24 into test matrix

* Replace `SelfResolvingDependency` with `FileCollectionDependency`

* Remove `ShadowCopyAction.ArchiveFileTreeElement.getMode`

* Mark `JavaJarExec` as abstract

* org.spockframework:spock-core:2.3-groovy-4.0

* Remove static for `TransformerTestSupport.transformer`

* Replace `org.gradle.api.UncheckedIOException`

* Compat `dependencyProject`

* Replace `mainClassName` with `mainClass` for `CreateStartScripts`

* Compat `RelativeArchivePath.getParent` for Groovy 3 and 4

* Annotate `RelocatorRemapper` with `CompileStatic`

* Update changelog

* Revert "Remove `ShadowCopyAction.ArchiveFileTreeElement.getMode`"

This reverts commit 5b9a54f.

* Remove `@Override` for `getMode`

* Add Gradle 8.3 into test matrix

* Compat `RelocationUtil#configureRelocation` for Groovy 3 and 4

* Log info
@Goooler
Prepare version 8.3.7
badabad
@Goooler
Prepare next development version
00f771f
@Goooler
Copy link
Member Author

Goooler commented Jun 25, 2025 

OLD: shadow-gradle-plugin-8.3.6.jar
NEW: shadow-gradle-plugin-8.3.7.jar

 JAR   │ old       │ new       │ diff      
───────┼───────────┼───────────┼───────────
 class │ 707.9 KiB │   679 KiB │ -28.9 KiB 
 other │  10.7 KiB │  10.7 KiB │       0 B 
───────┼───────────┼───────────┼───────────
 total │ 718.6 KiB │ 689.7 KiB │ -28.9 KiB 

 CLASSES │ old  │ new  │ diff             
─────────┼──────┼──────┼──────────────────
 classes │  147 │  146 │   -1 (+4 -5)     
 methods │ 1840 │ 1537 │ -303 (+182 -485) 
  fields │  766 │  627 │ -139 (+13 -152)

jar.diff.txt

@Goooler Goooler force-pushed the 8.x branch 2 times, most recently from 1067abd to b5749aa Compare June 25, 2025 10:20
Goooler added 6 commits June 26, 2025 16:07
@Goooler
Expose Ant as compile scope (#1488)
c0512b1 
(cherry picked from commit 8eeb64e)
@Goooler
Update changelog
0b5d946
@Goooler
Update workflow trigger and names
00df3c9
@Goooler
Fix the regression of PropertiesFileTransformer in 8.3.7 (#1493)
d59d947 
Defaults `PropertiesFileTransformer.keyTransformer` to a copy of `Closure.IDENTITY`. We can't use `Closure.IDENTITY` instead, as it is not compatible with Groovy 3 and 4.
@Goooler
Prepare version 8.3.8
6861d79
@Goooler
Prepare next development version
1274ca9
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
1 participant
@Goooler