diff options
| -rw-r--r-- | build.xml | 41 | ||||
| -rw-r--r-- | buildScripts/ivy.xml | 2 | ||||
| -rw-r--r-- | doc/changelog.markdown | 1 |
3 files changed, 23 insertions, 21 deletions
@@ -81,7 +81,7 @@ the common tasks and can be called on to run the main aspects of all the sub-scr <target name="load-ipp" depends="download-ipp"> <taskdef classpath="lib/ivyplusplus.jar" resource="com/zwitserloot/ivyplusplus/antlib.xml" uri="antlib:com.zwitserloot.ivyplusplus" /> - <ivy:ensureippversion version="1.12" property="ivyplusplus.minimumAvailable" /> + <ivy:ensureippversion version="1.22" property="ivyplusplus.minimumAvailable" /> </target> <target name="redownload-ipp" unless="ivyplusplus.minimumAvailable"> @@ -122,7 +122,10 @@ the common tasks and can be called on to run the main aspects of all the sub-scr <target name="version" depends="ensure-ipp" description="Shows the version number." unless="lombok.version"> <mkdir dir="build/lombok" /> - <javac includeDestClasses="false" srcdir="src/core" debug="on" destdir="build/lombok" source="1.5" target="1.5" includes="lombok/core/Version.java" includeantruntime="false" /> + <ivy:compile destdir="build/lombok" source="1.5" target="1.5" ecj="true" nowarn="true"> + <src path="src/core" /> + <include name="lombok/core/Version.java" /> + </ivy:compile> <java classname="lombok.core.Version" classpath="build/lombok" @@ -153,25 +156,23 @@ the common tasks and can be called on to run the main aspects of all the sub-scr We re-create the file at the end of this target. --> <delete file="build/lombok/META-INF/services/javax.annotation.processing.Processor" quiet="true" /> <delete file="build/lombok/META-INF/services/org.mapstruct.ap.spi.AstModifyingAnnotationProcessor" quiet="true" /> - <ivy:compile destdir="build/stubsstubs" source="1.5" target="1.5" includeantruntime="false"> - <compilerarg value="-Xbootclasspath/p:lib/openJDK6Environment/rt-openjdk6.jar" /> + <ivy:compile destdir="build/stubsstubs" source="1.5" target="1.5" ecj="true" nowarn="true"> <src path="src/stubsstubs" /> </ivy:compile> - <ivy:compile destdir="build/stubs" source="1.5" target="1.5" includeantruntime="false"> - <compilerarg value="-Xbootclasspath/p:lib/openJDK6Environment/rt-openjdk6.jar" /> + <ivy:compile destdir="build/stubs" source="1.5" target="1.5" ecj="true" nowarn="true"> <src path="src/stubs" /> <src path="src/javac-only-stubs" /> <classpath location="build/stubsstubs" /> </ivy:compile> - <ivy:compile destdir="build/lombok-utils" source="1.5" target="1.5" includeantruntime="false"> - <compilerarg value="-Xbootclasspath/p:build/stubs${path.separator}lib/openJDK6Environment/rt-openjdk6.jar" /> + <ivy:compile destdir="build/lombok-utils" source="1.5" target="1.5" ecj="true" nowarn="true" includeSystemBootclasspath="true"> + <bootclasspath location="build/stubs" /> <src path="src/utils" /> <exclude name="lombok/javac/**" /> <classpath refid="build.path" /> </ivy:compile> - <ivy:compile destdir="build/lombok-utils" source="1.6" target="1.6" includeantruntime="false"> + <ivy:compile destdir="build/lombok-utils" source="1.6" target="1.6"> <compilerarg value="-Xbootclasspath/p:build/stubs${path.separator}lib/openJDK6Environment/rt-openjdk6.jar" /> <src path="src/utils" /> <include name="lombok/javac/**" /> @@ -195,18 +196,18 @@ the common tasks and can be called on to run the main aspects of all the sub-scr </filterchain> </copy> - <ivy:compile destdir="build/lombok" source="1.4" target="1.4" includeantruntime="false"> - <compilerarg value="-Xbootclasspath/p:build/stubs${path.separator}lib/openJDK6Environment/rt-openjdk6.jar" /> + <ivy:compile destdir="build/lombok" source="1.4" target="1.4" ecj="true" nowarn="true" includeSystemBootclasspath="true"> + <bootclasspath location="build/stubs" /> <src path="build/transformedSources" /> </ivy:compile> - <ivy:compile destdir="build/lombok/Class50" source="1.4" target="1.6" includeantruntime="false"> - <compilerarg value="-Xbootclasspath/p:build/stubs${path.separator}lib/openJDK6Environment/rt-openjdk6.jar" /> + <ivy:compile destdir="build/lombok/Class50" source="1.4" target="1.6" ecj="true" nowarn="true" includeSystemBootclasspath="true"> + <bootclasspath location="build/stubs" /> <src path="build/transformedSources" /> </ivy:compile> - <ivy:compile destdir="build/lombok" source="1.5" target="1.5" includeantruntime="false"> - <compilerarg value="-Xbootclasspath/p:build/stubs${path.separator}lib/openJDK6Environment/rt-openjdk6.jar" /> + <ivy:compile destdir="build/lombok" source="1.5" target="1.5" ecj="true" nowarn="true" includeSystemBootclasspath="true"> + <bootclasspath location="build/stubs" /> <src path="src/launch" /> <src path="src/core" /> <src path="src/installer" /> @@ -217,15 +218,15 @@ the common tasks and can be called on to run the main aspects of all the sub-scr <classpath refid="build.path" /> </ivy:compile> - <ivy:compile destdir="build/lombok/Class50" source="1.5" target="1.6" includeantruntime="false"> - <compilerarg value="-Xbootclasspath/p:build/stubs${path.separator}lib/openJDK6Environment/rt-openjdk6.jar" /> + <ivy:compile destdir="build/lombok/Class50" source="1.5" target="1.6" ecj="true" nowarn="true" includeSystemBootclasspath="true"> + <bootclasspath location="build/stubs" /> <src path="src/eclipseAgent" /> <include name="lombok/launch/PatchFixesHider.java" /> <classpath location="build/lombok" /> <classpath refid="build.path" /> </ivy:compile> - <ivy:compile destdir="build/lombok" source="1.6" target="1.6" includeantruntime="false"> + <ivy:compile destdir="build/lombok" source="1.6" target="1.6"> <compilerarg value="-Xbootclasspath/p:build/stubs${path.separator}lib/openJDK6Environment/rt-openjdk6.jar" /> <src path="src/core" /> <src path="src/delombok" /> @@ -469,7 +470,7 @@ ${sourceWarning}</echo> <target name="-test-compile" depends="ensureTestDeps, compile" unless="skipTests"> <mkdir dir="build/tests" /> - <ivy:compile destdir="build/tests" source="1.5" target="1.5" includeantruntime="false"> + <ivy:compile destdir="build/tests" source="1.5" target="1.5" ecj="true" nowarn="true"> <classpath refid="test.path" /> <classpath refid="build.path" /> <classpath path="build/lombok" /> @@ -806,7 +807,7 @@ You can also create your own by writing a 'testenvironment.properties' file. The <target name="testAp-compile" depends="ensureBuildDeps"> <delete file="build/testAP/META-INF/services/javax.annotation.processing.Processor" quiet="true" /> - <ivy:compile destdir="build/testAP" source="1.7" target="1.7" includeantruntime="false"> + <ivy:compile destdir="build/testAP" source="1.7" target="1.7"> <src path="src/testAP" /> </ivy:compile> diff --git a/buildScripts/ivy.xml b/buildScripts/ivy.xml index caa56012..45360e57 100644 --- a/buildScripts/ivy.xml +++ b/buildScripts/ivy.xml @@ -40,7 +40,7 @@ <dependency org="net.java.openjdk.custom" name="javac6" rev="1.6.0.18" conf="javac6->runtime; contrib->sources" /> <dependency org="net.java.openjdk.custom" name="javac7" rev="1.7.0" conf="javac7->runtime; contrib->sources" /> <dependency org="org.eclipse.custom" name="ecj" rev="4.3.1" conf="ecj7->default; contrib->sources" /> - <dependency org="org.eclipse.custom" name="ecj" rev="I20140430" conf="ecj8->default; contrib->sources; eclipseBuild->default" /> + <dependency org="org.eclipse.jdt.core.compiler" name="ecj" rev="4.6.1" conf="ecj8->default; contrib->sources; eclipseBuild->default" /> <dependency org="netbeans.org" name="boot" rev="6.8beta" conf="netbeansBuild->build" /> <dependency org="netbeans.org" name="openide.modules" rev="6.8beta" conf="netbeansBuild->build" /> diff --git a/doc/changelog.markdown b/doc/changelog.markdown index 5b633923..0722ca21 100644 --- a/doc/changelog.markdown +++ b/doc/changelog.markdown @@ -4,6 +4,7 @@ Lombok Changelog ### v1.16.19 "Edgy Guinea Pig" * v1.16.18 is the latest stable release of Project Lombok. * PLATFORM: Possible support for jdk9 in the new IntelliJ, Netbeans and for Gradle +* DEVELOPMENT: Compiling lombok on JDK1.9 is now possible. ### v1.16.18 (July 3rd, 2017) * PLATFORM: JDK9 support much improved since v1.16.6; [Issue #985](https://github.com/rzwitserloot/lombok/issues/985) |