From 86606e720111bffa0b0785a0083ebea5a34ffd87 Mon Sep 17 00:00:00 2001 From: Marten Lohstroh Date: Tue, 11 Apr 2023 23:02:54 -0700 Subject: [PATCH 1/6] Move to Gradle 8 --- build.gradle | 4 +--- gradle/source-layout.gradle | 4 +--- gradle/wrapper/gradle-wrapper.properties | 4 ++-- org.lflang.tests/build.gradle | 6 +++--- org.lflang/build.gradle | 3 +-- 5 files changed, 8 insertions(+), 13 deletions(-) diff --git a/build.gradle b/build.gradle index 6a98ba7165..3ee1934632 100644 --- a/build.gradle +++ b/build.gradle @@ -48,13 +48,11 @@ subprojects { implementation group: 'org.jetbrains.kotlin', name: 'kotlin-reflect', version: kotlinVersion } - - apply plugin: 'org.xtext.xtend' apply from: "${rootDir}/gradle/source-layout.gradle" apply plugin: 'eclipse' // generate xtend sources before kotlin compilation - compileKotlin.dependsOn("generateXtext") + compileKotlin.dependsOn("generateXtextLanguage") sourceCompatibility = JavaVersion.VERSION_17 targetCompatibility = JavaVersion.VERSION_17 diff --git a/gradle/source-layout.gradle b/gradle/source-layout.gradle index 9bbe4b3944..4c7d5f74c4 100644 --- a/gradle/source-layout.gradle +++ b/gradle/source-layout.gradle @@ -9,7 +9,6 @@ if (name.endsWith(".tests")) { java.srcDirs = ['src', 'src-gen'] kotlin.srcDirs = ['src', 'src-gen'] resources.srcDirs = ['src', 'src-gen'] - xtendOutputDir = 'xtend-gen' } } } else { @@ -17,7 +16,6 @@ if (name.endsWith(".tests")) { main { java.srcDirs = ['src', 'src-gen'] kotlin.srcDirs = ['src', 'src-gen'] - xtendOutputDir = 'xtend-gen' resources { srcDirs = ['src', 'src-gen'] exclude 'src/lib/rs/reactor-rust' // rust runtime does not need to be packed here. @@ -31,7 +29,7 @@ if (name.endsWith(".tests")) { } sourceSets.all { - resources.exclude '**/*.g', '**/*.mwe2', '**/*.xtend', '**/*._trace' + resources.exclude '**/*.g', '**/*.mwe2', '**/*._trace' } jar { diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index c284eb8a80..61227331ef 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.1-bin.zip -distributionSha256Sum=6147605a23b4eff6c334927a86ff3508cb5d6722cd624c97ded4c2e8640f1f87 +distributionUrl=https://services.gradle.org/distributions/gradle-8.0.2-bin.zip +distributionSha256Sum=ff7bf6a86f09b9b2c40bb8f48b25fc19cf2b2664fd1d220cd7ab833ec758d0d7 zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/org.lflang.tests/build.gradle b/org.lflang.tests/build.gradle index 020a3a8395..0cffff48ff 100644 --- a/org.lflang.tests/build.gradle +++ b/org.lflang.tests/build.gradle @@ -21,14 +21,14 @@ apply plugin: 'jacoco' jacoco { toolVersion = jacocoVersion - reportsDir = file("$buildDir/reports/jacoco") //default directory where jacoco generates test reports + reportsDirectory = file("$buildDir/reports/jacoco") //default directory where jacoco generates test reports } jacocoTestReport { reports { - xml.enabled true - csv.enabled true + xml.required = true + csv.required = true html.destination file("${buildDir}/reports/html/jacoco") xml.destination file("${buildDir}/reports/xml/jacoco") csv.destination file("${buildDir}/reports/csv/jacoco") diff --git a/org.lflang/build.gradle b/org.lflang/build.gradle index 9c6b9bf5d9..00410d16f5 100644 --- a/org.lflang/build.gradle +++ b/org.lflang/build.gradle @@ -81,7 +81,6 @@ task generateXtextLanguage(type: JavaExec) { }*/ } processResources.dependsOn(generateXtextLanguage) -generateXtext.dependsOn(generateXtextLanguage) clean.dependsOn(cleanGenerateXtextLanguage) eclipse.classpath.plusConfigurations += [configurations.mwe2] @@ -239,7 +238,7 @@ task generateLanguageDiagramServer { } shadowJar { - classifier = 'lds' + archiveClassifier = 'lds' // Handling of service loader registrations via META-INF/services/* mergeServiceFiles() From 139acd8e51587de0725b2dc7718712fb709fc342 Mon Sep 17 00:00:00 2001 From: Peter Donovan Date: Tue, 11 Apr 2023 23:31:19 -0700 Subject: [PATCH 2/6] Specify path to the generateXtextLanguage task. --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 3ee1934632..fe3b8fca21 100644 --- a/build.gradle +++ b/build.gradle @@ -52,7 +52,7 @@ subprojects { apply plugin: 'eclipse' // generate xtend sources before kotlin compilation - compileKotlin.dependsOn("generateXtextLanguage") + compileKotlin.dependsOn(":org.lflang:generateXtextLanguage") sourceCompatibility = JavaVersion.VERSION_17 targetCompatibility = JavaVersion.VERSION_17 From 53fcbd718837235dc60ca48a8a67aced5965c284 Mon Sep 17 00:00:00 2001 From: Marten Lohstroh Date: Tue, 11 Apr 2023 23:42:40 -0700 Subject: [PATCH 3/6] Apply xtext builder plugin (instead of xtend) --- build.gradle | 5 +++-- org.lflang/build.gradle | 2 ++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index 3ee1934632..173c4ad187 100644 --- a/build.gradle +++ b/build.gradle @@ -16,6 +16,7 @@ plugins { id 'java' id 'jacoco' id "com.diffplug.spotless" version "${spotlessVersion}" + id "org.xtext.builder" version "4.0.0" } subprojects { @@ -47,12 +48,12 @@ subprojects { implementation group: 'org.jetbrains.kotlin', name: 'kotlin-stdlib', version: kotlinVersion implementation group: 'org.jetbrains.kotlin', name: 'kotlin-reflect', version: kotlinVersion } - + apply plugin: "org.xtext.builder" apply from: "${rootDir}/gradle/source-layout.gradle" apply plugin: 'eclipse' // generate xtend sources before kotlin compilation - compileKotlin.dependsOn("generateXtextLanguage") + compileKotlin.dependsOn("generateXtext") sourceCompatibility = JavaVersion.VERSION_17 targetCompatibility = JavaVersion.VERSION_17 diff --git a/org.lflang/build.gradle b/org.lflang/build.gradle index 00410d16f5..ee2d3126e5 100644 --- a/org.lflang/build.gradle +++ b/org.lflang/build.gradle @@ -80,7 +80,9 @@ task generateXtextLanguage(type: JavaExec) { } }*/ } + processResources.dependsOn(generateXtextLanguage) +generateXtext.dependsOn(processResources) clean.dependsOn(cleanGenerateXtextLanguage) eclipse.classpath.plusConfigurations += [configurations.mwe2] From c0f8db93b47cd10cbe77d5d5bd2684ef2a0c8a71 Mon Sep 17 00:00:00 2001 From: Marten Lohstroh Date: Tue, 11 Apr 2023 23:56:46 -0700 Subject: [PATCH 4/6] Revert "Apply xtext builder plugin (instead of xtend)" This reverts commit 53fcbd718837235dc60ca48a8a67aced5965c284. --- build.gradle | 5 ++--- org.lflang/build.gradle | 2 -- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/build.gradle b/build.gradle index 173c4ad187..3ee1934632 100644 --- a/build.gradle +++ b/build.gradle @@ -16,7 +16,6 @@ plugins { id 'java' id 'jacoco' id "com.diffplug.spotless" version "${spotlessVersion}" - id "org.xtext.builder" version "4.0.0" } subprojects { @@ -48,12 +47,12 @@ subprojects { implementation group: 'org.jetbrains.kotlin', name: 'kotlin-stdlib', version: kotlinVersion implementation group: 'org.jetbrains.kotlin', name: 'kotlin-reflect', version: kotlinVersion } - apply plugin: "org.xtext.builder" + apply from: "${rootDir}/gradle/source-layout.gradle" apply plugin: 'eclipse' // generate xtend sources before kotlin compilation - compileKotlin.dependsOn("generateXtext") + compileKotlin.dependsOn("generateXtextLanguage") sourceCompatibility = JavaVersion.VERSION_17 targetCompatibility = JavaVersion.VERSION_17 diff --git a/org.lflang/build.gradle b/org.lflang/build.gradle index ee2d3126e5..00410d16f5 100644 --- a/org.lflang/build.gradle +++ b/org.lflang/build.gradle @@ -80,9 +80,7 @@ task generateXtextLanguage(type: JavaExec) { } }*/ } - processResources.dependsOn(generateXtextLanguage) -generateXtext.dependsOn(processResources) clean.dependsOn(cleanGenerateXtextLanguage) eclipse.classpath.plusConfigurations += [configurations.mwe2] From 1066c9d4f33a4483928f00dec768e7f43d99692e Mon Sep 17 00:00:00 2001 From: Marten Lohstroh Date: Wed, 12 Apr 2023 00:56:10 -0700 Subject: [PATCH 5/6] Update org.lflang.tests/build.gradle --- org.lflang.tests/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/org.lflang.tests/build.gradle b/org.lflang.tests/build.gradle index 0cffff48ff..408dbb4cf2 100644 --- a/org.lflang.tests/build.gradle +++ b/org.lflang.tests/build.gradle @@ -28,7 +28,7 @@ jacoco { jacocoTestReport { reports { xml.required = true - csv.required = true + csv.required = false html.destination file("${buildDir}/reports/html/jacoco") xml.destination file("${buildDir}/reports/xml/jacoco") csv.destination file("${buildDir}/reports/csv/jacoco") From 8472eef8b13efac36eba77b181bd5d34db186db3 Mon Sep 17 00:00:00 2001 From: Marten Lohstroh Date: Wed, 12 Apr 2023 01:19:28 -0700 Subject: [PATCH 6/6] Update org.lflang.tests/build.gradle --- org.lflang.tests/build.gradle | 1 - 1 file changed, 1 deletion(-) diff --git a/org.lflang.tests/build.gradle b/org.lflang.tests/build.gradle index 408dbb4cf2..97f664c1a8 100644 --- a/org.lflang.tests/build.gradle +++ b/org.lflang.tests/build.gradle @@ -31,7 +31,6 @@ jacocoTestReport { csv.required = false html.destination file("${buildDir}/reports/html/jacoco") xml.destination file("${buildDir}/reports/xml/jacoco") - csv.destination file("${buildDir}/reports/csv/jacoco") } def fileFilter = [ 'org/lflang/services/**', 'org/lflang/linguaFranca/impl/**',