Merge branch 'develop' into feature/arg2p-integration

buildSrc/src/main/kotlin/Libs.kt

@@ -92,35 +92,35 @@ object Libs {
 
     const val org_danilopianini_git_sensitive_semantic_versioning_gradle_plugin: String =
             "org.danilopianini.git-sensitive-semantic-versioning:org.danilopianini.git-sensitive-semantic-versioning.gradle.plugin:" +
-                    Versions.org_danilopianini_git_sensitive_semantic_versioning_gradle_plugin
+            Versions.org_danilopianini_git_sensitive_semantic_versioning_gradle_plugin
 
     const val com_github_breadmoirai_github_release_gradle_plugin: String =
-        "com.github.breadmoirai.github-release:com.github.breadmoirai.github-release.gradle.plugin:" +
-                Versions.com_github_breadmoirai_github_release_gradle_plugin
+            "com.github.breadmoirai.github-release:com.github.breadmoirai.github-release.gradle.plugin:" +
+            Versions.com_github_breadmoirai_github_release_gradle_plugin
 
     const val org_jetbrains_kotlin_multiplatform_gradle_plugin: String =
-        "org.jetbrains.kotlin.multiplatform:org.jetbrains.kotlin.multiplatform.gradle.plugin:" +
-                Versions.org_jetbrains_kotlin_multiplatform_gradle_plugin
+            "org.jetbrains.kotlin.multiplatform:org.jetbrains.kotlin.multiplatform.gradle.plugin:" +
+            Versions.org_jetbrains_kotlin_multiplatform_gradle_plugin
 
     const val com_github_johnrengelman_shadow_gradle_plugin: String =
-        "com.github.johnrengelman.shadow:com.github.johnrengelman.shadow.gradle.plugin:" +
-                Versions.com_github_johnrengelman_shadow_gradle_plugin
+            "com.github.johnrengelman.shadow:com.github.johnrengelman.shadow.gradle.plugin:" +
+            Versions.com_github_johnrengelman_shadow_gradle_plugin
 
     const val de_fayard_buildsrcversions_gradle_plugin: String =
-        "de.fayard.buildSrcVersions:de.fayard.buildSrcVersions.gradle.plugin:" +
-                Versions.de_fayard_buildsrcversions_gradle_plugin
+            "de.fayard.buildSrcVersions:de.fayard.buildSrcVersions.gradle.plugin:" +
+            Versions.de_fayard_buildsrcversions_gradle_plugin
 
     const val com_eden_orchidplugin_gradle_plugin: String =
-        "com.eden.orchidPlugin:com.eden.orchidPlugin.gradle.plugin:" +
-                Versions.com_eden_orchidplugin_gradle_plugin
+            "com.eden.orchidPlugin:com.eden.orchidPlugin.gradle.plugin:" +
+            Versions.com_eden_orchidplugin_gradle_plugin
 
     const val org_jetbrains_dokka_gradle_plugin: String =
-        "org.jetbrains.dokka:org.jetbrains.dokka.gradle.plugin:" +
-                Versions.org_jetbrains_dokka_gradle_plugin
+            "org.jetbrains.dokka:org.jetbrains.dokka.gradle.plugin:" +
+            Versions.org_jetbrains_dokka_gradle_plugin
 
     const val com_jfrog_bintray_gradle_plugin: String =
-        "com.jfrog.bintray:com.jfrog.bintray.gradle.plugin:" +
-                Versions.com_jfrog_bintray_gradle_plugin
+            "com.jfrog.bintray:com.jfrog.bintray.gradle.plugin:" +
+            Versions.com_jfrog_bintray_gradle_plugin
 
     /**
      * 2.7.1

buildSrc/src/main/kotlin/Versions.kt

@@ -12,7 +12,7 @@ import org.gradle.plugin.use.PluginDependencySpec
  * YOU are responsible for updating manually the dependency version.
  */
 object Versions {
-    const val io_github_javaeden_orchid: String = "0.20.0"
+    const val io_github_javaeden_orchid: String = "0.21.0"
 
     const val org_jetbrains_kotlin: String = "1.3.72"
 
@@ -28,7 +28,7 @@ object Versions {
 
     const val de_fayard_buildsrcversions_gradle_plugin: String = "0.7.0"
 
-    const val com_eden_orchidplugin_gradle_plugin: String = "0.20.0"
+    const val com_eden_orchidplugin_gradle_plugin: String = "0.20.0" // available: "0.21.0"
 
     const val org_jetbrains_dokka_gradle_plugin: String = "0.10.1"
 
@@ -41,11 +41,11 @@ object Versions {
     const val kt_math: String = "0.1.3"
 
     /**
-     * Current version: "6.4.1"
+     * Current version: "6.5"
      * See issue 19: How to update Gradle itself?
      * https://github.com/jmfayard/buildSrcVersions/issues/19
      */
-    const val gradleLatestVersion: String = "6.4.1"
+    const val gradleLatestVersion: String = "6.5"
 }
 
 /**

core/build.gradle.kts

@@ -19,7 +19,7 @@ kotlin {
                         |package $tuPrologPackage
                         |
                         |object Info {
-                        |    val VERSION = "${rootProject.version}"
+                        |    const val VERSION = "${rootProject.version}"
                         |}
                     """.trimMargin())
                 }

gradle.properties

@@ -6,6 +6,9 @@ javaVersion=8
 # semicolon separated
 ktFreeCompilerArgsJvm=-Xjvm-default=enable
 
+# mocha timeout for a single test method, in milli-seconds
+mochaTimeout=60000
+
 # Signing
 signingKey=
 signingPassword=

gradle/wrapper/gradle-wrapper.properties

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

solve-streams/gradle.properties

@@ -1,6 +1,2 @@
-# mocha timeout for a single test method, in milli-seconds
-mochaTimeout=20000
-
 jvmStackSize=256M
-
 jvmMaxHeapSize=1G

solve-streams/src/commonMain/kotlin/it/unibo/tuprolog/solve/solver/fsm/impl/StateRuleSelection.kt

@@ -42,8 +42,7 @@ internal class StateRuleSelection(
                             wellFormedRuleBody,
                             unifyingSubstitution,
                             isChoicePointChild = isChoicePoint,
-                            requestIssuingInstant = if (solve.query === solve.context.procedure)
-                                currentTimeInstant() else solve.requestIssuingInstant
+                            requestIssuingInstant = currentTimeInstant()
                         )
 
                     val subInitialState = StateInit(subSolveRequest.initializeForSubRuleScope())

solve-streams/src/commonTest/kotlin/it/unibo/tuprolog/solve/systemtest/StreamsSolverSystemTesting.kt

@@ -17,9 +17,6 @@ class StreamsSolverSystemTesting : SolverFactory, SolverTest {
 
     override val defaultBuiltins: AliasedLibrary = DefaultBuiltins
 
-//    override val maxDuration: TimeDuration
-//        get() = mediumDuration
-
     override fun solverOf(
         libraries: Libraries,
         flags: PrologFlags,
@@ -113,13 +110,11 @@ class StreamsSolverSystemTesting : SolverFactory, SolverTest {
     }
 
     @Test
-    @Ignore
     override fun testTimeout3() {
         prototype.testTimeout3()
     }
 
     @Test
-    @Ignore
     override fun testTimeout4() {
         prototype.testTimeout4()
     }

test-solve/src/commonMain/kotlin/it/unibo/tuprolog/solve/SolverTest.kt

@@ -37,7 +37,7 @@ interface SolverTest {
 
     /** A short test max duration */
     val shortDuration: TimeDuration
-        get() = 500L
+        get() = 250L
 
     /** A medium test max duration */
     val mediumDuration: TimeDuration
@@ -47,9 +47,6 @@ interface SolverTest {
     val longDuration: TimeDuration
         get() = 2 * mediumDuration
 
-    val maxDuration: TimeDuration
-        get() = shortDuration
-
     /** Test presence of correct built-ins */
     fun testBuiltinApi()