Skip to content

Commit

Permalink
Update Gradle to 6.3 and build against JDK 14
Browse files Browse the repository at this point in the history
With this pull request we are updating to the latest Gradle version,
so we can run our builds against Java 14.

PR: #195
Closes: #196, #197
  • Loading branch information
Simon Schrottner committed Mar 29, 2020
1 parent 4f3647f commit ccfe193
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 8 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/actions.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
strategy:
matrix:
# test against latest update of each major Java version, as well as specific updates of LTS versions:
java: [ 8, 11 ]
java: [ 8, 11, 14 ]
os: [ubuntu-latest, windows-latest, macos-latest]
name: ${{ matrix.os }} - Java ${{ matrix.java }}
steps:
Expand Down
2 changes: 1 addition & 1 deletion .infra/gradle/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.2-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-6.3-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
6 changes: 0 additions & 6 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ plugins {
id("com.diffplug.gradle.spotless") version "3.27.1"
id("org.shipkit.java") version "2.2.5"
id("at.zierler.yamlvalidator") version "1.5.0"
id("com.gradle.build-scan") version "2.4.2"
id("org.sonarqube") version "2.8"
}

Expand Down Expand Up @@ -47,11 +46,6 @@ dependencies {
testRuntimeOnly(group = "org.apache.logging.log4j", name = "log4j-jul", version = "2.12.1")
}

buildScan {
termsOfServiceUrl = "https://gradle.com/terms-of-service"
termsOfServiceAgree = "yes"
}

spotless {
val headerFile = file(".infra/spotless/eclipse-public-license-2.0.java")

Expand Down
11 changes: 11 additions & 0 deletions settings.gradle.kts
Original file line number Diff line number Diff line change
@@ -1 +1,12 @@
rootProject.name = "junit-pioneer"

plugins {
id("com.gradle.enterprise") version "3.2"
}

gradleEnterprise {
buildScan {
termsOfServiceUrl = "https://gradle.com/terms-of-service"
termsOfServiceAgree = "yes"
}
}

0 comments on commit ccfe193

Please sign in to comment.