diff --git a/.circleci/config.yml b/.circleci/config.yml index 7a80ce30..2d129fe8 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -37,9 +37,6 @@ jobs: - run: ./gradlew assemble - run: if [ -e ./gradlew ]; then ./gradlew reportScoverage aggregateScoverage --continue;else gradle reportScoverage aggregateScoverage --continue;fi - codecov/upload - - coverage-reporter/send_report: - coverage-reports: build/reports/scoverage/cobertura.xml - project-token: $CODACY_PROJECT_TOKEN # Download and cache dependencies - restore_cache: keys: diff --git a/.github/workflows/codacy_analysis.yml b/.github/workflows/codacy_analysis.yml new file mode 100644 index 00000000..98e66e94 --- /dev/null +++ b/.github/workflows/codacy_analysis.yml @@ -0,0 +1,42 @@ +name: Codacy Analysis CLI +permissions: read-all +"on": + push: + branches: + - master + - main + pull_request: + branches: + - master + - main +jobs: + codacy-security-scan: + name: Codacy Security Scan + runs-on: ubuntu-latest + steps: + - name: Checkout code + uses: actions/checkout@main + - name: Run Codacy Analysis CLI + uses: codacy/codacy-analysis-cli-action@master + with: + output: results.sarif + format: sarif + gh-code-scanning-compat: true + max-allowed-issues: 2147483647 + - name: Upload SARIF results file + uses: github/codeql-action/upload-sarif@main + with: + sarif_file: results.sarif + codacy-analysis-cli: + name: Codacy Analysis CLI + runs-on: ubuntu-latest + steps: + - name: Checkout code + uses: actions/checkout@main + - name: Run Codacy Analysis CLI + uses: codacy/codacy-analysis-cli-action@master + with: + tool: spotbugs + api-token: "${{secrets.CODACY_API_TOKEN}}" + upload: true + max-allowed-issues: 2147483647 diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index f0d7b3f6..2688ce61 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/gradle.yml @@ -1,5 +1,5 @@ name: Run Gradle on PRs - +permissions: read-all on: push: branches: [master] diff --git a/.github/workflows/sonar_analysis.yml b/.github/workflows/sonar_analysis.yml new file mode 100644 index 00000000..e01e93f2 --- /dev/null +++ b/.github/workflows/sonar_analysis.yml @@ -0,0 +1,38 @@ +name: SonarCloud +on: + push: + branches: + - master + pull_request: + types: [opened, synchronize, reopened] +permissions: read-all +jobs: + build: + name: Build and analyze + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v3 + with: + fetch-depth: 0 # Shallow clones should be disabled for a better relevancy of analysis + - name: Set up JDK 17 + uses: actions/setup-java@v3 + with: + java-version: 17 + distribution: zulu # Alternative distribution options are available + - name: Cache SonarCloud packages + uses: actions/cache@v3 + with: + path: ~/.sonar/cache + key: ${{ runner.os }}-sonar + restore-keys: ${{ runner.os }}-sonar + - name: Cache Gradle packages + uses: actions/cache@v3 + with: + path: ~/.gradle/caches + key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle.kts') }} + restore-keys: ${{ runner.os }}-gradle + - name: Build and analyze + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # Needed to get PR information, if any + SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }} + run: ./gradlew build sonar --info diff --git a/.swm/adjustable-values-and-effects.vlrn49ld.sw.md b/.swm/adjustable-values-and-effects.vlrn49ld.sw.md new file mode 100644 index 00000000..5e00fc4c --- /dev/null +++ b/.swm/adjustable-values-and-effects.vlrn49ld.sw.md @@ -0,0 +1,24 @@ +--- +id: vlrn49ld +title: Adjustable values and Effects +file_version: 1.1.3 +app_version: 1.17.0 +--- + + + +```mermaid +\--- +title: Effect example +\--- +erDiagram +EFFECT ||--o{ ADJUSTMENT : places +ORDER ||--|{ LINE-ITEM : contains +CUSTOMER }|..|{ DELIVERY-ADDRESS : uses +``` + + + +
+ +This file was generated by Swimm. [Click here to view it in the app](https://app.swimm.io/repos/Z2l0aHViJTNBJTNBZGRvLWNhbGMlM0ElM0F0cnV0aGVuY29kZQ==/docs/vlrn49ld). diff --git a/.swm/swimm.json b/.swm/swimm.json new file mode 100644 index 00000000..de03a0aa --- /dev/null +++ b/.swm/swimm.json @@ -0,0 +1,6 @@ +{ + "repo_id": "Z2l0aHViJTNBJTNBZGRvLWNhbGMlM0ElM0F0cnV0aGVuY29kZQ==", + "configuration": { + "swmd": true + } +} diff --git a/.trunk/trunk.yaml b/.trunk/trunk.yaml index 1be6c29b..f05c901d 100644 --- a/.trunk/trunk.yaml +++ b/.trunk/trunk.yaml @@ -29,6 +29,10 @@ lint: - shellcheck@0.9.0 - shfmt@3.6.0 - yamllint@1.32.0 + ignore: + - linters: [ALL] + paths: + - incubating/** runtimes: enabled: - go@1.21.0 diff --git a/build-logic/build.gradle.kts b/build-logic/build.gradle.kts index a5e1f364..4543cca9 100644 --- a/build-logic/build.gradle.kts +++ b/build-logic/build.gradle.kts @@ -37,6 +37,8 @@ val defaultJavaToolChainVersion: String? by project val kasechangeVersion: String by project dependencies { + + implementation("org.sonarsource.scanner.gradle:sonarqube-gradle-plugin:4.3.1.3277") // enable gradle catalog for included convention plugins implementation(files(libs.javaClass.superclass.protectionDomain.codeSource.location)) // tool languages diff --git a/build-logic/src/main/kotlin/code-quality.gradle.kts b/build-logic/src/main/kotlin/code-quality.gradle.kts index 98ed247d..afcdba52 100644 --- a/build-logic/src/main/kotlin/code-quality.gradle.kts +++ b/build-logic/src/main/kotlin/code-quality.gradle.kts @@ -23,6 +23,7 @@ plugins { // id("com.github.hierynomus.license") id("com.diffplug.spotless") + id("org.sonarqube") // id("com.javiersc.gradle.plugins.dependency.updates") } @@ -140,4 +141,12 @@ configure { licenseHeaderFile(project.rootProject.file("gradle/LICENSE_HEADER_SPOTLESS"), "package") } } +} + +sonar { + properties { + property("sonar.projectKey", "truthencode_ddo-calc") + property("sonar.organization", "truthencode") + property("sonar.host.url", "https://sonarcloud.io") + } } \ No newline at end of file diff --git a/build-logic/src/main/kotlin/djaxonomy.test-conventions.gradle.kts b/build-logic/src/main/kotlin/djaxonomy.test-conventions.gradle.kts index 65dafa62..a510683e 100644 --- a/build-logic/src/main/kotlin/djaxonomy.test-conventions.gradle.kts +++ b/build-logic/src/main/kotlin/djaxonomy.test-conventions.gradle.kts @@ -111,10 +111,14 @@ fun JvmTestSuite.applyScalaTest() { project.testing { suites { - val integrationTest by registering(JvmTestSuite::class) + /* + TODO: Add functional / integration etc as needed + Also need to determine if this is a limited scope (i.e opt in by project) + integrationTest by registering(JvmTestSuite::class) + functionalTest by registering(JvmTestSuite::class) + performanceTest by registering(JvmTestSuite::class) + */ - val functionalTest by registering(JvmTestSuite::class) - val performanceTest by registering(JvmTestSuite::class) val test by getting(JvmTestSuite::class) val acceptanceTest = register("acceptanceTest") configureEach { diff --git a/docs/developers_guide/EffectZen.mmd b/docs/developers_guide/EffectZen.mmd index 819ea8da..c25b1578 100644 --- a/docs/developers_guide/EffectZen.mmd +++ b/docs/developers_guide/EffectZen.mmd @@ -1,8 +1,8 @@ zenuml title Effect Value Routing and Adjustment - @Actor Alice + @Actor Effect @Database Bob - @Database Mongo + @PUBSUB NewItems Alice->Bob: Hi Bob Bob->Alice: Hi Alice Mongo->Bob: Auditing diff --git a/docs/index.md b/docs/index.md index 824a5673..1d51f4b5 100644 --- a/docs/index.md +++ b/docs/index.md @@ -1,4 +1,4 @@ -# Welcome +# Hi Welcome ## DDO Calculations, Planner and Plotting @@ -20,6 +20,14 @@ This API will should feature Semantic Versioning once considered stable enough t [![GitHub license](https://img.shields.io/badge/license-Apache%202-blue.svg?style=plastic)](https://raw.githubusercontent.com/adarro/ddo-calc/master/LICENSE) [![Project Stats](https://www.openhub.net/p/ddo-calc/widgets/project_thin_badge?format=gif&ref=Thin+badge)](https://www.openhub.net/p/ddo-calc) [![GitHub forks](https://img.shields.io/github/forks/adarro/ddo-calc.svg?style=plastic)](https://github.com/adarro/ddo-calc/network) [![GitHub stars](https://img.shields.io/github/stars/adarro/ddo-calc.svg?style=plastic)](https://github.com/adarro/ddo-calc/stargazers) [![GitHub issues](https://img.shields.io/github/issues/adarro/ddo-calc.svg?style=plastic)](https://github.com/adarro/ddo-calc/issues) -[![Build status](https://ci.appveyor.com/api/projects/status/pnp0ghiwcu2lpkft?svg=true)](https://ci.appveyor.com/project/adarro/ddo-calc) [![Dependency Status](https://www.versioneye.com/user/projects/58c90554d01cb20045124875/badge.svg?style=plastic)](https://www.versioneye.com/user/projects/58c90554d01cb20045124875) [![CircleCI](https://circleci.com/gh/truthencode/ddo-calc/tree/master.svg?style=shield)](https://circleci.com/gh/truthencode/ddo-calc/?branch=master) +[![Build status](https://ci.appveyor.com/api/projects/status/pnp0ghiwcu2lpkft?svg=true)](https://ci.appveyor.com/project/adarro/ddo-calc) [![Dependency Status](https://www.versioneye.com/user/projects/58c90554d01cb20045124875/badge.svg?style=plastic)](https://www.versioneye.com/user/projects/58c90554d01cb20045124875) [![CircleCI](https://circleci.com/gh/truthencode/ddo-calc/tree/master.svg?style=shield)](https://circleci.com/gh/truthencode/ddo-calc/?branch=master) [![Documentation Status](https://readthedocs.org/projects/ddo-calc/badge/?version=latest)](https://ddo-calc.readthedocs.io/en/latest/?badge=latest) -[![Codacy Badge](https://app.codacy.com/project/badge/Grade/a32019b5ef2f4fe6a58a348a61184c3a)](https://app.codacy.com/gh/truthencode/ddo-calc/dashboard?utm_source=gh&utm_medium=referral&utm_content=&utm_campaign=Badge_grade)[![Quality gate](https://sonarcloud.io/api/project_badges/quality_gate?project=truthencode_ddo-calc)](https://sonarcloud.io/summary/new_code?id=truthencode_ddo-calc) [![Codecov](https://img.shields.io/codecov/c/github/adarro/ddo-calc.svg?maxAge=2592000?style=plastic)](https://codecov.io/github/adarro/ddo-calc) +[![Coverage Graph](https://codecov.io/gh/truthencode/ddo-calc/graphs/tree.svg?token=nGgcixP5rr)] + +| [![Quality gate](https://sonarcloud.io/api/project_badges/quality_gate?project=truthencode_ddo-calc)](https://sonarcloud.io/summary/new_code?id=truthencode_ddo-calc) | [![Codacy Badge](https://app.codacy.com/project/badge/Grade/a32019b5ef2f4fe6a58a348a61184c3a)](https://app.codacy.com/gh/truthencode/ddo-calc/dashboard?utm_source=gh&utm_medium=referral&utm_content=&utm_campaign=Badge_grade)
[![Codacy Badge](https://app.codacy.com/project/badge/Coverage/a32019b5ef2f4fe6a58a348a61184c3a)](https://app.codacy.com/gh/truthencode/ddo-calc/dashboard?utm_source=gh&utm_medium=referral&utm_content=&utm_campaign=Badge_coverage)
[![codecov](https://codecov.io/gh/truthencode/ddo-calc/graph/badge.svg?token=nGgcixP5rr)](https://codecov.io/gh/truthencode/ddo-calc) | +| ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | +| [![Vulnerabilities](https://sonarcloud.io/api/project_badges/measure?project=truthencode_ddo-calc&metric=vulnerabilities)](https://sonarcloud.io/summary/new_code?id=truthencode_ddo-calc) | +| [![Maintainability Rating](https://sonarcloud.io/api/project_badges/measure?project=truthencode_ddo-calc&metric=sqale_rating)](https://sonarcloud.io/summary/new_code?id=truthencode_ddo-calc) | +| [![Security Rating](https://sonarcloud.io/api/project_badges/measure?project=truthencode_ddo-calc&metric=security_rating)](https://sonarcloud.io/summary/new_code?id=truthencode_ddo-calc) | +| [![Reliability Rating](https://sonarcloud.io/api/project_badges/measure?project=truthencode_ddo-calc&metric=reliability_rating)](https://sonarcloud.io/summary/new_code?id=truthencode_ddo-calc) | +| [![Lines of Code](https://sonarcloud.io/api/project_badges/measure?project=truthencode_ddo-calc&metric=ncloc)](https://sonarcloud.io/summary/new_code?id=truthencode_ddo-calc) | diff --git a/incubating/amqp-quickstart-producer/src/main/docker/Dockerfile.jvm b/incubating/amqp-quickstart-producer/src/main/docker/Dockerfile.jvm index 952d1a75..d4aa7600 100644 --- a/incubating/amqp-quickstart-producer/src/main/docker/Dockerfile.jvm +++ b/incubating/amqp-quickstart-producer/src/main/docker/Dockerfile.jvm @@ -1,3 +1,5 @@ +# trunk-ignore-all(trivy/DS026) +# trunk-ignore-all(checkov/CKV_DOCKER_2) #### # This Dockerfile is used in order to build a container that runs the Quarkus application in JVM mode # diff --git a/incubating/amqp-quickstart-producer/src/main/docker/Dockerfile.legacy-jar b/incubating/amqp-quickstart-producer/src/main/docker/Dockerfile.legacy-jar index cc8e5b51..d6d6dcdf 100644 --- a/incubating/amqp-quickstart-producer/src/main/docker/Dockerfile.legacy-jar +++ b/incubating/amqp-quickstart-producer/src/main/docker/Dockerfile.legacy-jar @@ -1,3 +1,5 @@ +# trunk-ignore-all(trivy/DS026) +# trunk-ignore-all(checkov/CKV_DOCKER_2) #### # This Dockerfile is used in order to build a container that runs the Quarkus application in JVM mode # diff --git a/incubating/amqp-quickstart-producer/src/main/docker/Dockerfile.native b/incubating/amqp-quickstart-producer/src/main/docker/Dockerfile.native index 2a7836cb..263adb5d 100644 --- a/incubating/amqp-quickstart-producer/src/main/docker/Dockerfile.native +++ b/incubating/amqp-quickstart-producer/src/main/docker/Dockerfile.native @@ -1,3 +1,5 @@ +# trunk-ignore-all(trivy/DS026) +# trunk-ignore-all(checkov/CKV_DOCKER_2) #### # This Dockerfile is used in order to build a container that runs the Quarkus application in native (no JVM) mode. # diff --git a/incubating/amqp-quickstart-producer/src/main/docker/Dockerfile.native-micro b/incubating/amqp-quickstart-producer/src/main/docker/Dockerfile.native-micro index 0f55bd8b..80f1dd81 100644 --- a/incubating/amqp-quickstart-producer/src/main/docker/Dockerfile.native-micro +++ b/incubating/amqp-quickstart-producer/src/main/docker/Dockerfile.native-micro @@ -1,3 +1,5 @@ +# trunk-ignore-all(trivy/DS026) +# trunk-ignore-all(checkov/CKV_DOCKER_2) #### # This Dockerfile is used in order to build a container that runs the Quarkus application in native (no JVM) mode. # It uses a micro base image, tuned for Quarkus native executables. diff --git a/incubating/poc-scala-quarkus/src/main/docker/Dockerfile.jvm b/incubating/poc-scala-quarkus/src/main/docker/Dockerfile.jvm index 74ddda65..c658a868 100644 --- a/incubating/poc-scala-quarkus/src/main/docker/Dockerfile.jvm +++ b/incubating/poc-scala-quarkus/src/main/docker/Dockerfile.jvm @@ -1,5 +1,5 @@ +# trunk-ignore-all(trivy/DS026) # trunk-ignore-all(checkov/CKV_DOCKER_2) - #### # This Dockerfile is used in order to build a container that runs the Quarkus application in JVM mode # diff --git a/incubating/poc-scala-quarkus/src/main/docker/Dockerfile.legacy-jar b/incubating/poc-scala-quarkus/src/main/docker/Dockerfile.legacy-jar index 70233e49..8575ccef 100644 --- a/incubating/poc-scala-quarkus/src/main/docker/Dockerfile.legacy-jar +++ b/incubating/poc-scala-quarkus/src/main/docker/Dockerfile.legacy-jar @@ -1,3 +1,5 @@ +# trunk-ignore-all(trivy/DS026) +# trunk-ignore-all(checkov/CKV_DOCKER_2) #### # This Dockerfile is used in order to build a container that runs the Quarkus application in JVM mode # diff --git a/incubating/poc-scala-quarkus/src/main/docker/Dockerfile.native b/incubating/poc-scala-quarkus/src/main/docker/Dockerfile.native index 6f894572..327824f4 100644 --- a/incubating/poc-scala-quarkus/src/main/docker/Dockerfile.native +++ b/incubating/poc-scala-quarkus/src/main/docker/Dockerfile.native @@ -1,3 +1,5 @@ +# trunk-ignore-all(trivy/DS026) +# trunk-ignore-all(checkov/CKV_DOCKER_2) #### # This Dockerfile is used in order to build a container that runs the Quarkus application in native (no JVM) mode. # diff --git a/incubating/poc-scala-quarkus/src/main/docker/Dockerfile.native-micro b/incubating/poc-scala-quarkus/src/main/docker/Dockerfile.native-micro index 9a4058bb..1910f0ce 100644 --- a/incubating/poc-scala-quarkus/src/main/docker/Dockerfile.native-micro +++ b/incubating/poc-scala-quarkus/src/main/docker/Dockerfile.native-micro @@ -1,3 +1,5 @@ +# trunk-ignore-all(trivy/DS026) +# trunk-ignore-all(checkov/CKV_DOCKER_2) #### # This Dockerfile is used in order to build a container that runs the Quarkus application in native (no JVM) mode. # It uses a micro base image, tuned for Quarkus native executables. diff --git a/incubating/poc-scala-quarkus/src/main/resources/META-INF/resources/index.html b/incubating/poc-scala-quarkus/src/main/resources/META-INF/resources/index.html index af197216..7d7f0862 100644 --- a/incubating/poc-scala-quarkus/src/main/resources/META-INF/resources/index.html +++ b/incubating/poc-scala-quarkus/src/main/resources/META-INF/resources/index.html @@ -363,6 +363,7 @@

You just made a Quarkus application.

href="https://quarkus.io/guides/getting-started-reactive#reactive-jax-rs-resources" class="guide-link" target="_blank" + rel="noopener" >Related guide diff --git a/pom.xml b/pom.xml deleted file mode 100644 index d967f9f7..00000000 --- a/pom.xml +++ /dev/null @@ -1,1324 +0,0 @@ - - - - - 4.0.0 - ddo-calc - ddo-calc-parent - 0.1.0-alpha - pom - DDO Calculations - DDO Calculator for damage, planning and analysis (Super POM + Aggregator) - - subprojects/common/ddo-core - - - - src/specs/scala - src/specs/resources - src/test/specs - - 2.0.0 - 0.3.4 - - UTF-8 - UTF-8 - 1.8 - [1.8,) - ${jvm.version} - ${jvm.version} - UTF-8 - ${project.inceptionYear} - - 3.0.0-rc1 - - 3.3.3 - - 1.11.1 - 1.8.0 - - 1.8.0 - - - 1.1.0 - 1.4.11 - - - 2.32.0 - - 2.12 - 2.13.6 - 2.13.12 - ${scala.base} - 3.9.4 - ${scala.version} - 1.3.0 - 0.3.2 - 0.7.6 - - 1.9.10 - apache_v2 - 7.4.8 - ${project.build.outputDirectory}/${project.groupId}.properties - - 1.1 - - 4.13.2 - 0.5.5 - 2.0.2-beta - 1.0.0 - 2.1.1 - target/concordion - 3.0.0 - 1.0.5 - false - - 1.5.0.RELEASE - - - 3.1.0 - - 2.8.2 - - - - scoverage - reuseReports - ${project.basedir}/../target/jacoco.exec - scala - 3.4.0.905 - - 3.6 - 2.9 - github - - - 3.5.0 - - - src/specs/scala - src/specs/resources - src/test/specs - - - - - - io.vertx - vertx-web-scala_${scala.base} - 3.5.0 - - - io.vertx - vertx-auth-mongo-scala_${scala.base} - 3.5.0 - - - - - lt.velykis.maven.skins - reflow-maven-skin - 1.1.1 - - - lt.velykis.maven.skins - reflow-velocity-tools - 1.1.1 - - - - io.swagger - swagger-codegen - ${swagger.version} - - - io.swagger - swagger-codegen-maven-plugin - ${swagger.version} - - - - - com.typesafe.slick - slick_${scala.base} - ${slick.version} - - - com.typesafe.slick - slick-codegen_${scala.base} - ${slick.version} - - - - com.sksamuel.avro4s - avro4s-core_2.11 - ${avro.scala.version} - - - org.apache.avro - avro - ${avro.version} - - - - - com.revolutionanalytics.deployr - jRBroker - ${jrbroker.version} - - - io.onetapbeyond - fluent-r - ${fluentr.version} - - - - org.jetbrains.kotlin - kotlin-stdlib - ${kotlin.version} - - - - org.scala-lang - scala-library - ${scala.version} - - - org.scalactic - scalactic_${scala.base} - ${scalatest.version} - - - - com.beachape - enumeratum_${scala.base} - 1.5.10 - - - - com.typesafe.scala-logging - scala-logging_${scala.tools.version} - ${scala.logging.version} - - - ch.qos.logback - logback-classic - ${logback.version} - - - - com.typesafe - config - 1.4.1 - - - com.github.kxbmap - configs_${scala.base} - 0.4.4 - - - - com.wix - accord-core_${scala.tools.version} - ${accord.version} - - - - net.ruippeixotog - scala-scraper_${scala.tools.version} - ${scalascraper.version} - - - - org.scala-saddle - saddle-core_2.11 - 1.3.4 - - - - org.scalatra.scalate - scalate-core_${scala.base} - ${scalatra.version} - - - org.scalatra.scalate - scalate-test_${scala.base} - ${scalatra.version} - - - de.neuland-bfi - jade4j - 1.3.2 - - - - commons-codec - commons-codec - 1.15 - - - org.springframework.data - spring-data-commons-core - ${spring.boot.version} - true - - - - - org.springframework.boot - spring-boot-starter-parent - ${spring.boot.version} - pom - import - true - - - - - org.eclipse.xtend - org.eclipse.xtend.lib - ${xtend.version} - test - - - org.mockito - mockito-all - ${mockito.version} - test - - - - org.concordion - concordion - ${concordion.version} - test - - - org.concordion - concordion-embed-extension - 1.1.2 - test - - - - org.concordion - concordion-collapse-output-extension - 1.0.0 - test - - - org.scalatest - scalatest_${scala.tools.version} - ${scalatest.version} - test - - - org.evosuite - evosuite-standalone-runtime - ${evosuiteVersion} - test - - - - org.jnario - org.jnario.lib - ${jnario.version} - test - - - com.wix - accord-scalatest_${scala.tools.version} - ${accord.version} - test - - - junit - junit - ${junit.version} - test - - - org.testng - testng - 7.7.1 - test - - - com.github.bmsantos - cola-tests - ${cola.version} - test - - - - - - - - - com.versioneye - versioneye-maven-plugin - 3.11.1 - - - - - com.github.ekryd.sortpom - sortpom-maven-plugin - 2.4.0 - - custom_1 - ${project.build.sourceEncoding} - false - true - scope - - - - - sort - - verify - - - - - - org.apache.maven.plugins - maven-deploy-plugin - ${maven-deploy-plugin.version} - - true - - - - org.sonatype.plugins - nexus-staging-maven-plugin - 1.5.1 - - nexus - http://localhost:8081/nexus/ - false - - - - default-deploy - - deploy - - deploy - - - - - - - org.apache.maven.plugins - maven-project-info-reports-plugin - 2.8.1 - - - org.scoverage - scoverage-maven-plugin - ${scoverage.plugin.version} - - ${scala.version} - true - true - - - - - instrument - - check - - package - - - - - org.apache.maven.plugins - maven-surefire-report-plugin - 2.19.1 - - - org.codehaus.mojo - sonar-maven-plugin - ${sonar.plugin.version} - - - - sonar - - verify - - - - - - org.codehaus.mojo - versions-maven-plugin - 2.15.0 - - - - org.apache.maven.plugins - maven-enforcer-plugin - 1.4.1 - - - pre-release - - enforce - - - - - No Snapshots Allowed! - false - - - ${jvm.version} - - - true - - - - - - - com.mycila - license-maven-plugin - 2.11 - -
com/mycila/maven/plugin/license/templates/APACHE-2.txt
- - Andre White - adarro@gmail.com - - - src/main/scala/**/*.scala - src/test/scala/**/*.scala - src/main/java/**/*.java - src/test/java/**/*.java - **/*.xml - **/*.kt - **/*.r - - - **/test* - target/** - **/AndroidManifest.xml - **/README - src/test/resources/** - src/main/resources/** - - true - true - - JAVADOC_STYLE - HAML_STYLE - JAVADOC_STYLE - - - - - - check - - - - - - org.codehaus.mojo - build-helper-maven-plugin - 3.4.0 - - - pl.project13.maven - git-commit-id-plugin - 4.9.10 - - - - ${project.basedir}/.git - - - git - - - dd.MM.yyyy '@' HH:mm:ss z - - - - ${user.timezone} - - - false - - - - - - true - - - ${project.build.outputDirectory}/git.properties - - - properties - - - true - - - - false - - - - true - - - - true - - - - false - - - - false - - - - - - - - - - - - - - - - false - - - - 7 - - - - flat - - - - - - - false - - - false - - 7 - - - -dirty - - - * - - - false - - - - - - revision - - - - - - - - - external.atlassian.jgitflow - jgitflow-maven-plugin - 1.0-m5.1 - - - master - development - feature- - release- - hotfix- - v- - - - - - - - com.github.bmsantos - cola-maven-plugin - ${cola.version} - - - **/*Test.class - - - - - compile-cola-tests - - compile - - process-test-classes - - - - - - org.apache.maven.plugins - maven-failsafe-plugin - 2.22.2 - - - integration-test - - integration-test - - - - verify - - verify - - - - - - - - org.apache.maven.plugins - maven-compiler-plugin - 3.3 - - - - org.jetbrains.kotlin - kotlin-maven-plugin - ${kotlin.version} - - - compile - - compile - - compile - - - test-compile - - test-compile - - test-compile - - - - - - - - net.alchim31.maven - scala-maven-plugin - 3.2.2 - true - - scatatest:test surefire:test - - - - scala-compile - - compile - - - - -dependencyfile - -deprecation - -feature - -Ywarn-unused - -Xlint - -Xcheckinit - -Yrangepos - - JavaThenScala - - - - scala-test-compile - - testCompile - - - - -dependencyfile - -deprecation - -feature - -Ywarn-unused - -Xlint - -Xcheckinit - -Yrangepos - - - **/*.java - **/*.scala - - - - - - - - - - org.apache.maven.plugins - maven-javadoc-plugin - 2.9 - - 64m - 2g - ${project.build.directory} - true - - - - - org.apache.maven.plugins - maven-surefire-plugin - 2.19 - - - - org.scalatest - scalatest-maven-plugin - 2.2.0 - - ${project.build.directory}/surefire-reports - . - WDF TestSuite.txt - - target/concordion - - - - - org.pegdown - pegdown - 1.6.0 - - - - - scala-test - - test - - - Test - ${skip.tests} - - - - scala-test-spec - - test - - - Spec - ${skip.tests} - - - - scala-integration-test - - test - - integration-test - - IT - ${skip.tests} - - - - - - org.evosuite.plugins - evosuite-maven-plugin - ${evosuiteVersion} - - - - prepare - - process-test-classes - - - - - - - org.eclipse.xtend - xtend-maven-plugin - ${xtend.version} - - - - compile - testCompile - xtend-install-debug-info - - - ${project.build.directory}/xtend-gen/main - ${project.build.directory}/xtend-gen/test - - - - - - - org.jnario - jnario-maven-plugin - ${jnario.version} - - - - testCompile - xtend-test-install-debug-info - - - - - - - - de.smartics.maven.plugin - alias-maven-plugin - ${version.alias-maven-plugin} - - - alias - - alias - - - ${project.url}/alias-report.html - - - - - - - lt.velykis.maven.skins - reflow-maven-skin - 1.1.1 - - - lt.velykis.maven.skins - reflow-velocity-tools - 1.1.1 - - - org.apache.maven.plugins - maven-site-plugin - ${site.plugin.version} - - true - - - - lt.velykis.maven.skins - reflow-maven-skin - 1.1.1 - - - lt.velykis.maven.skins - reflow-velocity-tools - 1.1.1 - - - - org.apache.velocity - velocity-engine-core - 2.3 - - - org.apache.maven.skins - maven-fluido-skin - 1.5 - - - org.apache.maven.doxia - doxia-module-markdown - 1.7 - - - - - com.github.github - site-maven-plugin - 0.12 - - Creating site for ${project.version} - - - - - site - - site-deploy - - github - - Building site for my project - - ${project.version} - true - - - - - - - - - - - - - - - com.versioneye - versioneye-maven-plugin - - 58c90554d01cb20045124875 - - - - org.codehaus.mojo - versions-maven-plugin - - scalascraper.version,scala.base,scala.version,scala.tools.versionscala.minor.version,scala.binary.full.version,scalatest.version - - - - org.apache.maven.plugins - maven-dependency-plugin - - true - - - - uninstall - - purge-local-repository - - true - - ${project.groupId}:${project.artifactId} - true - - - - uninstall-dep - - purge-local-repository - - true - - false - false - - - - - - - com.github.github - site-maven-plugin - - - com.github.ekryd.sortpom - sortpom-maven-plugin - - - - - - - org.apache.maven.plugins - maven-project-info-reports-plugin - 2.9 - false - - - org.apache.maven.plugins - maven-pmd-plugin - 3.6 - true - - true - utf-8 - 100 - ${jvm.version} - - **/*Bean.java - **/generated/*.java - - - target/generated-sources/stubs - - - - - maven-dependency-plugin - 2.10 - - - org.scoverage - scoverage-maven-plugin - ${scoverage.plugin.version} - - - org.apache.maven.plugins - maven-jxr-plugin - 2.3 - - - aggregate - - aggregate - - false - - - - - org.apache.maven.plugins - maven-surefire-report-plugin - RELEASE - - - org.codehaus.mojo - versions-maven-plugin - 2.15.0 - - - - dependency-updates-report - plugin-updates-report - property-updates-report - - - - - - org.codehaus.mojo - taglist-maven-plugin - 3.0.0 - - - - http://github.com/adarro/ddo-calc/ - 2015 - - - awhite - Andre White - adarro@gmail.com - https://adarro.github.io - - owner - - - - - scm:git:git://github.com/github.com/adarro/ddo-calc.git - scm:git:git@github.com:adarro/ddo-calc.git - https://github.com/adarro/ddo-calc - - - GitHub Issues - https://github.com/adarro/ddo-calc/issues - - - - - SpringIO - Spring.IO releases - http://repo.spring.io/libs-release-remote - - - sonatype-releases - https://oss.sonatype.org/content/repositories/releases - - - central - http://repo1.maven.org/maven2/ - - - - - - true - - - false - - smartics-public - https://www.smartics.eu/nexus/content//groups/public-group - - - sonatype-releases - http://oss.sonatype.org/content/repositories/releases - - - central - http://repo1.maven.org/maven2 - - - - - - ddo.website - Adarro's Nexus - http://localhost/DdoObjects/ - - - - \ No newline at end of file diff --git a/settings.gradle.kts b/settings.gradle.kts index 0b1b7052..9c638ec2 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -60,6 +60,34 @@ plugins { id("com.mooltiverse.oss.nyx") id("org.gradle.toolchains.foojay-resolver-convention") } + +enableFeaturePreviewQuietly("TYPESAFE_PROJECT_ACCESSORS", "Type-safe project accessors") + +/** + * @see Feature request + */ +fun Settings.enableFeaturePreviewQuietly( + name: String, + summary: String, +) { + enableFeaturePreview(name) + + val logger: Any = + org.gradle.util.internal.IncubationLogger::class.java + .getDeclaredField("INCUBATING_FEATURE_HANDLER") + .apply { isAccessible = true } + .get(null) + + @Suppress("UNCHECKED_CAST") + val features: MutableSet = + org.gradle.internal.featurelifecycle.LoggingIncubatingFeatureHandler::class.java + .getDeclaredField("features") + .apply { isAccessible = true } + .get(logger) as MutableSet + + features.add(summary) +} + // at some point in the future, see if we can safely make this property optional so there is no build warning if it is // not specified or create a sensible default val projectFolderDelimiter: String by settings diff --git a/subprojects/common/ddo-antlr/build.gradle.kts b/subprojects/common/ddo-antlr/build.gradle.kts index 23b2309a..b90a96fe 100644 --- a/subprojects/common/ddo-antlr/build.gradle.kts +++ b/subprojects/common/ddo-antlr/build.gradle.kts @@ -14,22 +14,6 @@ dependencies { implementation(enforcedPlatform(project(":ddo-platform"))) antlr(libs.antlr4) // use ANTLR version 4 implementation(libs.logback.classic) -// // implementation(platform("org.jetbrains.kotlin:kotlin-bom:1.5.31")) -// // testImplementation(enforcedPlatform("org.junit:junit-bom:5.8.2")) - -// antlr("org.antlr:antlr4") // use ANTLR version 4 -// implementation("ch.qos.logback:logback-core") -// implementation("ch.qos.logback:logback-classic") -// implementation("org.slf4j:slf4j-api") -// // JUnit 5 -// // testImplementation(group = "org.junit.jupiter", name = "junit-jupiter-api") -// // testImplementation(group = "org.junit.platform", name = "junit-platform-runner") -// // testRuntimeOnly(group = "org.junit.platform", name = "junit-platform-engine") -// // testRuntimeOnly(group = "org.junit.platform", name = "junit-platform-launcher") -// // // testRuntimeOnly(group = "co.helmethair", name = "scalatest-junit-runner") -// // testRuntimeOnly(group = "org.junit.vintage", name = "junit-vintage-engine") -// // testRuntimeOnly(group = "org.junit.jupiter", name = "junit-jupiter-engine") -// } } repositories { @@ -56,53 +40,13 @@ data class PackagePath(val source: String, val packageName: String) { val packageFolder: File get() = packageToPath(packageName) } -// src/generated/java/EnchantmentsParserVisitor.java -// sourceSets { -// named("main") { -// java.sourceDirectories.files.plus(antlrJavaPath.baseOutputFolder) -// } -// } - -// Intellij -// idea { -// module { -// sourceDirs.add(antlrJavaPath.baseOutputFolder) -// generatedSourceDirs.add(antlrJavaPath.baseOutputFolder) -// // .addAll(listOf(javaGenPath)) -// } -// } - -kotlin { - logger.error("we are here") - - this.sourceSets.named("main") { -// kotlin.srcDir(antlrJavaPath.baseOutputFolder) -// logger.error("value of baseOutput (path) ${antlrJavaPath.baseOutputFolder.path}") -// this.kotlin.sourceDirectories.plus(antlrJavaPath.baseOutputFolder) -// -// // this.kotlin.sourceDirectories.plus(java.sourceSets.map{it.java.sourceDirectories.files}.flatten()) -// -// -// logger.error("Kotlin Enumerating source set files") - kotlin.sourceDirectories.forEach { - logger.error(it.name) - } - } -} tasks { generateGrammarSource { maxHeapSize = "64m" -// arguments = arguments + listOf("-visitor", "-long-messages", "-lib", antlrJavaPath.packageFolder.absolutePath) arguments = arguments + listOf("-visitor", "-long-messages") - // outputDirectory = antlrJavaPath.packageFolder -// logger.error("outputting generated antlr classes to ${antlrJavaPath.packageFolder}") } - // withType(KotlinCompile::class) { - // dependsOn(generateGrammarSource) - // } - named("compileKotlin") { dependsOn(generateGrammarSource) } @@ -110,27 +54,4 @@ tasks { named("compileTestKotlin") { dependsOn(generateTestGrammarSource) } - -// withType(Test::class.java) { -// systemProperties["concordion.output.dir"] = "${reporting.baseDir}/spec" -// } -// logger.info("concordion output directory: *************************************") -// // Use the built-in JUnit support of Gradle. -// "test"(Test::class) { -// useJUnitPlatform { -// includeEngines = setOf("junit-jupiter", "vintage") -// // if (ci.isCi) -// // excludeTags = setOf( -// // "Integration", -// // "io.truthencode.tags.Integration", -// // "FunctionOnly", -// // "io.truthencode.tags.FunctionOnly" -// // ) -// testLogging { -// events("passed", "skipped", "failed") -// } -// } -// -// outputs.upToDateWhen { false } -// } } \ No newline at end of file diff --git a/subprojects/common/ddo-core/build.gradle.kts b/subprojects/common/ddo-core/build.gradle.kts index 8f0b8bef..ad0d6df4 100644 --- a/subprojects/common/ddo-core/build.gradle.kts +++ b/subprojects/common/ddo-core/build.gradle.kts @@ -19,13 +19,7 @@ // ddo-core plugins { id("scala-library-profile") -// id("ru.vyarus.mkdocs") // version "3.0.0" id("djaxonomy.test-conventions") -// id("doc-uml") -} - -tasks.named("check") { - dependsOn(testing.suites.named("integrationTest")) } description = "Core DDO Objects" @@ -37,82 +31,28 @@ dependencies { implementation(project(":ddo-util")) implementation(project(":ddo-modeling")) - val scalaLibraryVersion: String by project - val scalaMajorVersion: String by project // Platform dependent // https://mvnrepository.com/artifact/org.json4s/json4s-native implementation(libs.json4s.native.s213) - -// annotationProcessor("net.thauvin.erik:semver:1.2.0") -// compileOnly("net.thauvin.erik:semver:1.2.0") - implementation(libs.scala2.library) implementation(libs.enumeratum.s213) implementation(libs.typesafe.config) - implementation(group = "com.github.kxbmap", name = "configs_$scalaMajorVersion") + implementation(libs.kxbmap.configs.s213) // validation and rules implementation(libs.wix.accord.core.s213) implementation(libs.logback.classic) implementation(libs.typesafe.scala.logging.s213) testImplementation(project(":ddo-testing-util")) - // testImplementation(group = "org.scalatest", name = "scalatest_$scalaMajorVersion") - // testImplementation(group = "org.scalacheck", name = "scalacheck_$scalaMajorVersion") - // testImplementation(group = "org.scalatestplus", "mockito-3-4_$scalaMajorVersion") - // testImplementation(group = "com.wix", name = "accord-scalatest_$scalaMajorVersion") - - // // JUnit 5 - // testRuntimeOnly(group = "org.junit.platform", name = "junit-platform-engine") - // testRuntimeOnly(group = "org.junit.platform", name = "junit-platform-launcher") - // testRuntimeOnly(group = "co.helmethair", name = "scalatest-junit-runner") - // testRuntimeOnly(group = "org.junit.vintage", name = "junit-vintage-engine") - - // Concordion BDD -// val acceptanceTestImplementation by configurations.getting -// acceptanceTestImplementation.extendsFrom(configurations["testCompileClasspath"]) -// acceptanceTestImplementation(group = "org.concordion", name = "concordion", version = concordionVersion) -// // flexmark (mostly for concordion / markdown) -// acceptanceTestImplementation("com.vladsch.flexmark:flexmark-all:0.62.2") - -// acceptanceTestImplementation( -// group = "com.vladsch.flexmark", -// name = "flexmark-ext-gfm-strikethrough", -// version = "0.62.2" -// ) -// acceptanceTestImplementation(group = "com.vladsch.flexmark", name = "flexmark-ext-emoji", version = "0.62.2") -// acceptanceTestImplementation ("com.vladsch.flexmark:flexmark-ext-yaml-front-matter:0.62.2") -// // https://mvnrepository.com/artifact/com.vladsch.flexmark/flexmark-ext-gfm-tasklist -// acceptanceTestImplementation( -// group = "com.vladsch.flexmark", -// name = "flexmark-ext-gfm-tasklist", -// version = "0.62.2" -// ) - - // testImplementation(group = "de.neuland-bfi", name = "jade4j", version = "1.2.7") - // testImplementation(group = "net.ruippeixotog", name = "scala-scraper_$scalaMajorVersion", version = "2.2.1") - // testCompileOnly(group = "org.jetbrains", name = "annotations", version = "17.0.0") - implementation(group = "org.jetbrains", name = "annotations", version = "17.0.0") } testing { suites { withType(JvmTestSuite::class).matching { it.name in listOf("acceptanceTest") }.configureEach { - dependencies { implementation(project(":ddo-modeling")) } } } -} - -// sourceSets { -// this.getByName("acceptanceTest") { -// java { -// setSrcDirs(listOf()) -// } -// scala { -// setSrcDirs(listOf("test/scala")) -// } -// } -// } \ No newline at end of file +} \ No newline at end of file diff --git a/subprojects/common/ddo-core/src/acceptanceTest/resources/io/truthencode/ddo/model/alignment/LawAxisSpec.html b/subprojects/common/ddo-core/src/acceptanceTest/resources/io/truthencode/ddo/model/alignment/LawAxisSpec.html index 0b7c84f3..5a508d51 100644 --- a/subprojects/common/ddo-core/src/acceptanceTest/resources/io/truthencode/ddo/model/alignment/LawAxisSpec.html +++ b/subprojects/common/ddo-core/src/acceptanceTest/resources/io/truthencode/ddo/model/alignment/LawAxisSpec.html @@ -17,7 +17,7 @@ limitations under the License. --> - + - - - - Law Axis - - - -

AlignmentSpec - Law Axis

-

- There are two - Alignment axis. - Lawful and Moral. -

-

Lawful Axis

- The law axis has three discrete values, which can be derived from case - insensitive string values -
- - - - - -
Law Axis
-
-

Case Sensitive Operations

-
- When case insensitivity is true -

- Then a search for "Lawful,Neutral,Chaotic" should return: (Alpha Sort used for verification) -

- - - - - - - - - - - - - -
Matching Values
Chaotic
Lawful
Neutral
-
-

Case Insensitive Operations

-
- When case insensitivity is false -

- Search for "LAWFUL,neutral,chAotIc" - should return: (Alpha Sort used for verification) -

-
- Should return - 0 - results -
-
-

Invalid Values

-
- Invalid values should be gracefully handled. -
- Search for "Lawful,fake,Doesn't exist" should return: Lawful -

Case-Sensitive?: false

- - - - - - - -
Matching Values
Lawful
-
-
- + + + + Law Axis + + + +

AlignmentSpec - Law Axis

+

+ There are two Alignment axis. Lawful and Moral. +

+

Lawful Axis

+The law axis has three discrete values, which can be derived from case insensitive string values +
+ + + + + +
Law Axis
+
+

Case Sensitive Operations

+
When case insensitivity is true +

Then a search for "Lawful,Neutral,Chaotic" should return: (Alpha Sort used for + verification) +

+ + + + + + + + + + + + + +
Matching Values
Chaotic
Lawful
Neutral
+
+

Case Insensitive Operations

+
When case insensitivity is false +

Search for "LAWFUL,neutral,chAotIc" should return: (Alpha Sort used for + verification) +

+
Should return 0 results
+
+

Invalid Values

+
+ Invalid values should be gracefully handled. +
Search for "Lawful,fake,Doesn't exist" should return: Lawful +

Case-Sensitive?: false

+ + + + + + + +
Matching Values
Lawful
+
+
+ diff --git a/subprojects/common/ddo-core/src/specs/resources/io/truthencode/ddo/model/enhancements/VileChemistSpec.md b/subprojects/common/ddo-core/src/specs/resources/io/truthencode/ddo/model/enhancements/VileChemistSpec.md index 3b2d328d..6e2382e7 100644 --- a/subprojects/common/ddo-core/src/specs/resources/io/truthencode/ddo/model/enhancements/VileChemistSpec.md +++ b/subprojects/common/ddo-core/src/specs/resources/io/truthencode/ddo/model/enhancements/VileChemistSpec.md @@ -88,6 +88,9 @@ from "[https://ddowiki.com/index.php?title=Vile_Chemist_enhancements&oldid=44342 [progression]: - "?=#result.progression()" [enhancement]: - "#enhancementId" [setUpEnhancement]: - "#result = loadFromKey(#enhancementId)" + + + [ranks]: - "?=#result.ranks()" [apcost]: - "?=#result.apcost()" [description]: - "?=#result.description()" diff --git a/subprojects/common/ddo-core/src/specs/resources/io/truthencode/ddo/model/feats/races/WarforgedFeatSpec.md b/subprojects/common/ddo-core/src/specs/resources/io/truthencode/ddo/model/feats/races/WarforgedFeatSpec.md index 664e6008..dcad79ef 100644 --- a/subprojects/common/ddo-core/src/specs/resources/io/truthencode/ddo/model/feats/races/WarforgedFeatSpec.md +++ b/subprojects/common/ddo-core/src/specs/resources/io/truthencode/ddo/model/feats/races/WarforgedFeatSpec.md @@ -24,7 +24,7 @@ [grantedFeats]: - "c:verify-rows=#feat:verifyGrantedFeats()" [availableFeats]: - "c:verify-rows=#feat:verifyAvailableFeats()" - + [_matchStrategy_]: - "c:matchStrategy=KeyMatch" [result]: - "?=#feat" @@ -32,8 +32,6 @@ [elf_race]: http://www.ddowiki.com/page/Elf "Elf" [sunelf_race]: http://www.ddowiki.com/page/Sun_Elf_(Morninglord) "Sun Elf (Morninglord)" - - ![Attribution-ShareAlike 2.5](/images/somerights20.png) [Attribution-ShareAlike 2.5](https://creativecommons.org/licenses/by-sa/2.5/) Images and general information available from http://ddowiki.com diff --git a/subprojects/common/ddo-etl/build.gradle.kts b/subprojects/common/ddo-etl/build.gradle.kts index e6c32f74..8389caa9 100644 --- a/subprojects/common/ddo-etl/build.gradle.kts +++ b/subprojects/common/ddo-etl/build.gradle.kts @@ -64,13 +64,4 @@ dependencies { implementation(libs.wix.accord.core.s213) implementation(libs.logback.classic) implementation(libs.typesafe.scala.logging.s213) -// testImplementation(group = "org.scalatest", name = "scalatest_$scalaMajorVersion") -// testImplementation(group = "org.scalacheck", name = "scalacheck_$scalaMajorVersion", version = "1.14.0") -// testImplementation(group = "org.mockito", name = "mockito-core") -// -// // JUnit 5 -// testRuntimeOnly(group = "org.junit.platform", name = "junit-platform-engine") -// testRuntimeOnly(group = "org.junit.platform", name = "junit-platform-launcher") -// testRuntimeOnly(group = "co.helmethair", name = "scalatest-junit-runner") -// testRuntimeOnly(group = "org.junit.vintage", name = "junit-vintage-engine") } \ No newline at end of file diff --git a/subprojects/common/ddo-modeling/build.gradle.kts b/subprojects/common/ddo-modeling/build.gradle.kts index c9b243b1..d9dc8ca0 100644 --- a/subprojects/common/ddo-modeling/build.gradle.kts +++ b/subprojects/common/ddo-modeling/build.gradle.kts @@ -245,25 +245,6 @@ if (cleanTask.isPresent) { cleanTask.get().dependsOn("cleanGeneratedScala") } -tasks { - // Use the built-in JUnit support of Gradle. - "test"(Test::class) { - useJUnitPlatform { - includeEngines = setOf("scalatest") - testLogging { - events("passed", "skipped", "failed") - } - } - } -// val sv = named("syncVersionFiles").get() -// // BUG: should not need to declare task dependencies when tasks use non-conflicting outputs -// val gas = named("generateAvroScala").get() -// gas.mustRunAfter(named("syncVersionFiles")) -// withType { -// mustRunAfter(gas) -// } -} - dependencies { /* https://github.com/fthomas/refined @@ -290,15 +271,4 @@ dependencies { implementation(libs.wix.accord.core.s213) implementation(libs.logback.classic) implementation(libs.typesafe.scala.logging.s213) -// val codeGenImplementation by configurations.getting { -// extendsFrom(configurations.named("implementation").get()) -// } - -// testImplementation(group = "org.scalatest", name = "scalatest_$scalaMajorVersion") -// testImplementation(group = "org.mockito", name = "mockito-core") -// -// // JUnit 5 -// testRuntimeOnly(group = "org.junit.platform", name = "junit-platform-engine") -// testRuntimeOnly(group = "org.junit.platform", name = "junit-platform-launcher") -// testRuntimeOnly(group = "co.helmethair", name = "scalatest-junit-runner") } \ No newline at end of file diff --git a/subprojects/common/ddo-util/build.gradle.kts b/subprojects/common/ddo-util/build.gradle.kts index f63efe8a..c1691ed7 100644 --- a/subprojects/common/ddo-util/build.gradle.kts +++ b/subprojects/common/ddo-util/build.gradle.kts @@ -31,37 +31,10 @@ dependencies { implementation(enforcedPlatform(project(":ddo-platform-scala"))) // Platform dependent - // https://mvnrepository.com/artifact/org.json4s/json4s-native -// implementation(group = "org.json4s", name = "json4s-native_$scalaMajorVersion") -// implementation(group = "org.scala-lang", name = "scala-library") implementation(libs.scala2.library) implementation(libs.enumeratum.s213) -// implementation(group = "com.typesafe", name = "config") -// implementation(group = "com.github.kxbmap", name = "configs_$scalaMajorVersion") -// // validation and rules -// implementation(group = "com.wix", name = "accord-core_$scalaMajorVersion") implementation(libs.logback.classic) implementation(libs.typesafe.scala.logging.s213) -// testImplementation(group = "org.scalatest", name = "scalatest_$scalaMajorVersion") -// testImplementation(group = "org.mockito", name = "mockito-core") -// -// // JUnit 5 -// testRuntimeOnly(group = "org.junit.platform", name = "junit-platform-engine") -// testRuntimeOnly(group = "org.junit.platform", name = "junit-platform-launcher") -// testRuntimeOnly(group = "co.helmethair", name = "scalatest-junit-runner") } } - -// tasks { -// // Use the built-in JUnit support of Gradle. -// "test"(Test::class) { -// useJUnitPlatform { -// includeEngines = setOf("scalatest") -// testLogging { -// events("passed", "skipped", "failed") -// } -// } -// } -// -// } \ No newline at end of file diff --git a/subprojects/common/ddo-web/build.gradle.kts b/subprojects/common/ddo-web/build.gradle.kts index 87b3bcf9..2e031ea9 100644 --- a/subprojects/common/ddo-web/build.gradle.kts +++ b/subprojects/common/ddo-web/build.gradle.kts @@ -16,9 +16,7 @@ * limitations under the License. */ plugins { - id("scala-library-profile") -// id("ru.vyarus.mkdocs") // version "3.0.0" id("djaxonomy.test-conventions") } @@ -36,6 +34,4 @@ dependencies { implementation(libs.typesafe.scala.logging.s213) implementation(libs.logback.classic) implementation(libs.enumeratum.s213) - - // implementation(group = "com.typesafe.scala-logging", name = "scala-logging_$scalaMajorVersion") } \ No newline at end of file diff --git a/subprojects/common/ddo-web/src/test/resources/Drow_Scimitar_of_the_Weapon_Master.html b/subprojects/common/ddo-web/src/test/resources/Drow_Scimitar_of_the_Weapon_Master.html index 9a47f59e..1cf63436 100644 --- a/subprojects/common/ddo-web/src/test/resources/Drow_Scimitar_of_the_Weapon_Master.html +++ b/subprojects/common/ddo-web/src/test/resources/Drow_Scimitar_of_the_Weapon_Master.html @@ -1029,21 +1029,7 @@

margin-top: 10px; margin-bottom: 5px; " - > - - - + >