Merge branch 'master' into proper-in-tests

.github/workflows/build.yml

@@ -21,14 +21,23 @@ jobs:
       with:
         distribution: 'temurin'
         java-version: '21'
+        cache: gradle
+    - name: Cache SonarCloud packages
+      uses: actions/cache@v4
+      with:
+        path: ~/.sonar/cache
+        key: ${{ runner.os }}-sonar
+        restore-keys: ${{ runner.os }}-sonar
     - name: Setup Gradle
       uses: gradle/actions/setup-gradle@v3
     - name: Run Gradle Build
       working-directory: ./Src/java
-      run: ./gradlew check publish
+      run: ./gradlew check publish sonar
       env:
         OSSRH_USERNAME: ${{ vars.OSSRH_USERNAME }}
         OSSRH_TOKEN: ${{ secrets.OSSRH_TOKEN }}
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}  # Needed to get PR information, if any
+        SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
     - name: Publish Test Report
       uses: mikepenz/action-junit-report@v4
       if: success() || failure() # always run even if the previous step fails

.github/workflows/check-pr.yml

@@ -23,11 +23,20 @@ jobs:
         distribution: 'temurin'
         java-version: '21'
         cache: gradle
+    - name: Cache SonarCloud packages
+      uses: actions/cache@v4
+      with:
+        path: ~/.sonar/cache
+        key: ${{ runner.os }}-sonar
+        restore-keys: ${{ runner.os }}-sonar
     - name: Setup Gradle
       uses: gradle/actions/setup-gradle@v3
     - name: Run Gradle Build
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}  # Needed to get PR information, if any
+        SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
       working-directory: ./Src/java
-      run: ./gradlew check -x spotlessCheck
+      run: ./gradlew check sonar -x spotlessCheck
     - name: Publish Test Report
       uses: mikepenz/action-junit-report@v4
       if: (success() || failure()) && matrix.os == 'ubuntu-latest'

Src/grammar/cql.g4

@@ -320,14 +320,14 @@ expression
     | expression 'properly'? 'between' expressionTerm 'and' expressionTerm                          #betweenExpression
     | ('duration' 'in')? pluralDateTimePrecision 'between' expressionTerm 'and' expressionTerm      #durationBetweenExpression
     | 'difference' 'in' pluralDateTimePrecision 'between' expressionTerm 'and' expressionTerm       #differenceBetweenExpression
+    | expression ('|' | 'union' | 'intersect' | 'except') expression                                #inFixSetExpression
     | expression ('<=' | '<' | '>' | '>=') expression                                               #inequalityExpression
     | expression intervalOperatorPhrase expression                                                  #timingExpression
     | expression ('=' | '!=' | '~' | '!~') expression                                               #equalityExpression
     | expression ('in' | 'contains') dateTimePrecisionSpecifier? expression                         #membershipExpression
     | expression 'and' expression                                                                   #andExpression
     | expression ('or' | 'xor') expression                                                          #orExpression
     | expression 'implies' expression                                                               #impliesExpression
-    | expression ('|' | 'union' | 'intersect' | 'except') expression                                #inFixSetExpression
     ;
 
 dateTimePrecision

Src/java-quickstart/README.md

@@ -20,18 +20,6 @@ To clean up the artifacts:
 
     ./gradlew clean
 
-# Generating IDE Projects
-
-You can generate an IDE project for IntelliJ IDEA:
-
-    ./gradlew idea
-
-This is preferred over having IDEA load the gradle file directly, because it (a) generates the CQL
-libraries, and (b) generates the configuration for the IDEA ANTLR plugin.  To open the project in
-IntelliJ IDEA, launch IDEA and open the `java-quickstart.ipr` file.
-
-See further below for installing and using the ANTLR plugin for IDEA.
-
 # Executing the Sample Code
 
 You can execute the sample code using the `gradlew` command or a script generated by gradle.

Src/java/.sonarlint/connectedMode.json

@@ -0,0 +1,4 @@
+{
+    "sonarCloudOrganization": "cqframework",
+    "projectKey": "cqframework_clinical_quality_language"
+}

Src/java/.vscode/settings.json

@@ -79,5 +79,9 @@
         ".git",
         "**/*.gradle",
         "**/test/resources/**"
-    ]
+    ],
+    "sonarlint.connectedMode.project": {
+        "connectionId": "cqframework",
+        "projectKey": "cqframework_clinical_quality_language"
+    }
 }

Src/java/README.md

@@ -31,15 +31,6 @@ To clean up the build artifacts:
 
     ./gradlew clean
 
-# Generating IDE Projects
-
-You can generate an IDE project for IntelliJ IDEa:
-
-    ./gradlew idea
-
-In addition to creating project modules for cql, model, quick, elm, cql-to-elm, and the tools projects, this will also import project
-modules for the CQL grammar and examples.
-
 # Executing the Sample Code
 
 You can execute the sample code using the `gradlew` command or a script generated by gradle.

Src/java/build.gradle.kts

@@ -0,0 +1,24 @@
+plugins {
+    kotlin("jvm") version "2.0.20"
+    id("org.sonarqube") version "4.4.1.3373"
+}
+
+sonar {
+  properties {
+    property("sonar.projectKey", "cqframework_clinical_quality_language")
+    property("sonar.organization", "cqframework")
+    property("sonar.host.url", "https://sonarcloud.io")
+  }
+}
+
+repositories {
+    mavenCentral()
+}
+
+dependencies {
+    implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8")
+}
+
+kotlin {
+    jvmToolchain(11)
+}

Src/java/buildSrc/build.gradle.kts

@@ -0,0 +1,19 @@
+plugins {
+    `kotlin-dsl`
+}
+
+repositories {
+    mavenCentral()
+    gradlePluginPortal()
+}
+
+dependencies {
+    implementation("net.ltgt.gradle:gradle-errorprone-plugin:3.1.0")
+    implementation("ru.vyarus:gradle-animalsniffer-plugin:1.7.0")
+    implementation("com.github.spotbugs.snom:spotbugs-gradle-plugin:5.0.14")
+    implementation("com.diffplug.spotless:spotless-plugin-gradle:6.23.3")
+}
+
+kotlin {
+    jvmToolchain(11)
+}