Skip to content

Commit

Permalink
Issue #14877: drop unsupported java version builds from CI
Browse files Browse the repository at this point in the history
  • Loading branch information
strkkk authored and romani committed May 16, 2024
1 parent 2d172f3 commit 40360c5
Show file tree
Hide file tree
Showing 23 changed files with 21 additions and 59 deletions.
30 changes: 0 additions & 30 deletions .ci/validation.sh
Original file line number Diff line number Diff line change
Expand Up @@ -551,36 +551,6 @@ javac14)
fi
;;

javac15)
files=($(grep -Rl --include='*.java' ': Compilable with Java15' \
src/test/resources-noncompilable \
src/xdocs-examples/resources-noncompilable || true))
if [[ ${#files[@]} -eq 0 ]]; then
echo "No Java15 files to process"
else
mkdir -p target
for file in "${files[@]}"
do
javac --release 15 --enable-preview -d target "${file}"
done
fi
;;

javac16)
files=($(grep -Rl --include='*.java' ': Compilable with Java16' \
src/test/resources-noncompilable \
src/xdocs-examples/resources-noncompilable || true))
if [[ ${#files[@]} -eq 0 ]]; then
echo "No Java16 files to process"
else
mkdir -p target
for file in "${files[@]}"
do
javac --release 16 --enable-preview -d target "${file}"
done
fi
;;

javac17)
files=($(grep -Rl --include='*.java' ': Compilable with Java17' \
src/test/resources-noncompilable \
Expand Down
8 changes: 0 additions & 8 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -270,14 +270,6 @@ workflows:
name: "javac14"
image-name: "cimg/openjdk:14.0.2"
command: "./.ci/validation.sh javac14"
- validate-with-script:
name: "javac15"
image-name: "cimg/openjdk:15.0.2"
command: "./.ci/validation.sh javac15"
- validate-with-script:
name: "javac16"
image-name: "cimg/openjdk:16.0.2"
command: "./.ci/validation.sh javac16"
- validate-with-script:
name: "javac17"
image-name: "cimg/openjdk:17.0.5"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
*/

//non-compiled with javac: Compilable with Java16
//non-compiled with javac: Compilable with Java17
package com.puppycrawl.tools.checkstyle.checks.design.finalclass;

public class InputFinalClassNestedStaticClassInsideInnerClass {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
//non-compiled with javac: Compilable with Java15 //indent:0 exp:0
//non-compiled with javac: Compilable with Java17 //indent:0 exp:0
package com.puppycrawl.tools.checkstyle.checks.indentation.indentation; //indent:0 exp:0
//indent:82 exp:82
/* Config: //indent:0 exp:0
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
*/

//non-compiled with javac: Compilable with Java16
//non-compiled with javac: Compilable with Java17
package com.puppycrawl.tools.checkstyle.checks.javadoc.javadoctype;

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
*/

//non-compiled with javac: Compilable with Java15
//non-compiled with javac: Compilable with Java17
package com.puppycrawl.tools.checkstyle.checks.javadoc.missingjavadocmethod;

public class InputMissingJavadocMethod1 {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
*/

//non-compiled with javac: Compilable with Java15
//non-compiled with javac: Compilable with Java17
package com.puppycrawl.tools.checkstyle.checks.modifier.modifierorder;
// violation below ''public' modifier out of order with the JLS suggestions.'
sealed public class InputModifierOrderSealedAndNonSealed
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
*/

//non-compiled with javac: Compilable with Java15
//non-compiled with javac: Compilable with Java17
package com.puppycrawl.tools.checkstyle.checks.modifier.modifierorder;

public sealed class InputModifierOrderSealedAndNonSealedNoViolation
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

package com.puppycrawl.tools.checkstyle.checks.modifier.redundantmodifier;

//non-compiled with javac: Compilable with Java16
//non-compiled with javac: Compilable with Java17
public class InputRedundantModifierRecords {

static record testRecord(int a) { // violation 'Redundant 'static' modifier'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
*/

//non-compiled with javac: Compilable with Java16
//non-compiled with javac: Compilable with Java17
package com.puppycrawl.tools.checkstyle.checks.uncommentedmain;

public record InputUncommentedMainBeginTree2(Integer x) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
*/

//non-compiled with javac: Compilable with Java16
//non-compiled with javac: Compilable with Java17
package com.puppycrawl.tools.checkstyle.checks.uncommentedmain;

public record InputUncommentedMainRecords2(Integer x) {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
//non-compiled with javac: Compilable with Java15
//non-compiled with javac: Compilable with Java17
package com.puppycrawl.tools.checkstyle.grammar.antlr4;

public class InputAntlr4AstRegressionJava15FinalLocalRecord {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
//non-compiled with javac: Compilable with Java16
//non-compiled with javac: Compilable with Java17
package com.puppycrawl.tools.checkstyle.grammar.antlr4;

public class InputAntlr4AstRegressionJava16LocalEnumAndInterface {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
//non-compiled with javac: Compilable with Java16
//non-compiled with javac: Compilable with Java17
package com.puppycrawl.tools.checkstyle.grammar.antlr4;

import java.io.Serializable;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
//non-compiled with javac: Compilable with Java16
//non-compiled with javac: Compilable with Java17
package com.puppycrawl.tools.checkstyle.grammar.antlr4;

public class InputAntlr4AstRegressionUncommon3 implements AutoCloseable {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
//non-compiled with javac: Compilable with Java15
//non-compiled with javac: Compilable with Java17
package com.puppycrawl.tools.checkstyle.grammar.java15;

public sealed class InputAstRegressionSealedAndPermits permits Circle, Square, Rectangle {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
//non-compiled with javac: Compilable with Java15
//non-compiled with javac: Compilable with Java17
package com.puppycrawl.tools.checkstyle.grammar.java15;

public non-sealed class InputTopLevelNonSealed extends OtherClass {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
//non-compiled with javac: Compilable with Java16
//non-compiled with javac: Compilable with Java17
package com.puppycrawl.tools.checkstyle.grammar.java16;

public class InputPatternVariableWithModifiers {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
//non-compiled with javac: Compilable with Java15
//non-compiled with javac: Compilable with Java17
package com.puppycrawl.tools.checkstyle.javaparser;

public class InputJavaParserFullJavaIdentifierSupport {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
//non-compiled with javac: Compilable with Java16
//non-compiled with javac: Compilable with Java17
package com.puppycrawl.tools.checkstyle.javaparser;

import java.util.concurrent.Callable;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
COMPILATION_UNIT -> COMPILATION_UNIT [2:0]
|--SINGLE_LINE_COMMENT -> // [1:0]
| `--COMMENT_CONTENT -> non-compiled with javac: Compilable with Java15\n [1:2]
| `--COMMENT_CONTENT -> non-compiled with javac: Compilable with Java17\n [1:2]
|--PACKAGE_DEF -> package [2:0]
| |--ANNOTATIONS -> ANNOTATIONS [2:47]
| |--DOT -> . [2:47]
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
COMPILATION_UNIT -> COMPILATION_UNIT [2:0]
|--SINGLE_LINE_COMMENT -> // [1:0]
| `--COMMENT_CONTENT -> non-compiled with javac: Compilable with Java16\n [1:2]
| `--COMMENT_CONTENT -> non-compiled with javac: Compilable with Java17\n [1:2]
|--PACKAGE_DEF -> package [2:0]
| |--ANNOTATIONS -> ANNOTATIONS [2:47]
| |--DOT -> . [2:47]
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
COMPILATION_UNIT -> COMPILATION_UNIT [2:0]
|--SINGLE_LINE_COMMENT -> // [1:0]
| `--COMMENT_CONTENT -> non-compiled with javac: Compilable with Java16\n [1:2]
| `--COMMENT_CONTENT -> non-compiled with javac: Compilable with Java17\n [1:2]
|--PACKAGE_DEF -> package [2:0]
| |--ANNOTATIONS -> ANNOTATIONS [2:47]
| |--DOT -> . [2:47]
Expand Down

0 comments on commit 40360c5

Please sign in to comment.