Skip to content

Commit 7664334

Browse files
authored
Merge branch '2.0.0-dev' into chore/2.0.0/permission-refactoring
2 parents 9094bb8 + 7879d46 commit 7664334

37 files changed

Lines changed: 822 additions & 481 deletions

.github/workflows/build.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@ jobs:
1212
if: ${{ github.event_name != 'pull_request' || github.repository != github.event.pull_request.head.repo.full_name }}
1313
runs-on: "ubuntu-latest"
1414
steps:
15-
- uses: actions/checkout@v3
15+
- uses: actions/checkout@v4
1616
- uses: gradle/wrapper-validation-action@v1
1717
- name: Set up JDK
18-
uses: actions/setup-java@v3
18+
uses: actions/setup-java@v4
1919
with:
2020
distribution: 'temurin'
2121
java-version: 17
@@ -34,7 +34,7 @@ jobs:
3434
- name: Build
3535
run: ./gradlew build
3636
- name : Test Summary
37-
uses : EnricoMi/publish-unit-test-result-action@v2.2.0
37+
uses : EnricoMi/publish-unit-test-result-action@v2.11.0
3838
with :
3939
junit_files : "**/build/test-results/test/TEST-*.xml"
4040
if : always()

cloud-annotations/src/main/java/cloud/commandframework/annotations/AnnotationParser.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@
4747
import cloud.commandframework.context.CommandInput;
4848
import cloud.commandframework.execution.CommandExecutionHandler;
4949
import cloud.commandframework.extra.confirmation.CommandConfirmationManager;
50+
import cloud.commandframework.internal.CommandInputTokenizer;
5051
import cloud.commandframework.meta.CommandMeta;
5152
import cloud.commandframework.meta.CommandMetaBuilder;
5253
import cloud.commandframework.types.tuples.Pair;
@@ -204,7 +205,7 @@ public AnnotationParser(
204205
String[].class,
205206
(context, annotations) -> annotations.annotation(RawArgs.class) == null
206207
? null
207-
: context.rawInput().tokenize().toArray(new String[0])
208+
: new CommandInputTokenizer(context.rawInput().remainingInput()).tokenize().toArray(new String[0])
208209
);
209210
this.stringProcessor = StringProcessor.noOp();
210211
}

0 commit comments

Comments
 (0)