Merge pull request #45 from hexagonkt/develop

Update Hexagon version
hexagontk · Oct 11, 2023 · eb6f317 · eb6f317
2 parents dd61ad6 + 77531ff
commit eb6f317
Show file tree

Hide file tree

Showing 18 changed files with 50 additions and 49 deletions.
diff --git a/args/src/main/kotlin/com/hexagonkt/args/Option.kt b/args/src/main/kotlin/com/hexagonkt/args/Option.kt
@@ -1,6 +1,6 @@
 package com.hexagonkt.args
 
-import com.hexagonkt.core.parseOrNull
+import com.hexagonkt.core.text.parseOrNull
 import kotlin.reflect.KClass
 
 data class Option<T : Any>(

diff --git a/args/src/main/kotlin/com/hexagonkt/args/Parameter.kt b/args/src/main/kotlin/com/hexagonkt/args/Parameter.kt
@@ -1,6 +1,6 @@
 package com.hexagonkt.args
 
-import com.hexagonkt.core.parseOrNull
+import com.hexagonkt.core.text.parseOrNull
 import kotlin.reflect.KClass
 
 data class Parameter<T : Any>(

diff --git a/args/src/main/kotlin/com/hexagonkt/args/Property.kt b/args/src/main/kotlin/com/hexagonkt/args/Property.kt
@@ -1,6 +1,6 @@
 package com.hexagonkt.args
 
-import com.hexagonkt.core.parsedClasses
+import com.hexagonkt.core.text.parsedClasses
 import kotlin.reflect.KClass
 
 /**

diff --git a/args/src/main/kotlin/com/hexagonkt/args/formatter/PropertyFormatter.kt b/args/src/main/kotlin/com/hexagonkt/args/formatter/PropertyFormatter.kt
@@ -4,7 +4,7 @@ import com.hexagonkt.args.Flag
 import com.hexagonkt.args.Option
 import com.hexagonkt.args.Parameter
 import com.hexagonkt.args.Property
-import com.hexagonkt.core.camelToSnake
+import com.hexagonkt.core.text.camelToSnake
 
 data class PropertyFormatter(
     val namesSeparator: String = ", ",

diff --git a/args/src/test/kotlin/com/hexagonkt/args/formatter/PropertyFormatterTest.kt b/args/src/test/kotlin/com/hexagonkt/args/formatter/PropertyFormatterTest.kt
@@ -3,8 +3,8 @@ package com.hexagonkt.args.formatter
 import com.hexagonkt.args.Option
 import com.hexagonkt.args.Parameter
 import com.hexagonkt.args.Property
-import com.hexagonkt.core.camelToWords
-import com.hexagonkt.core.wordsToSnake
+import com.hexagonkt.core.text.camelToWords
+import com.hexagonkt.core.text.wordsToSnake
 import java.io.File
 import java.net.InetAddress
 import java.net.URI

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -1,3 +1,5 @@
+import org.gradle.api.tasks.wrapper.Wrapper.DistributionType.ALL
+
 /*
  * Main build script, responsible for:
  *
@@ -65,3 +67,8 @@ task("release") {
         project.exec { commandLine = listOf("git", "push", "--tags") }
     }
 }
+
+tasks.wrapper {
+    gradleVersion = "8.4"
+    distributionType = ALL
+}
diff --git a/gradle.properties b/gradle.properties
@@ -6,7 +6,7 @@ org.gradle.console=plain
 
 # Gradle
 # Version synchronized with Hexagon release (master)
-version=3.2.0
+version=3.3.0
 group=com.hexagonkt.extra
 description=The atoms of your platform
 
@@ -20,7 +20,7 @@ siteHost=https://hexagonkt.com
 # VERSIONS
 mockkVersion=1.13.7
 dokkaVersion=1.9.0
-testcontainersVersion=1.19.0
+testcontainersVersion=1.19.1
 dockerJavaVersion=3.3.2
 
 # scheduler

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https://services.gradle.org/distributions/gradle-8.3-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-all.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

diff --git a/gradlew b/gradlew
@@ -145,15 +145,15 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
     case $MAX_FD in #(
       max*)
         # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC3045
+        # shellcheck disable=SC2039,SC3045
         MAX_FD=$( ulimit -H -n ) ||
             warn "Could not query maximum file descriptor limit"
     esac
     case $MAX_FD in  #(
       '' | soft) :;; #(
       *)
         # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC3045
+        # shellcheck disable=SC2039,SC3045
         ulimit -n "$MAX_FD" ||
             warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac
@@ -202,11 +202,11 @@ fi
 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
 DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
-# Collect all arguments for the java command;
-#   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
-#     shell script including quotes and variable substitutions, so put them in
-#     double quotes to make sure that they get re-expanded; and
-#   * put everything else in single quotes, so that it's not re-expanded.
+# Collect all arguments for the java command:
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+#     and any embedded shellness will be escaped.
+#   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
+#     treated as '${Hostname}' itself on the command line.
 
 set -- \
         "-Dorg.gradle.appname=$APP_BASE_NAME" \

diff --git a/processor/src/main/kotlin/com/hexagonkt/processor/schema/SchemaGenerator.kt b/processor/src/main/kotlin/com/hexagonkt/processor/schema/SchemaGenerator.kt
@@ -3,7 +3,7 @@ package com.hexagonkt.processor.schema
 import com.hexagonkt.processor.Type
 import com.hexagonkt.processor.Field
 import com.hexagonkt.processor.schema.PropertyType.*
-import com.hexagonkt.core.camelToWords
+import com.hexagonkt.core.text.camelToWords
 import com.hexagonkt.models.Country
 import com.hexagonkt.models.Email
 import com.hexagonkt.models.Language

diff --git a/scheduler/README.md b/scheduler/README.md
@@ -37,7 +37,7 @@ synchronization yourself.
 ### Example
 You can check a usage example in the following code:
 
-@code scheduler/src/test/kotlin/CronSchedulerSamplesTest.kt:sample
+@code scheduler/src/test/kotlin/CronSchedulerTest.kt:sample
 
 # Package com.hexagonkt.scheduler
 Classes for scheduling blocks of code repeatedly based on a [Cron] expression.

diff --git a/scheduler/src/main/kotlin/com/hexagonkt/scheduler/CronScheduler.kt b/scheduler/src/main/kotlin/com/hexagonkt/scheduler/CronScheduler.kt
@@ -19,7 +19,7 @@ import java.util.concurrent.TimeUnit.SECONDS
  * @param threads Number of threads used by the thread pool. By default, it is equals to the number
  *  of processors.
  *
- * @sample com.hexagonkt.scheduler.CronSchedulerSamplesTest.callbackExecutedProperly
+ * @sample com.hexagonkt.scheduler.CronSchedulerTest.callbackExecutedProperly
  */
 class CronScheduler(threads: Int = getRuntime().availableProcessors()) {
     private val log: Logger = Logger(this::class)

diff --git a/scheduler/src/test/kotlin/com/hexagonkt/scheduler/CronSchedulerSamplesTest.kt b/scheduler/src/test/kotlin/com/hexagonkt/scheduler/CronSchedulerSamplesTest.kt
diff --git a/scheduler/src/test/kotlin/com/hexagonkt/scheduler/CronSchedulerTest.kt b/scheduler/src/test/kotlin/com/hexagonkt/scheduler/CronSchedulerTest.kt
@@ -2,21 +2,25 @@ package com.hexagonkt.scheduler
 
 import kotlin.test.Test
 import java.lang.Thread.sleep
+import kotlin.test.assertEquals
 
 internal class CronSchedulerTest {
 
-    @Test fun `Callback is executed properly`() {
+    @Test fun callbackExecutedProperly() {
+        // sample
         val cron = CronScheduler()
         val times = 1
         var count = 0
 
+        // Increments the counter by one each second
         cron.schedule("0/1 * * * * ?") {
             count++
         }
 
-        sleep((times * 1_000) + 100L)
+        sleep((times * 1_000) + 200L)
         cron.shutdown()
-        assert(count == times)
+        assertEquals(count, times)
+        // sample
     }
 
     @Test fun `Failing callback does not prevent future executions`() {
@@ -29,8 +33,8 @@ internal class CronSchedulerTest {
             error("Error in cron job")
         }
 
-        sleep((times * 1_000) + 200L)
+        sleep((times * 1_000) + 400L)
         cron.shutdown()
-        assert(count == times)
+        assertEquals(count, times)
     }
 }
diff --git a/settings/README.md b/settings/README.md
@@ -0,0 +1,12 @@
+
+# Module settings
+Combine `args` and `serialization` to provide a full package to support applications configuration.
+
+It allows to load a parameter from command line, environment variable or a set of files with a
+priority:
+
+1. command line
+2. environment variable
+3. java property (only for testing)
+4. $HOME/.config/app/*.{json,yaml}
+5. $HOME/.config/app/*.{json,yaml}
diff --git a/terminal/src/main/kotlin/com/hexagonkt/terminal/AnsiCursor.kt b/terminal/src/main/kotlin/com/hexagonkt/terminal/AnsiCursor.kt
@@ -1,6 +1,6 @@
 package com.hexagonkt.terminal
 
-import com.hexagonkt.core.Ansi.CSI
+import com.hexagonkt.core.text.Ansi.CSI
 
 /**
  * Constants for console cursor handling with [ANSI](https://en.wikipedia.org/wiki/ANSI_escape_code)

diff --git a/terminal/src/main/kotlin/com/hexagonkt/terminal/AnsiMouse.kt b/terminal/src/main/kotlin/com/hexagonkt/terminal/AnsiMouse.kt
@@ -1,6 +1,6 @@
 package com.hexagonkt.terminal
 
-import com.hexagonkt.core.Ansi.CSI
+import com.hexagonkt.core.text.Ansi.CSI
 
 object AnsiMouse {
     const val ENABLE: String = "${CSI}?1003h"

diff --git a/terminal/src/main/kotlin/com/hexagonkt/terminal/AnsiScreen.kt b/terminal/src/main/kotlin/com/hexagonkt/terminal/AnsiScreen.kt
@@ -1,6 +1,6 @@
 package com.hexagonkt.terminal
 
-import com.hexagonkt.core.Ansi.CSI
+import com.hexagonkt.core.text.Ansi.CSI
 import com.hexagonkt.terminal.AnsiScreen.Region.FULL
 
 /**