Merge pull request #65 from truthencode/master

One LF shall rule them all

.gitattributes

@@ -0,0 +1,2 @@
+* text=auto
+

.scalafmt.conf

@@ -1,76 +1,76 @@
-version = "3.1.1"
-preset = Intellij
-
-maxColumn = 100
-docstrings {
-  removeEmpty = true
-  style = Asterisk
-}
-
-# Airframe support https://wvlet.org/airframe/docs/airframe-di
-optIn.breaksInsideChains = true
-
-project.git = true
-preset = default
-
-# Alignment is cool, until we have to view diffs and solve merge conflicts
-align.preset = none
-align.openBracketDefnSite = false
-
-# If true, the margin character | is aligned with the opening triple quote string literals
-assumeStandardLibraryStripMargin = true
-
-#From scalafmt website:
-#see: http://scalameta.org/scalafmt/#includeCurlyBraceInSelectChains
-includeCurlyBraceInSelectChains = false
-
-rewrite.rules = [
-  SortImports,
-  AvoidInfix,
-  SortModifiers
-]
-
-continuationIndent {
-  callSite = 2
-  defnSite = 2
-  extendSite = 2
-}
-
-danglingParentheses.preset = false
-
-newlines {
-  sometimesBeforeColonInMethodReturnType = true
-  penalizeSingleSelectMultiArgList = false
-  alwaysBeforeElseAfterCurlyIf = false
-  neverInResultType = false
-}
-
-spaces {
-  afterKeywordBeforeParen = true
-}
-
-binPack {
-  parentConstructors = true
-  literalArgumentLists = true
-}
-
-optIn {
-  breaksInsideChains = false
-  breakChainOnFirstMethodDot = true
-  configStyleArguments = true
-  blankLineBeforeDocstring = true
-}
-
-runner.dialect = Scala213Source3
-runner {
-  optimizer {
-    # Set to -1 to disable. Number of characters needed to trigger "config-style" formatting
-    # see: http://scalameta.org/scalafmt/#runner.optimizer.forceConfigStyleOnOffset
-    forceConfigStyleOnOffset = 150
-
-    # minimum number of func arguments before config-style (look at top of file) is enabled
-    forceConfigStyleMinArgCount = 2
-  }
-}
-
+version = "3.1.1"
+preset = Intellij
+
+maxColumn = 100
+docstrings {
+  removeEmpty = true
+  style = Asterisk
+}
+
+# Airframe support https://wvlet.org/airframe/docs/airframe-di
+optIn.breaksInsideChains = true
+
+project.git = true
+preset = default
+
+# Alignment is cool, until we have to view diffs and solve merge conflicts
+align.preset = none
+align.openBracketDefnSite = false
+
+# If true, the margin character | is aligned with the opening triple quote string literals
+assumeStandardLibraryStripMargin = true
+
+#From scalafmt website:
+#see: http://scalameta.org/scalafmt/#includeCurlyBraceInSelectChains
+includeCurlyBraceInSelectChains = false
+
+rewrite.rules = [
+  SortImports,
+  AvoidInfix,
+  SortModifiers
+]
+
+continuationIndent {
+  callSite = 2
+  defnSite = 2
+  extendSite = 2
+}
+
+danglingParentheses.preset = false
+
+newlines {
+  sometimesBeforeColonInMethodReturnType = true
+  penalizeSingleSelectMultiArgList = false
+  alwaysBeforeElseAfterCurlyIf = false
+  neverInResultType = false
+}
+
+spaces {
+  afterKeywordBeforeParen = true
+}
+
+binPack {
+  parentConstructors = true
+  literalArgumentLists = true
+}
+
+optIn {
+  breaksInsideChains = false
+  breakChainOnFirstMethodDot = true
+  configStyleArguments = true
+  blankLineBeforeDocstring = true
+}
+
+runner.dialect = Scala213Source3
+runner {
+  optimizer {
+    # Set to -1 to disable. Number of characters needed to trigger "config-style" formatting
+    # see: http://scalameta.org/scalafmt/#runner.optimizer.forceConfigStyleOnOffset
+    forceConfigStyleOnOffset = 150
+
+    # minimum number of func arguments before config-style (look at top of file) is enabled
+    forceConfigStyleMinArgCount = 2
+  }
+}
+
 lineEndings=preserve

buildSrc/src/main/kotlin/acceptance-test-conventions.gradle.kts

@@ -26,7 +26,7 @@ testSets {
             "acceptanceTest" {
                 exclude(
                     "**/*Spec.scala",
-                    // "**/*Helper*",
+                    // "**/*Helper.java",
                     "**/*Builder*"
                 )
             }

gradle.properties

@@ -125,7 +125,7 @@ semVerPluginVersion=1.0.4
 # Build utility and Insights
 taskTreePluginVersion=1.4
 # TODO: remove kordamp (superceded by shipKit)
-kordampGradlePluginVersion=0.47.0
+kordampGradlePluginVersion=0.49.0
 
 shipkitChangelogPluginVersion=1.1.13
 shipkitAutoVersionPluginVersion=1.1.19

gradle/scala.gradle.kts

@@ -1,51 +1,51 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- *
- * Copyright 2015-2021 Andre White.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/*
- * Include (apply from) to configure common dependencies and source set configurations for Scala projects 
- */
-// import org.unbrokendome.gradle.plugins.testsets.dsl.testSets
-
-
-pluginManager.withPlugin("scala-profiles") {
-    val implementation by configurations.getting
-    val testImplementation by configurations.getting
-    val testRuntimeOnly by configurations.getting
-    val scalaLibraryVersion: String by project
-    val scalaMajorVersion: String by project
-    dependencies {
-        implementation(platform(project(":ddo-platform-scala")))
-        implementation("org.scala-lang:scala-library:$scalaLibraryVersion")
-        implementation(group = "com.beachape", name = "enumeratum_${scalaMajorVersion}")
-        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(group = "ch.qos.logback", name = "logback-classic")
-        implementation(group = "com.typesafe.scala-logging", name = "scala-logging_${scalaMajorVersion}")
-        testImplementation(group = "org.scalatest", name = "scalatest_$scalaMajorVersion")
-        // Needed for scalatest html reports (formerly depended on pegdown)
-        testRuntimeOnly ("com.vladsch.flexmark:flexmark-all:0.35.10")
-        testImplementation(group = "org.mockito", name = "mockito-all")
-        testImplementation(group = "org.scalacheck", name = "scalacheck_$scalaMajorVersion")//, version = "1.15.4")
-        // 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")
-        //  api(platform(":ddo-platform-scala"))
-    }
-}
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Copyright 2015-2021 Andre White.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/*
+ * Include (apply from) to configure common dependencies and source set configurations for Scala projects 
+ */
+// import org.unbrokendome.gradle.plugins.testsets.dsl.testSets
+
+
+pluginManager.withPlugin("scala-profiles") {
+    val implementation by configurations.getting
+    val testImplementation by configurations.getting
+    val testRuntimeOnly by configurations.getting
+    val scalaLibraryVersion: String by project
+    val scalaMajorVersion: String by project
+    dependencies {
+        implementation(platform(project(":ddo-platform-scala")))
+        implementation("org.scala-lang:scala-library:$scalaLibraryVersion")
+        implementation(group = "com.beachape", name = "enumeratum_${scalaMajorVersion}")
+        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(group = "ch.qos.logback", name = "logback-classic")
+        implementation(group = "com.typesafe.scala-logging", name = "scala-logging_${scalaMajorVersion}")
+        testImplementation(group = "org.scalatest", name = "scalatest_$scalaMajorVersion")
+        // Needed for scalatest html reports (formerly depended on pegdown)
+        testRuntimeOnly ("com.vladsch.flexmark:flexmark-all:0.35.10")
+        testImplementation(group = "org.mockito", name = "mockito-all")
+        testImplementation(group = "org.scalacheck", name = "scalacheck_$scalaMajorVersion")//, version = "1.15.4")
+        // 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")
+        //  api(platform(":ddo-platform-scala"))
+    }
+}

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradlew

@@ -1,7 +1,7 @@
 #!/bin/sh
 
 #
-# Copyright © 2015-2021 the original authors.
+# Copyright © 2015-2021 the original authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -32,10 +32,10 @@
 #       Busybox and similar reduced shells will NOT work, because this script
 #       requires all of these POSIX shell features:
 #         * functions;
-#         * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
-#           «${var#prefix}», «${var%suffix}», and «$( cmd )»;
-#         * compound commands having a testable exit status, especially «case»;
-#         * various built-in commands including «command», «set», and «ulimit».
+#         * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
+#           «${var#prefix}», «${var%suffix}», and «$( cmd )»;
+#         * compound commands having a testable exit status, especially «case»;
+#         * various built-in commands including «command», «set», and «ulimit».
 #
 #   Important for patching:
 #

local.properties

@@ -4,5 +4,5 @@
 # Location of the SDK. This is only used by Gradle.
 # For customization when using a Version Control System, please read the
 # header note.
-#Sun May 17 15:07:43 MDT 2020
-sdk.dir=/mnt/c/Users/adarr/AppData/Local/Android/Sdk
+#Sun Dec 11 01:02:12 MST 2022
+sdk.dir=C\:\\Users\\adarr\\AppData\\Local\\Android\\Sdk