Commit ecf7c817 authored by Andy Wilkinson's avatar Andy Wilkinson

Build and test the Gradle plugin with Java 11 and 12

Closes gh-12333
parent 86380ab8
...@@ -50,6 +50,7 @@ javadoc { ...@@ -50,6 +50,7 @@ javadoc {
'https://docs.oracle.com/javase/8/docs/api/', 'https://docs.oracle.com/javase/8/docs/api/',
'https://docs.gradle.org/current/javadoc/' 'https://docs.gradle.org/current/javadoc/'
] ]
source = '8'
} }
title = "${project.description} $version API" title = "${project.description} $version API"
} }
......
...@@ -15,7 +15,6 @@ ...@@ -15,7 +15,6 @@
<main.basedir>${basedir}/../../..</main.basedir> <main.basedir>${basedir}/../../..</main.basedir>
<gradle.executable>./gradlew</gradle.executable> <gradle.executable>./gradlew</gradle.executable>
<gradle.task>build</gradle.task> <gradle.task>build</gradle.task>
<skip.gradle.build>false</skip.gradle.build>
<refdocs.build.directory>${project.build.directory}/refdocs/</refdocs.build.directory> <refdocs.build.directory>${project.build.directory}/refdocs/</refdocs.build.directory>
</properties> </properties>
<dependencies> <dependencies>
...@@ -142,7 +141,6 @@ ...@@ -142,7 +141,6 @@
<argument>-Pdescription=${project.description}</argument> <argument>-Pdescription=${project.description}</argument>
<argument>-S</argument> <argument>-S</argument>
</arguments> </arguments>
<skip>${skip.gradle.build}</skip>
</configuration> </configuration>
<goals> <goals>
<goal>exec</goal> <goal>exec</goal>
...@@ -177,7 +175,6 @@ ...@@ -177,7 +175,6 @@
<classifier>sources</classifier> <classifier>sources</classifier>
</artifact> </artifact>
</artifacts> </artifacts>
<skipAttach>${skip.gradle.build}</skipAttach>
</configuration> </configuration>
</execution> </execution>
</executions> </executions>
...@@ -250,9 +247,6 @@ ...@@ -250,9 +247,6 @@
<version>3.2.10</version> <version>3.2.10</version>
</dependency> </dependency>
</dependencies> </dependencies>
<configuration>
<skip>${skip.gradle.build}</skip>
</configuration>
<executions> <executions>
<execution> <execution>
<id>set-up-maven-properties</id> <id>set-up-maven-properties</id>
...@@ -391,7 +385,6 @@ ...@@ -391,7 +385,6 @@
<classifier>docs</classifier> <classifier>docs</classifier>
</artifact> </artifact>
</artifacts> </artifacts>
<skipAttach>${skip.gradle.build}</skipAttach>
</configuration> </configuration>
</execution> </execution>
</executions> </executions>
...@@ -399,14 +392,5 @@ ...@@ -399,14 +392,5 @@
</plugins> </plugins>
</build> </build>
</profile> </profile>
<profile>
<id>java9</id>
<activation>
<jdk>[9,)</jdk>
</activation>
<properties>
<skip.gradle.build>true</skip.gradle.build>
</properties>
</profile>
</profiles> </profiles>
</project> </project>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment