Skip to content

Commit e9c0f4d

Browse files
authored
Merge pull request #7661 from SkriptLang/dev/patch
Merge patch into master
2 parents 2bccb32 + 0fc4c8c commit e9c0f4d

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+996
-455
lines changed

.github/workflows/checkstyle.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
with:
1717
submodules: recursive
1818
- name: validate gradle wrapper
19-
uses: gradle/wrapper-validation-action@v2
19+
uses: gradle/actions/wrapper-validation@v4
2020
- name: Set up JDK 21
2121
uses: actions/setup-java@v4
2222
with:

.github/workflows/java-17-builds.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
with:
1717
submodules: recursive
1818
- name: validate gradle wrapper
19-
uses: gradle/wrapper-validation-action@v2
19+
uses: gradle/actions/wrapper-validation@v4
2020
- name: Set up JDK 21
2121
uses: actions/setup-java@v4
2222
with:

.github/workflows/java-21-builds.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
with:
1717
submodules: recursive
1818
- name: validate gradle wrapper
19-
uses: gradle/wrapper-validation-action@v2
19+
uses: gradle/actions/wrapper-validation@v4
2020
- name: Set up JDK 21
2121
uses: actions/setup-java@v4
2222
with:

.github/workflows/junit-17-builds.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
with:
1717
submodules: recursive
1818
- name: validate gradle wrapper
19-
uses: gradle/wrapper-validation-action@v2
19+
uses: gradle/actions/wrapper-validation@v4
2020
- name: Set up JDK 21
2121
uses: actions/setup-java@v4
2222
with:

.github/workflows/junit-21-builds.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
with:
1717
submodules: recursive
1818
- name: validate gradle wrapper
19-
uses: gradle/wrapper-validation-action@v2
19+
uses: gradle/actions/wrapper-validation@v4
2020
- name: Set up JDK 21
2121
uses: actions/setup-java@v4
2222
with:

.github/workflows/repo.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
with:
1313
submodules: recursive
1414
- name: validate gradle wrapper
15-
uses: gradle/wrapper-validation-action@v2
15+
uses: gradle/actions/wrapper-validation@v4
1616
- name: Set up JDK 21
1717
uses: actions/setup-java@v4
1818
with:

.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -166,6 +166,9 @@ fabric.properties
166166

167167
# Reason: https://github.com/joeblau/gitignore.io/issues/186#issuecomment-249601023
168168

169+
# Exception for the icon
170+
!.idea/icon.png
171+
169172
*.iml
170173
modules.xml
171174
.idea/misc.xml

.idea/icon.png

4.07 KB
Loading

CLOCKWORK_RELEASE_MODEL.md

Lines changed: 26 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,8 @@ This document does *not* cover the distribution or publication of artifacts buil
3434

3535
Plans for a new release model began in March 2023 and several models were discussed, with this being the final version agreed upon by the organisation's administrative group and approved by the core contributors.
3636

37+
An update to the release model was made in February 2025 to accommodate a more frequent Minecraft release schedule and to help limit update sizes further.
38+
3739
### Motivations
3840

3941
The release cycle for the `2.7.0` version was significant in that it took an unusually long time and included an unusually-large number of additions and changes.
@@ -59,6 +61,11 @@ Members of the organisation and the wider community identified several problems
5961

6062
Of these, the principle complaint is that the `2.7.0` version took a significant amount of time to finish and this had an adverse effect on the community and the wider ecosystem.
6163

64+
As of February 2025, Mojang has committed to 'drops', which means significant upstream changes happen much more frequently.
65+
This corresponds to Skript having a much higher lag time on releasing support for new content due to the mismatch in release dates.
66+
In addition, an uptick in contributions has led to `2.10` being one of the largest updates yet.
67+
The size of the update meant that some of the previous concerns, like short notice additions and an extensive changelog, were still persistent despite the new release schedule.
68+
6269
### Goals
6370

6471
Our release model has been designed to achieve the following goals:
@@ -98,6 +105,7 @@ A 'patch' version (labelled `0.0.X`) may contain:
98105
- Bug fixes
99106
- Non-impactful<sup>2</sup> improvements to existing features
100107
- Changes to meta content (e.g. documentation)
108+
- Opt-in experiments
101109

102110
There may be **very rare** occasions when a breaking change is necessary in a patch release. These may occur if and only if: either a breaking change is required in order to fix an issue, and the issue is significant enough to need fixing in a patch rather than waiting for a major release, or an issue occurred with an inclusion in the version immediately-prior to this, which must be changed or reverted in some way.
103111

@@ -138,18 +146,20 @@ A table of (expected) dates is displayed below.
138146
| 15th Jan | Feature release | 0.1.0 |
139147
| 1st Feb | Patch | 0.1.1 |
140148
| 1st Mar | Patch | 0.1.2 |
141-
| 1st Apr | Patch | 0.1.3 |
142-
| 1st May | Patch | 0.1.4 |
143-
| 1st Jun | Patch | 0.1.5 |
144-
| 1st Jul | Pre-release | 0.2.0-pre1 |
145-
| 15th Jul | Feature release | 0.2.0 |
146-
| 1st Aug | Patch | 0.2.1 |
147-
| 1st Sep | Patch | 0.2.2 |
148-
| 1st Oct | Patch | 0.2.3 |
149-
| 1st Nov | Patch | 0.2.4 |
150-
| 1st Dec | Patch | 0.2.5 |
151-
152-
An estimated 14 releases are expected per year, with 10 patches, 2 pre-releases and 2 feature-releases that immediately follow them.
149+
| 1st Apr | Pre-release | 0.2.0-pre1 |
150+
| 15th Apr | Feature release | 0.2.0 |
151+
| 1st May | Patch | 0.2.1 |
152+
| 1st Jun | Patch | 0.2.2 |
153+
| 1st Jul | Pre-release | 0.3.0-pre1 |
154+
| 15th Jul | Feature release | 0.3.0 |
155+
| 1st Aug | Patch | 0.3.1 |
156+
| 1st Sep | Patch | 0.3.2 |
157+
| 1st Oct | Pre-release | 0.4.0-pre1 |
158+
| 15th Oct | Feature release | 0.4.0 |
159+
| 1st Nov | Patch | 0.4.1 |
160+
| 1st Dec | Patch | 0.4.2 |
161+
162+
An estimated 16 releases are expected per year, with 8 patches, 4 pre-releases and 4 feature-releases.
153163

154164
Please note that the actual number may differ from this in cases such as:
155165
- A version requiring multiple pre-releases to correct mistakes (`0.3.0-pre1`, `0.3.0-pre2`)
@@ -160,15 +170,17 @@ There is no fixed timetable for the circulation of unpublished builds to the pub
160170

161171
### Major Version Schedule
162172

163-
A [feature version](#feature-releases) will be released on the **15th of January** and the **15th of July**.
173+
A [feature version](#feature-releases) will be released on the **15th of January**, the **15th of April**, the **15th of July**, and the **15th of October**.
164174

165-
This will include all finished content from the previous 6 months that was tested in the pre-release.
175+
This will include all finished content that was tested in the pre-release.
166176

167177
Any features, additions or changes that were *not* ready or approved at the time of the pre-release may **not** be included in the feature release [according to goal 3](#goals). \
168178
The feature release must **not** be delayed to accomodate content that was not ready by the deadline [according to goal 5](#goals).
169179

170180
If there is no content ready at the scheduled date of a feature release, the release will be skipped and a notice published explaining this.
171181

182+
The April and October releases are intended to include minimal breaking changes and focus more on including new features and opt-in experiments.
183+
172184
### Pre-Release Schedule
173185

174186
A [pre-release](#pre-releases) will be released on the **1st of January** and the **1st of July**, leaving two weeks before the following release for public testing to occur.

build.gradle

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,14 +27,14 @@ allprojects {
2727

2828
dependencies {
2929
shadow group: 'io.papermc', name: 'paperlib', version: '1.0.8'
30-
shadow group: 'org.bstats', name: 'bstats-bukkit', version: '3.0.2'
31-
shadow group: 'net.kyori', name: 'adventure-text-serializer-bungeecord', version: '4.3.2'
30+
shadow group: 'org.bstats', name: 'bstats-bukkit', version: '3.1.0'
31+
shadow group: 'net.kyori', name: 'adventure-text-serializer-bungeecord', version: '4.3.4'
3232

3333
implementation group: 'io.papermc.paper', name: 'paper-api', version: '1.21.4-R0.1-SNAPSHOT'
3434
implementation group: 'com.google.code.findbugs', name: 'findbugs', version: '3.0.1'
3535

3636
// bundled with Minecraft 1.19.4+ for display entity transforms
37-
implementation group: 'org.joml', name: 'joml', version: '1.10.5'
37+
implementation group: 'org.joml', name: 'joml', version: '1.10.8'
3838

3939
// Plugin hook libraries
4040
implementation group: 'com.sk89q.worldguard', name: 'worldguard-legacy', version: '7.0.0-SNAPSHOT', {
@@ -48,7 +48,7 @@ dependencies {
4848
implementation fileTree(dir: 'lib', include: '*.jar')
4949

5050
testShadow group: 'junit', name: 'junit', version: '4.13.2'
51-
testShadow group: 'org.easymock', name: 'easymock', version: '5.4.0'
51+
testShadow group: 'org.easymock', name: 'easymock', version: '5.5.0'
5252
}
5353

5454
checkstyle {

0 commit comments

Comments
 (0)