feat/scala3

.circleci/config.yml

@@ -1,57 +1,57 @@
-# Scala CircleCI 2.0 configuration file
-# See: https://circleci.com/docs/2.0/sample-config/
-version: 2.1
-orbs:
-    gradle: circleci/[email protected]
-    codecov: codecov/[email protected]
-    coverage-reporter: codacy/[email protected]
-# Define a job to be invoked later in a workflow.
-# See: https://circleci.com/docs/2.0/configuration-reference/#jobs
-jobs:
-    build_and_test:
-        # Specify the execution environment. You can specify an image from Dockerhub or use one of our Convenience Images from CircleCI's Developer Hub.
-        # See: https://circleci.com/docs/2.0/configuration-reference/#docker-machine-macos-windows-executor
-        docker:
-            # specify the version you desire here
-            - image: cimg/openjdk:17.0
-              auth:
-                  username: $docker_user
-                  password: $docker_token
-
-            # Specify service dependencies here if necessary
-            # CircleCI maintains a library of pre-built images
-            # documented at https://circleci.com/docs/2.0/circleci-images/
-            # - image: circleci/postgres:9.4
-
-        working_directory: ~/repo
-
-        environment:
-            # Customize the JVM maximum heap limit
-            JVM_OPTS: -Xmx3200m
-            TERM: dumb
-
-        # Add steps to the job
-        # See: https://circleci.com/docs/2.0/configuration-reference/#steps
-        steps:
-            - checkout
-            - run: ./gradlew assemble
-            - run: if [ -e ./gradlew ]; then ./gradlew reportScoverage aggregateScoverage --continue;else gradle reportScoverage aggregateScoverage --continue;fi
-            - codecov/upload
-            # Download and cache dependencies
-            - restore_cache:
-                  keys:
-                      - v1-dependencies-{{ checksum "build.gradle.kts" }}
-                      # fallback to using the latest cache if no exact match is found
-                      - v1-dependencies-
-
-            - save_cache:
-                  paths:
-                      - ~/.gradle
-                  key: v1-dependencies--{{ checksum "build.gradle.kts" }}
-workflows:
-    example-workflow:
-        jobs:
-            - build_and_test:
-                  context:
-                      - docker_creds
-            # run tests!
+# Scala CircleCI 2.0 configuration file
+# See: https://circleci.com/docs/2.0/sample-config/
+version: 2.1
+orbs:
+    gradle: circleci/[email protected]
+    codecov: codecov/[email protected]
+    coverage-reporter: codacy/[email protected]
+# Define a job to be invoked later in a workflow.
+# See: https://circleci.com/docs/2.0/configuration-reference/#jobs
+jobs:
+    build_and_test:
+        # Specify the execution environment. You can specify an image from Dockerhub or use one of our Convenience Images from CircleCI's Developer Hub.
+        # See: https://circleci.com/docs/2.0/configuration-reference/#docker-machine-macos-windows-executor
+        docker:
+            # specify the version you desire here
+            - image: cimg/openjdk:21.0
+              auth:
+                  username: $docker_user
+                  password: $docker_token
+
+            # Specify service dependencies here if necessary
+            # CircleCI maintains a library of pre-built images
+            # documented at https://circleci.com/docs/2.0/circleci-images/
+            # - image: circleci/postgres:9.4
+
+        working_directory: ~/repo
+
+        environment:
+            # Customize the JVM maximum heap limit
+            JVM_OPTS: -Xmx3200m
+            TERM: dumb
+
+        # Add steps to the job
+        # See: https://circleci.com/docs/2.0/configuration-reference/#steps
+        steps:
+            - run: git clone --depth 20 "$CIRCLE_REPOSITORY_URL" --branch "$CIRCLE_BRANCH"
+            - run: ./gradlew assemble
+            - run: if [ -e ./gradlew ]; then ./gradlew reportScoverage aggregateScoverage --continue;else gradle reportScoverage aggregateScoverage --continue;fi
+            - codecov/upload
+            # Download and cache dependencies
+            - restore_cache:
+                  keys:
+                      - v1-dependencies-{{ checksum "build.gradle.kts" }}
+                      # fallback to using the latest cache if no exact match is found
+                      - v1-dependencies-
+
+            - save_cache:
+                  paths:
+                      - ~/.gradle
+                  key: v1-dependencies--{{ checksum "build.gradle.kts" }}
+workflows:
+    example-workflow:
+        jobs:
+            - build_and_test:
+                  context:
+                      - docker_creds
+            # run tests!

.codacy.yaml

@@ -7,8 +7,8 @@ engines:
    enabled: true
    exclude_paths:
      - config/engines.yml
-     - **/test/**/*
-     - **/spec/**/*
+     - '**/test/**/*'
+     - '**/spec/**/*'
  metrics:
    enabled: true
    exclude_paths:

.editorconfig

@@ -2,28 +2,29 @@ root = true
 
 [*]
 charset = utf-8
-end_of_line = crlf
 insert_final_newline = false
 indent_style = space
 indent_size = 4
 
-[{*.avro, *.json, *.avsc}]
+[{*.avro,*.json,*.avsc}]
 indent_style = space
 indent_size = 2
 
 [*.feature]
 indent_style = space
 indent_size = 2
 
-[{*.kt, *.kts}]
+[{*.kt,*.kts}]
 indent_size = 4
+insert_final_newline = true
 
 
-[{*.scala, *.sc}]
+[{*.scala,*.sc,*.java}]
 indent_style = space
 indent_size = 4
+insert_final_newline = true
 
-[{.scalafix.config, *.conf}]
+[{.scalafix.config,*.conf}]
 indent_style = space
 indent_size = 2
 

.gitattributes

@@ -3,6 +3,7 @@
         # Handle line endings automatically for files detected as text
         # and leave all files detected as binary untouched.
         * text=auto
+        * text eol=lf
 
         #
         # The above will handle all files NOT found below

.github/workflows/codacy_analysis.yml

@@ -11,6 +11,7 @@ permissions: read-all
             - main
 jobs:
     codacy-security-scan:
+        if: github.repository == 'truthencode/ddo-calc'
         name: Codacy Security Scan
         runs-on: ubuntu-latest
         steps:
@@ -28,6 +29,7 @@ jobs:
               with:
                   sarif_file: results.sarif
     codacy-analysis-cli:
+        if: github.repository == 'truthencode/ddo-calc'
         name: Codacy Analysis CLI
         runs-on: ubuntu-latest
         steps:

.github/workflows/gradle.yml

@@ -1,25 +1,27 @@
-name: Run Gradle on PRs
-permissions: read-all
-on:
-    push:
-        branches: [master]
-    pull_request:
-        branches: [master]
-
-jobs:
-    gradle:
-        strategy:
-            matrix:
-                os: [ubuntu-latest, macos-latest, windows-latest]
-        runs-on: ${{ matrix.os }}
-        steps:
-            - uses: actions/checkout@v3
-            - uses: actions/setup-java@v3
-              with:
-                distribution: temurin
-                java-version: 21
-            - name: Run test and Coverage
-              uses: gradle/gradle-build-action@v2
-              with:
-                  gradle-version: wrapper
-                  arguments:  reportAcceptanceTestScoverage reportScoverage reportTestScoverage aggregateScoverage testAggregateTestReport
+name: Run Gradle on PRs
+permissions: read-all
+on:
+    push:
+        branches: [master]
+    pull_request:
+        branches: [master]
+
+jobs:
+    gradle:
+        strategy:
+            matrix:
+                os: [ubuntu-latest, macos-latest, windows-latest]
+        runs-on: ${{ matrix.os }}
+        steps:
+            - uses: actions/checkout@v4
+              with:
+                  fetch-depth: 0
+            - uses: actions/setup-java@v3
+              with:
+                  distribution: temurin
+                  java-version: 21
+            - name: Run test and Coverage
+              uses: gradle/gradle-build-action@v2
+              with:
+                  gradle-version: wrapper
+                  arguments: assemble

.github/workflows/sonar_analysis.yml

@@ -5,28 +5,30 @@ on:
             - master
     pull_request:
         types: [opened, synchronize, reopened]
+env:
+    GRADLE_OPTS: -Xmx1g -XX:MaxMetaspaceSize=512m
 permissions: read-all
 jobs:
     build:
         name: Build and analyze
         runs-on: ubuntu-latest
         steps:
-            - uses: actions/checkout@v3
+            - uses: actions/checkout@v4
               with:
                   fetch-depth: 0 # Shallow clones should be disabled for a better relevancy of analysis
             - name: Set up JDK 21
-              uses: actions/setup-java@v3
+              uses: actions/setup-java@v4
               with:
                   java-version: 21
                   distribution: zulu # Alternative distribution options are available
             - name: Cache SonarCloud packages
-              uses: actions/cache@v3
+              uses: actions/cache@v4
               with:
                   path: ~/.sonar/cache
                   key: ${{ runner.os }}-sonar
                   restore-keys: ${{ runner.os }}-sonar
             - name: Cache Gradle packages
-              uses: actions/cache@v3
+              uses: actions/cache@v4
               with:
                   path: ~/.gradle/caches
                   key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle.kts') }}
@@ -35,4 +37,4 @@ jobs:
               env:
                   GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # Needed to get PR information, if any
                   SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
-              run: ./gradlew build aggregateScoverage sonar --info
+              run: ./gradlew build sonar --info --stacktrace

.gitignore

@@ -1,6 +1,10 @@
 # Mobile Tools for Java (J2ME)
 .mtj.tmp/
 
+
+# local python env
+pytools/
+
 # Package Files #
 *.jar
 *.war
@@ -41,6 +45,8 @@ buildNumber.properties
 .Rproj.user/
 
 **/.antlr/
+*.interp
+*.tokens
 
 # produced vignettes
 vignettes/*.html
@@ -65,6 +71,7 @@ project/plugins/project/
 
 # Scala-IDE specific
 .scala_dependencies
+**/*.scala.semanticdb
 .worksheet
 /org/
 infinitest.filters
@@ -208,9 +215,12 @@ rslt.txt
 # auto generated files
 **/version.properties
 incubating/ddo-antlr/src/generated/java/*
-local.properties
+
 
 .quarkus/
 /subprojects/common/ddo-modeling/src/main/avro/
 /subprojects/common/ddo-core/src/generated/java/io/truthencode/ddo/core/GeneratedVersion.java
 fixle.sh
+/.env
+/.envrc
+/py/

.nvmrc

@@ -1 +1 @@
-v20.3.1
+v23.4.0

.scalafmt.conf

@@ -1,4 +1,4 @@
-version = "3.7.14"
+version = "3.9.1"
 preset = Intellij
 
 maxColumn = 100
@@ -61,7 +61,7 @@ optIn {
   forceBlankLineBeforeDocstring = true
 }
 
-runner.dialect = Scala213Source3
+runner.dialect = Scala3
 runner {
   optimizer {
     # Set to -1 to disable. Number of characters needed to trigger "config-style" formatting

.swm/bump-pegdown-from-150-to-160.k7r9qicc.sw.md

@@ -1,6 +1,7 @@
 ---
 title: Bump pegdown from 1.5.0 to 1.6.0
 ---
+
 # Introduction
 
 This document will walk you through the implementation of the version upgrade feature for the `pegdown` library in our project. The `pegdown` library is a pure-Java Markdown processor that we use for parsing and converting Markdown into HTML in our application. We will cover:
@@ -21,20 +22,6 @@ The `pegdown` library is a crucial part of our application as it handles the con
 
 # How was the version upgrade implemented?
 
-<SwmSnippet path="/pom.xml" line="979">
-
----
-
-The version upgrade was implemented by modifying the  file, which is the Project Object Model file for our Maven project. This file contains information about the project and configuration details used by Maven to build the project. In the  file, we updated the version of the `pegdown` library from 1.5.0 to 1.6.0. This tells Maven to use version 1.6.0 of the `pegdown` library when building our project.
-
-```xml
-                            <version>1.6.0</version>
-```
-
----
-
-</SwmSnippet>
-
 By making this change, we ensure that our application is using the latest, most secure, and efficient version of the `pegdown` library. This will help to improve the overall performance and security of our application.
 
 <SwmMeta version="3.0.0" repo-id="Z2l0aHViJTNBJTNBZGRvLWNhbGMlM0ElM0F0cnV0aGVuY29kZQ=="><sup>Powered by [Swimm](https://app.swimm.io/)</sup></SwmMeta>

.swm/effects.8sjwdkts.sw.md

@@ -1,6 +1,7 @@
 ---
 title: Effects
 ---
+
 ```mermaid
 gantt
 title A Gantt Diagram

.trunk/.gitignore

@@ -6,3 +6,4 @@
 plugins
 user_trunk.yaml
 user.yaml
+tmp