Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
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-8.14.4-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-9.4.1-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down
7 changes: 2 additions & 5 deletions gradlew

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 1 addition & 2 deletions gradlew.bat

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion settings.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ buildscript {
}

plugins {
id "de.interactive_instruments.xtraplatform-settings" version "6.1.11"
id "de.interactive_instruments.xtraplatform-settings" version "6.1.14"
}

def versions = xtraplatform.getCatalogVersions(file("gradle/layers.versions.toml"))
Expand Down
13 changes: 1 addition & 12 deletions xtraplatform-cql/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@ configurations.api {
}

ext {
antlrOutDir = new File(buildDir, "/generated/src/main/antlr")
javaOutRootDir = new File(buildDir, "/generated/src/main/java")
javaOutDir = new File(javaOutRootDir, "de/ii/xtraplatform/cql/infra")
}
Expand All @@ -47,24 +46,14 @@ compileJava {
}

generateGrammarSource {
outputDirectory = antlrOutDir
outputDirectory = javaOutDir
outputs.dir(javaOutDir)
arguments += [
'-visitor',
'-no-listener',
'-package', 'de.ii.xtraplatform.cql.infra',
'-Xexact-output-dir'
]
doLast {

javaOutDir.mkdirs()
copy {
from antlrOutDir
into javaOutDir
}
println javaOutDir
println outputs.files.files
}
}

//prevent antlr from leaking into the module path
Expand Down
Loading