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

Gradle bumped to version 8 #1691

Merged
merged 9 commits into from
Apr 16, 2023
Merged

Gradle bumped to version 8 #1691

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
86606e7
Move to Gradle 8
lhstrh Apr 12, 2023
139acd8
Specify path to the generateXtextLanguage task.
petervdonovan Apr 12, 2023
53fcbd7
Apply xtext builder plugin (instead of xtend)
lhstrh Apr 12, 2023
c0f8db9
Revert "Apply xtext builder plugin (instead of xtend)"
lhstrh Apr 12, 2023
48974e7
Merge remote-tracking branch 'origin/gradle-update-path' into gradle-…
lhstrh Apr 12, 2023
1066c9d
Update org.lflang.tests/build.gradle
lhstrh Apr 12, 2023
f2bfa27
Merge branch 'master' into gradle-update
lhstrh Apr 12, 2023
942a8bb
Merge branch 'master' into gradle-update
lhstrh Apr 12, 2023
8472eef
Update org.lflang.tests/build.gradle
lhstrh Apr 12, 2023
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
4 changes: 1 addition & 3 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(":org.lflang:generateXtextLanguage")

sourceCompatibility = JavaVersion.VERSION_17
targetCompatibility = JavaVersion.VERSION_17
Expand Down
4 changes: 1 addition & 3 deletions gradle/source-layout.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,13 @@ if (name.endsWith(".tests")) {
java.srcDirs = ['src', 'src-gen']
kotlin.srcDirs = ['src', 'src-gen']
resources.srcDirs = ['src', 'src-gen']
xtendOutputDir = 'xtend-gen'
}
}
} else {
sourceSets {
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.
Expand All @@ -31,7 +29,7 @@ if (name.endsWith(".tests")) {
}

sourceSets.all {
resources.exclude '**/*.g', '**/*.mwe2', '**/*.xtend', '**/*._trace'
resources.exclude '**/*.g', '**/*.mwe2', '**/*._trace'
}

jar {
Expand Down
4 changes: 2 additions & 2 deletions gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
7 changes: 3 additions & 4 deletions org.lflang.tests/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,17 +21,16 @@ 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 = 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/**',
Expand Down
3 changes: 1 addition & 2 deletions org.lflang/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,6 @@ task generateXtextLanguage(type: JavaExec) {
}*/
}
processResources.dependsOn(generateXtextLanguage)
generateXtext.dependsOn(generateXtextLanguage)
clean.dependsOn(cleanGenerateXtextLanguage)
eclipse.classpath.plusConfigurations += [configurations.mwe2]

Expand Down Expand Up @@ -239,7 +238,7 @@ task generateLanguageDiagramServer {
}

shadowJar {
classifier = 'lds'
archiveClassifier = 'lds'

// Handling of service loader registrations via META-INF/services/*
mergeServiceFiles()
Expand Down