Skip to content

Commit

Permalink
Merge branch '2.4.x' into 2.5.x
Browse files Browse the repository at this point in the history
  • Loading branch information
philwebb committed Nov 8, 2021
2 parents 6406ee5 + 75bf430 commit ddd38a7
Showing 1 changed file with 6 additions and 0 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -105,31 +105,37 @@ static class SecondDeterminableImportSelectorAnnotatedClass {
}

@Metadata(d2 = "foo")
@Import(TestImportSelector.class)
static class FirstKotlinAnnotatedTestClass {

}

@Metadata(d2 = "bar")
@Import(TestImportSelector.class)
static class SecondKotlinAnnotatedTestClass {

}

@SpecMetadata(filename = "foo", line = 10)
@Import(TestImportSelector.class)
static class FirstSpockFrameworkAnnotatedTestClass {

}

@SpecMetadata(filename = "bar", line = 10)
@Import(TestImportSelector.class)
static class SecondSpockFrameworkAnnotatedTestClass {

}

@Stepwise
@Import(TestImportSelector.class)
static class FirstSpockLangAnnotatedTestClass {

}

@Issue("1234")
@Import(TestImportSelector.class)
static class SecondSpockLangAnnotatedTestClass {

}
Expand Down

0 comments on commit ddd38a7

Please sign in to comment.