Skip to content

Commit 05a612e

Browse files
committed
Build: remove hard-coded Java versions from ecj.javadocs.prefs
1 parent cae3cbc commit 05a612e

File tree

2 files changed

+5
-6
lines changed

2 files changed

+5
-6
lines changed

gradle/validation/ecj-lint.gradle

+5-3
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,8 @@ allprojects {
8686
classpath = ecjConfiguration
8787
mainClass = "org.eclipse.jdt.internal.compiler.batch.Main"
8888

89+
// DOCS: https://help.eclipse.org/latest/index.jsp?topic=%2Forg.eclipse.jdt.doc.user%2Ftasks%2Ftask-using_batch_compiler.htm
90+
8991
// Don't emit any .class files.
9092
// Hack around "-d none" still emitting package-info.class
9193
// by running in a temporary directory.
@@ -94,10 +96,10 @@ allprojects {
9496

9597
args += [ "-d", "none" ]
9698

99+
assert project.java.sourceCompatibility == project.java.targetCompatibility
100+
97101
// Compilation environment.
98-
// we use -source/-target as it is significantly faster than --release
99-
args += [ "-source", project.java.sourceCompatibility ]
100-
args += [ "-target", project.java.targetCompatibility ]
102+
args += ["-$project.java.sourceCompatibility"] // "compliance" level
101103
args += [ "-encoding", "UTF-8"]
102104
args += [ "-proc:none" ]
103105
args += [ "-nowarn" ]

gradle/validation/ecj-lint/ecj.javadocs.prefs

-3
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,7 @@ org.eclipse.jdt.core.compiler.annotation.owning=org.eclipse.jdt.annotation.Ownin
1515
org.eclipse.jdt.core.compiler.annotation.resourceanalysis=disabled
1616
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
1717
org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
18-
org.eclipse.jdt.core.compiler.codegen.targetPlatform=24
1918
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
20-
org.eclipse.jdt.core.compiler.compliance=24
2119
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
2220
org.eclipse.jdt.core.compiler.debug.localVariable=generate
2321
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
@@ -151,7 +149,6 @@ org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=error
151149
org.eclipse.jdt.core.compiler.problem.unusedWarningToken=ignore
152150
org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=error
153151
org.eclipse.jdt.core.compiler.release=disabled
154-
org.eclipse.jdt.core.compiler.source=24
155152
org.eclipse.jdt.core.compiler.taskCaseSensitive=enabled
156153
org.eclipse.jdt.core.compiler.taskPriorities=HIGH
157154
org.eclipse.jdt.core.compiler.taskTags=nocommit

0 commit comments

Comments
 (0)