From 40a059a7d6aab57752266a5c5403128288b20e8b Mon Sep 17 00:00:00 2001 From: Thibault Gagnaux Date: Tue, 18 Jan 2022 21:34:30 +0100 Subject: feat: uses java 11 toolchain and upgrades the gradle wrapper to version 7.3.3 --- build.gradle | 61 ++++++++++++++++++++----------- gradle/wrapper/gradle-wrapper.jar | Bin 59203 -> 59536 bytes gradle/wrapper/gradle-wrapper.properties | 2 +- gradlew | 2 +- 4 files changed, 42 insertions(+), 23 deletions(-) diff --git a/build.gradle b/build.gradle index d460e2a..0a1a5b0 100644 --- a/build.gradle +++ b/build.gradle @@ -1,52 +1,71 @@ -plugins { +plugins +{ id 'java-gradle-plugin' id 'maven-publish' } -repositories { +repositories +{ mavenCentral() } -sourceSets { - functionalTest { +dependencies +{ + def junit5Group = 'org.junit.jupiter' + def junit5Version = '5.8.1' + testImplementation group: junit5Group, name: 'junit-jupiter-api', version: junit5Version + testRuntimeOnly group: junit5Group, name: 'junit-jupiter-engine', version: junit5Version +} + +java +{ + toolchain + { + languageVersion = JavaLanguageVersion.of(11) + } +} + +sourceSets +{ + functionalTest + { compileClasspath += sourceSets.main.output + sourceSets.test.output runtimeClasspath += sourceSets.test.runtimeClasspath } } -gradlePlugin { +gradlePlugin +{ testSourceSets project.sourceSets.functionalTest - plugins { - fregePlugin { - id = 'ch.fhnw.thga.frege' + plugins + { + fregePlugin + { + id = 'ch.fhnw.thga.frege' implementationClass = 'ch.fhnw.thga.gradleplugins.FregePlugin' } } } -configurations { +configurations +{ functionalTestImplementation.extendsFrom testImplementation functionalRuntimeOnly.extendsFrom runtimeOnly } -tasks.register('functionalTest', Test) { - description = 'Runs functional tests.' - group = 'verification' +tasks.register('functionalTest', Test) +{ + description = 'Runs functional tests.' + group = 'verification' testClassesDirs = sourceSets.functionalTest.output.classesDirs - classpath = sourceSets.functionalTest.runtimeClasspath + classpath = sourceSets.functionalTest.runtimeClasspath shouldRunAfter test } check.dependsOn functionalTest -tasks.withType(Test).configureEach { +tasks.withType(Test).configureEach +{ useJUnitPlatform() maxParallelForks 6 } - -dependencies { - def junit5Group = 'org.junit.jupiter' - def junit5Version = '5.8.1' - testImplementation group: junit5Group, name: 'junit-jupiter-api', version: junit5Version - testRuntimeOnly group: junit5Group, name: 'junit-jupiter-engine', version: junit5Version -} diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index e708b1c..7454180 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 69a9715..2e6e589 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew index 4f906e0..744e882 100755 --- a/gradlew +++ b/gradlew @@ -72,7 +72,7 @@ case "`uname`" in Darwin* ) darwin=true ;; - MINGW* ) + MSYS* | MINGW* ) msys=true ;; NONSTOP* ) -- cgit From 6b9ca5c143de6c28523f60ec362aef3c2e2d9a0b Mon Sep 17 00:00:00 2001 From: Thibault Gagnaux Date: Tue, 18 Jan 2022 21:38:28 +0100 Subject: chore: updates junit jupiter 5.8.1 -> 5.8.2 --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 0a1a5b0..02b545e 100644 --- a/build.gradle +++ b/build.gradle @@ -12,7 +12,7 @@ repositories dependencies { def junit5Group = 'org.junit.jupiter' - def junit5Version = '5.8.1' + def junit5Version = '5.8.2' testImplementation group: junit5Group, name: 'junit-jupiter-api', version: junit5Version testRuntimeOnly group: junit5Group, name: 'junit-jupiter-engine', version: junit5Version } -- cgit From be875af27f8bcbb8a7eea1cc19b58a1a426688b3 Mon Sep 17 00:00:00 2001 From: Thibault Gagnaux Date: Tue, 18 Jan 2022 21:46:19 +0100 Subject: chore: updates readme and version 1.6.0 -> 1.6.1 --- README.md | 2 ++ gradle.properties | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 89b5751..b659a5c 100644 --- a/README.md +++ b/README.md @@ -6,6 +6,8 @@ Simplifies setting up your Frege project. ## Installation +You need `java >= 11`. + ```bash git clone https://github.com/tricktron/frege-gradle-plugin.git ./gradlew publishToMavenLocal diff --git a/gradle.properties b/gradle.properties index 8fca547..9423bd0 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,2 +1,2 @@ group = ch.fhnw.thga -version = 1.6.0-alpha \ No newline at end of file +version = 1.6.1-alpha \ No newline at end of file -- cgit