Skip to content

Commit

Permalink
Upgrade to Gradle 7 nightly run with JDK 16
Browse files Browse the repository at this point in the history
Disable license plugin which is not compatible with Gradle 7
  • Loading branch information
msgilligan committed Mar 22, 2021
1 parent 658ddaa commit a6da6c2
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 5 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/gradle.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:
uses: actions/setup-java@v2-preview
with:
distribution: 'adopt'
java-version: '15'
java-version: '16.0.0'
- name: Verify Gradle Wrapper
uses: gradle/wrapper-validation-action@v1
- name: Cache Gradle packages
Expand Down
4 changes: 2 additions & 2 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ plugins {
id 'org.openjfx.javafxplugin' version '0.0.9' apply false
id 'org.beryx.jlink' version '2.23.4' apply false
id 'de.undercouch.download' version '4.0.1'
id 'com.github.hierynomus.license' version '0.15.0' apply false
// id 'com.github.hierynomus.license' version '0.15.0' apply false
}

buildScan {
Expand Down Expand Up @@ -76,7 +76,7 @@ subprojects {

apply from: 'gradle/bintray.gradle'
apply from: 'gradle/downloadJPackage.gradle'
apply from: 'gradle/licenseCheck.gradle'
//apply from: 'gradle/licenseCheck.gradle'

task testReport(type: TestReport) {
destinationDir = file("$buildDir/reports/allTests")
Expand Down
3 changes: 1 addition & 2 deletions gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.2-bin.zip
distributionSha256Sum=8de6efc274ab52332a9c820366dd5cf5fc9d35ec7078fd70c8ec6913431ee610
distributionUrl=https\://services.gradle.org/distributions-snapshots/gradle-7.0-20210322000034+0000-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists

0 comments on commit a6da6c2

Please sign in to comment.