Skip to content

Commit

Permalink
Swap Gradle language from Groovy to Kotlin (#1413)
Browse files Browse the repository at this point in the history
* WIP

* WIP

* WIP

* Working?

* Fix usage of Java 17 API

* Update checkstyle rules

* Fix static analysis

* Updates to src dirs

* Fixing up missing test sourceSet

* Try another way to specify the antlr directory

* Third different way

* Add some logging

* merge master

* Change toolchain resolution

* Fix tests

* More tweaks to animalsniffer

* Fix formatting

* Trying random stuff

* More random stuff

* Small improvements for Gradle build (#1418)

* Removing references to idea

* Fix duplicative generation

* Remove references to idea project generation

---------

Co-authored-by: Anton Vasetenkov <[email protected]>
  • Loading branch information
JPercival and antvaset authored Nov 6, 2024
1 parent 5e6b939 commit 6af4b68
Show file tree
Hide file tree
Showing 59 changed files with 746 additions and 817 deletions.
12 changes: 0 additions & 12 deletions Src/java-quickstart/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
9 changes: 0 additions & 9 deletions Src/java/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
55 changes: 0 additions & 55 deletions Src/java/build.gradle

This file was deleted.

24 changes: 24 additions & 0 deletions Src/java/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -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)
}
15 changes: 0 additions & 15 deletions Src/java/buildSrc/build.gradle

This file was deleted.

19 changes: 19 additions & 0 deletions Src/java/buildSrc/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -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)
}
31 changes: 0 additions & 31 deletions Src/java/buildSrc/src/main/groovy/cql.fhir-conventions.gradle

This file was deleted.

181 changes: 0 additions & 181 deletions Src/java/buildSrc/src/main/groovy/cql.java-conventions.gradle

This file was deleted.

19 changes: 0 additions & 19 deletions Src/java/buildSrc/src/main/groovy/cql.library-conventions.gradle

This file was deleted.

Loading

0 comments on commit 6af4b68

Please sign in to comment.