Merge pull request #90 from adarro/master

Sync fork

.bsp/sbt.json

@@ -1 +1,16 @@
-{"name":"sbt","version":"1.6.2","bspVersion":"2.0.0-M5","languages":["scala"],"argv":["/home/adarro/.sdkman/candidates/java/22.0.0.2.r11-grl/bin/java","-Xms100m","-Xmx100m","-classpath","/home/adarro/.sdkman/candidates/sbt/1.6.2/bin/sbt-launch.jar","-Dsbt.script=/home/adarro/.sdkman/candidates/sbt/current/bin/sbt","xsbt.boot.Boot","-bsp"]}
+{
+    "name": "sbt",
+    "version": "1.6.2",
+    "bspVersion": "2.0.0-M5",
+    "languages": ["scala"],
+    "argv": [
+        "/home/adarro/.sdkman/candidates/java/22.0.0.2.r11-grl/bin/java",
+        "-Xms100m",
+        "-Xmx100m",
+        "-classpath",
+        "/home/adarro/.sdkman/candidates/sbt/1.6.2/bin/sbt-launch.jar",
+        "-Dsbt.script=/home/adarro/.sdkman/candidates/sbt/current/bin/sbt",
+        "xsbt.boot.Boot",
+        "-bsp"
+    ]
+}

.circleci/config.yml

@@ -4,7 +4,7 @@ version: 2.1
 orbs:
     gradle: circleci/gradle@3.0.0
     codecov: codecov/codecov@3.2.5
-    # coverage-reporter: codacy/coverage-reporter@13.13.7
+    coverage-reporter: codacy/coverage-reporter@13.13.7
 # Define a job to be invoked later in a workflow.
 # See: https://circleci.com/docs/2.0/configuration-reference/#jobs
 jobs:
@@ -35,11 +35,11 @@ jobs:
         steps:
             - checkout
             - run: ./gradlew assemble
-            - run: if [ -e ./gradlew ]; then ./gradlew reportScoverage --continue;else gradle reportScoverage --continue;fi
+            - run: if [ -e ./gradlew ]; then ./gradlew reportScoverage aggregateScoverage --continue;else gradle reportScoverage aggregateScoverage --continue;fi
             - codecov/upload
-            # - coverage-reporter/send_report:
-            #       coverage-reports: report.xml,coverage.info
-            #       project-token: $CODACY_PROJECT_TOKEN
+            - coverage-reporter/send_report:
+                  coverage-reports: build/reports/scoverage/cobertura.xml
+                  project-token: $CODACY_PROJECT_TOKEN
             # Download and cache dependencies
             - restore_cache:
                   keys:

.github/workflows/todo-issues.yml

@@ -1,10 +1,18 @@
-    name: "Workflow"
-    on: ["push"]
-    jobs:
-      build:
-        runs-on: "ubuntu-latest"
+name: Create issues from todos
+permissions: read-all
+
+on:
+    push:
+        branches:
+            - master
+
+jobs:
+    todos:
+        runs-on: ubuntu-latest
         steps:
-          - uses: "actions/checkout@master"
-          - name: "TODO to Issue"
-            uses: "alstr/todo-to-issue-action@v4.5"
-            id: "todo"
+            - uses: actions/checkout@v1
+            - name: todo-actions
+              uses: dtinth/todo-actions@master
+              env:
+                  GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+                  TODO_ACTIONS_MONGO_URL: ${{ secrets.TODO_ACTIONS_MONGO_URL }}

.trunk/trunk.yaml

@@ -12,7 +12,7 @@ lint:
         - checkov@2.4.9
         - osv-scanner@1.3.6
         - trivy@0.45.0
-        - trufflehog@3.54.3
+        - trufflehog@3.54.4
         - taplo@0.8.1
         - actionlint@1.6.25
         - dotenv-linter@3.3.0
@@ -22,7 +22,7 @@ lint:
         - markdownlint@0.36.0
         - oxipng@8.0.0
         - prettier@3.0.3
-        - renovate@36.88.0
+        - renovate@36.91.0
         - scalafmt@3.7.14
         - shellcheck@0.9.0
         - shfmt@3.6.0
@@ -35,6 +35,7 @@ runtimes:
         - python@3.10.8
 actions:
     disabled:
+        - trunk-check-pre-commit
         - trunk-announce
         - trunk-check-pre-push
         - trunk-fmt-pre-commit

.vs/VSWorkspaceState.json

@@ -1,7 +1,5 @@
 {
-  "ExpandedNodes": [
-    ""
-  ],
+  "ExpandedNodes": [""],
   "SelectedNode": "\\build.gradle.kts",
   "PreviewInSolutionExplorer": false
-}
+}

CHANGELOG.md

@@ -1,18 +1,23 @@
 # Change Log
+
 All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](http://keepachangelog.com/)
 and this project adheres to [Semantic Versioning](http://semver.org/).
 
 ## [Unreleased]
+
 ### Added
-- Deity Feats
-- New Class: Alchemists
+
+-   Deity Feats
+-   New Class: Alchemists
 
 ### Changed
-- Testing Racial Feats to filter core feats (exclude deity based etc.)
+
+-   Testing Racial Feats to filter core feats (exclude deity based etc.)
 
 ## [0.1.0-alpha] - 2015-12-03
+
 ### Added
 
 [Unreleased]: https://github.com/truthencode/ddo-calc/0.1.0-alpha...HEAD

CODE_OF_CONDUCT.md

@@ -1,4 +1,3 @@
-
 # Contributor Covenant Code of Conduct
 
 ## Our Pledge
@@ -15,22 +14,22 @@ appearance, race, religion, or sexual identity and orientation.
 Examples of behavior that contributes to creating a positive environment
 include:
 
-* Using welcoming and inclusive language
-* Being respectful of differing viewpoints and experiences
-* Gracefully accepting constructive criticism
-* Focusing on what is best for the community
-* Showing empathy towards other community members
+-   Using welcoming and inclusive language
+-   Being respectful of differing viewpoints and experiences
+-   Gracefully accepting constructive criticism
+-   Focusing on what is best for the community
+-   Showing empathy towards other community members
 
 Examples of unacceptable behavior by participants include:
 
-* The use of sexualized language or imagery and unwelcome sexual attention or
-  advances
-* Trolling, insulting/derogatory comments, and personal or political attacks
-* Public or private harassment
-* Publishing others' private information, such as a physical or electronic
-  address, without explicit permission
-* Other conduct which could reasonably be considered inappropriate in a
-  professional setting
+-   The use of sexualized language or imagery and unwelcome sexual attention or
+    advances
+-   Trolling, insulting/derogatory comments, and personal or political attacks
+-   Public or private harassment
+-   Publishing others' private information, such as a physical or electronic
+    address, without explicit permission
+-   Other conduct which could reasonably be considered inappropriate in a
+    professional setting
 
 ## Our Responsibilities
 
@@ -73,6 +72,6 @@ available at https://www.contributor-covenant.org/version/1/4/code-of-conduct.ht
 
 [homepage]: https://www.contributor-covenant.org
 [abuse]: adarro@gmail.com
+
 For answers to common questions about this code of conduct, see
 https://www.contributor-covenant.org/faq
-

archived/README.md

@@ -1,4 +1,4 @@
 # Archived Projects
 
 These are subprojects that aren't currently incubated or slated for any active development.
-They may eventually be removed or revived. 
+They may eventually be removed or revived.

archived/toad-api/README.md

@@ -1,42 +1,46 @@
 # TOAD (The Oracle At DDO)
+
 <!-- START doctoc generated TOC please keep comment here to allow auto update -->
 <!-- DON'T EDIT THIS SECTION, INSTEAD RE-RUN doctoc TO UPDATE -->
+
 ## Contents
 
-- [Overview](#overview)
-- [Goals](#goals)
-- [Documentation](#documentation)
-- [TODO](#todo)
-- [Badges](#badges)
+-   [Overview](#overview)
+-   [Goals](#goals)
+-   [Documentation](#documentation)
+-   [TODO](#todo)
+-   [Badges](#badges)
 
 <!-- END doctoc generated TOC please keep comment here to allow auto update -->
+
 ## Overview
+
 ```
 DDO Calculations, Planner and Plotting
 ```
 
-
 This is a macro service that I am creating to become more familiar with alternative JVM languages and multiple platforms.
 
 This site is designed to host the API calls via multiple protocals compliant with Swagger with hopes of extending to other outlets.
 
 I am also a fan of [DDO Online](http://www.ddo.com).
 
-At the end, I would like to create a Character planner that includes the ability to discover / analyze equipment and support a database.  Target clients may include Android, Desktop via JavaFx and web (possible Google Web App).
+At the end, I would like to create a Character planner that includes the ability to discover / analyze equipment and support a database. Target clients may include Android, Desktop via JavaFx and web (possible Google Web App).
 
 The bulk of the codebase is targeted for Scala, with R providing some analytics / graphing of power curves etc.
 
 The transport will eventually be an interconnected RESTful API over Websockets where possible using JSoN with optional Xml outputs utilizing Firebase and / or MongoDB as a potential backend.
 
 ## Goals
 
-One of the final additional goals is extensibility.  The intention is to provide an Open API and to be both Swagger 2.0 and RAML 0.8 compliant.
+One of the final additional goals is extensibility. The intention is to provide an Open API and to be both Swagger 2.0 and RAML 0.8 compliant.
 
 This API will should feature Semantic Versioning once considered stable enough to promote out of Alpha status.
 
 ## Documentation
+
 ## TODO
-## Badges
-- - -
 
+## Badges
 
+---

archived/toad-api/build.gradle.kts

@@ -91,7 +91,7 @@ dependencies {
     implementation(
         group = "io.github.davidgregory084",
         name = "vertices-core_$scalaMajorVersion",
-        version = verticesVersion
+        version = verticesVersion,
     )
 
     implementation("io.vertx:vertx-codegen:$vertxVersion")
@@ -108,7 +108,6 @@ dependencies {
     testImplementation("org.testcontainers:mongodb:1.16.2")
     testImplementation("org.testcontainers:junit-jupiter:1.16.2")
 
-
     /* swapping to Zookeeper over hazelcast due to Java 9+ issues + Pulsar is using Zookeeper
     So we can attempt to save a bit of overhead
      */
@@ -151,14 +150,13 @@ dependencies {
 
     // Embed web server for testing// https://mvnrepository.com/artifact/org.eclipse.jetty/jetty-server
     testImplementation("org.eclipse.jetty:jetty-server:11.0.7")
-
 }
 
 group = "io.truthencode"
 version = "0.0.1-SNAPSHOT"
 description = "TOAD Api"
-//java.sourceCompatibility = JavaVersion.VERSION_11
-//java.targetCompatibility = JavaVersion.VERSION_11
+// java.sourceCompatibility = JavaVersion.VERSION_11
+// java.targetCompatibility = JavaVersion.VERSION_11
 
 publishing {
     publications.create<MavenPublication>("maven") {
@@ -170,13 +168,15 @@ tasks {
     withType(Test::class.java) {
         useJUnitPlatform {
             includeEngines = setOf("scalatest", "junit-jupiter")
-            if (ci.isCi)
-                excludeTags = setOf(
-                    "Integration",
-                    "io.truthencode.tags.Integration",
-                    "FunctionOnly",
-                    "io.truthencode.tags.FunctionOnly"
-                )
+            if (ci.isCi) {
+                excludeTags =
+                    setOf(
+                        "Integration",
+                        "io.truthencode.tags.Integration",
+                        "FunctionOnly",
+                        "io.truthencode.tags.FunctionOnly",
+                    )
+            }
             testLogging {
                 events("passed", "skipped", "failed")
             }
@@ -187,10 +187,10 @@ tasks {
     // logger.info("concordion output directory: *************************************")
     // // Use the built-in JUnit support of Gradle.
     // "test"(Test::class) {
-    // 
+    //
     // }
 }
 
 tasks.withType<JavaCompile> {
     options.encoding = "UTF-8"
-}
+}

archived/toad-api/configuration/vertx.env

@@ -1,10 +1,10 @@
-#  Pass java system properties via VERTX_OPTS
-#  E.g. export VERTX_OPTS="-Dsome.prop=blah"
-export VERTX_OPTS=""
 #  Pass application argument via APP_ARGS
 #  E.g. export RUN_ARGS="-conf ${OPENSHIFT_REPO_DIR}/config.json"
 #  If you want HAZELCAST_CLUSTERING don't remove the `-cp` value
 export RUN_ARGS="-cp $OPENSHIFT_VERTX_DIR/conf/cluster.xml:$OPENSHIFT_VERTX_DIR/conf"
+#  Pass java system properties via VERTX_OPTS
+#  E.g. export VERTX_OPTS="-Dsome.prop=blah"
+VERTX_OPTS=
 
 #  To enable Hazelcast clustering
 #  (require having created the application with `-s`)

archived/toad-api/src/main/resources/webroot/index.html

@@ -17,11 +17,12 @@
     limitations under the License.
 
 -->
-<!DOCTYPE>
+<!DOCTYPE >
 <html lang="en">
-<head><title>Welcome to the Sample</title></head>
-<body>
-
-<h1>This is a sample default page</h1>
-</body>
-</html>
+    <head>
+        <title>Welcome to the Sample</title>
+    </head>
+    <body>
+        <h1>This is a sample default page</h1>
+    </body>
+</html>