Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add JDK11 build step #168

Merged
merged 4 commits into from
Feb 19, 2019
Merged

Add JDK11 build step #168

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a7e8899
Add JDK11 build step
Feb 18, 2019
2138e3c
Switch to openjdk 8 instead of oracle jdk 8
Feb 18, 2019
2303064
Switch default build to openjdks
Feb 18, 2019
727e7eb
Only activate the dokka plugin when the JDK8 is used
Feb 19, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 9 additions & 3 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
dist: trusty

language: java
jdk: oraclejdk8
jdk:
- openjdk8
- openjdk11

cache:
directories:
Expand All @@ -23,15 +25,19 @@ deploy:
on:
repo: ExpediaDotCom/graphql-kotlin
branch: master
jdk: oraclejdk8
jdk:
- openjdk8
- openjdk11
-
provider: script
script: .travis/deploy.sh
skip_cleanup: true
on:
repo: ExpediaDotCom/graphql-kotlin
tags: true
jdk: oraclejdk8
jdk:
- openjdk8
- openjdk11

after_deploy:
- .travis/update-version.sh
Expand Down
36 changes: 23 additions & 13 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,19 +105,6 @@
<sourceDirectory>${project.basedir}/src/main/kotlin</sourceDirectory>
<testSourceDirectory>${project.basedir}/src/test/kotlin</testSourceDirectory>
<plugins>
<plugin>
<groupId>org.jetbrains.dokka</groupId>
<artifactId>dokka-maven-plugin</artifactId>
<version>${dokka-maven-plugin.version}</version>
<executions>
<execution>
<phase>prepare-package</phase>
<goals>
<goal>javadocJar</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-maven-plugin</artifactId>
Expand Down Expand Up @@ -410,5 +397,28 @@
</plugins>
</build>
</profile>
<profile>
<id>jdk8</id>
<activation>
<jdk>1.8</jdk>
</activation>
<build>
<plugins>
<plugin>
<groupId>org.jetbrains.dokka</groupId>
<artifactId>dokka-maven-plugin</artifactId>
<version>${dokka-maven-plugin.version}</version>
<executions>
<execution>
<phase>prepare-package</phase>
<goals>
<goal>javadocJar</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>
</profiles>
</project>