From 6249b0c14ca771cd1e366bfa4106c7303a7d7723 Mon Sep 17 00:00:00 2001 From: Enrico Siboni Date: Sun, 7 Jun 2020 20:27:44 +0200 Subject: [PATCH 1/5] Modified logic of solve-streams w.r.t. timeouts and re-enabled related tests --- .../unibo/tuprolog/solve/solver/fsm/impl/StateRuleSelection.kt | 3 +-- .../tuprolog/solve/systemtest/StreamsSolverSystemTesting.kt | 2 -- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/solve-streams/src/commonMain/kotlin/it/unibo/tuprolog/solve/solver/fsm/impl/StateRuleSelection.kt b/solve-streams/src/commonMain/kotlin/it/unibo/tuprolog/solve/solver/fsm/impl/StateRuleSelection.kt index 7d3c93ece..6250d5905 100644 --- a/solve-streams/src/commonMain/kotlin/it/unibo/tuprolog/solve/solver/fsm/impl/StateRuleSelection.kt +++ b/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()) diff --git a/solve-streams/src/commonTest/kotlin/it/unibo/tuprolog/solve/systemtest/StreamsSolverSystemTesting.kt b/solve-streams/src/commonTest/kotlin/it/unibo/tuprolog/solve/systemtest/StreamsSolverSystemTesting.kt index 598f98467..31626ed05 100644 --- a/solve-streams/src/commonTest/kotlin/it/unibo/tuprolog/solve/systemtest/StreamsSolverSystemTesting.kt +++ b/solve-streams/src/commonTest/kotlin/it/unibo/tuprolog/solve/systemtest/StreamsSolverSystemTesting.kt @@ -113,13 +113,11 @@ class StreamsSolverSystemTesting : SolverFactory, SolverTest { } @Test - @Ignore override fun testTimeout3() { prototype.testTimeout3() } @Test - @Ignore override fun testTimeout4() { prototype.testTimeout4() } From cada251d7db7a0aa04229b378c169729e3eada58 Mon Sep 17 00:00:00 2001 From: Giovanni Ciatto Date: Fri, 12 Jun 2020 09:53:03 +0200 Subject: [PATCH 2/5] mochatimouts to 60s for the whole project --- gradle.properties | 3 +++ solve-classic/gradle.properties | 2 -- solve-streams/gradle.properties | 4 ---- theory/gradle.properties | 2 -- 4 files changed, 3 insertions(+), 8 deletions(-) delete mode 100644 solve-classic/gradle.properties delete mode 100644 theory/gradle.properties diff --git a/gradle.properties b/gradle.properties index 62171c05c..9f4bddbad 100644 --- a/gradle.properties +++ b/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= diff --git a/solve-classic/gradle.properties b/solve-classic/gradle.properties deleted file mode 100644 index bbf15933a..000000000 --- a/solve-classic/gradle.properties +++ /dev/null @@ -1,2 +0,0 @@ -# mocha timeout for a single test method, in milli-seconds -mochaTimeout=10000 \ No newline at end of file diff --git a/solve-streams/gradle.properties b/solve-streams/gradle.properties index 336ef3aa8..2b1d906de 100644 --- a/solve-streams/gradle.properties +++ b/solve-streams/gradle.properties @@ -1,6 +1,2 @@ -# mocha timeout for a single test method, in milli-seconds -mochaTimeout=20000 - jvmStackSize=256M - jvmMaxHeapSize=1G \ No newline at end of file diff --git a/theory/gradle.properties b/theory/gradle.properties deleted file mode 100644 index 74c523871..000000000 --- a/theory/gradle.properties +++ /dev/null @@ -1,2 +0,0 @@ -# mocha timeout for a single test method, in milli-seconds -mochaTimeout=60000 \ No newline at end of file From 21513004fc07eba1b48799ddc095a753c31d25a4 Mon Sep 17 00:00:00 2001 From: Enrico Siboni Date: Sun, 14 Jun 2020 16:20:18 +0200 Subject: [PATCH 3/5] Restored changes committed in #ab9baeddb3f35114e65ea4a856d14909d8f35727 and reverted during refactoring of SolveTest in commit #46afeaf4a6862d5d2de2da1b2af256c3c22aa312 after one month. Also remove redundant "maxDuration" getter (which name was also misleading) replacing with now equivalent "mediumDuration" in all places. --- .../systemtest/StreamsSolverSystemTesting.kt | 3 - .../it/unibo/tuprolog/solve/SolverTest.kt | 5 +- .../it/unibo/tuprolog/solve/SolverTestImpl.kt | 95 +++++++++---------- 3 files changed, 47 insertions(+), 56 deletions(-) diff --git a/solve-streams/src/commonTest/kotlin/it/unibo/tuprolog/solve/systemtest/StreamsSolverSystemTesting.kt b/solve-streams/src/commonTest/kotlin/it/unibo/tuprolog/solve/systemtest/StreamsSolverSystemTesting.kt index 39c020448..47b6640ad 100644 --- a/solve-streams/src/commonTest/kotlin/it/unibo/tuprolog/solve/systemtest/StreamsSolverSystemTesting.kt +++ b/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, diff --git a/test-solve/src/commonMain/kotlin/it/unibo/tuprolog/solve/SolverTest.kt b/test-solve/src/commonMain/kotlin/it/unibo/tuprolog/solve/SolverTest.kt index dd9c56911..49f7be434 100644 --- a/test-solve/src/commonMain/kotlin/it/unibo/tuprolog/solve/SolverTest.kt +++ b/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() diff --git a/test-solve/src/commonMain/kotlin/it/unibo/tuprolog/solve/SolverTestImpl.kt b/test-solve/src/commonMain/kotlin/it/unibo/tuprolog/solve/SolverTestImpl.kt index 9bc3e13ca..a47db8f5f 100644 --- a/test-solve/src/commonMain/kotlin/it/unibo/tuprolog/solve/SolverTestImpl.kt +++ b/test-solve/src/commonMain/kotlin/it/unibo/tuprolog/solve/SolverTestImpl.kt @@ -48,14 +48,11 @@ import it.unibo.tuprolog.solve.TimeRelatedTheories.slightlyMoreThan500MsGoalToSo import it.unibo.tuprolog.solve.TimeRelatedTheories.timeRelatedTheory import it.unibo.tuprolog.solve.exception.TimeOutException import it.unibo.tuprolog.solve.exception.error.InstantiationError -import it.unibo.tuprolog.solve.library.Libraries import it.unibo.tuprolog.solve.stdlib.primitive.* import it.unibo.tuprolog.solve.stdlib.rule.Arrow import it.unibo.tuprolog.solve.stdlib.rule.Member import it.unibo.tuprolog.solve.stdlib.rule.Not import it.unibo.tuprolog.solve.stdlib.rule.Semicolon -import it.unibo.tuprolog.theory.Theory -import kotlin.test.Test import kotlin.test.assertEquals import kotlin.test.assertNotNull import kotlin.test.assertTrue @@ -125,7 +122,7 @@ internal class SolverTestImpl(private val solverFactory: SolverFactory) : Solver assert("f"(3)) and "f"("X") - val solutions = solver.solve(query, maxDuration).toList() + val solutions = solver.solve(query, mediumDuration).toList() val ints = if (inverse) (3 downTo 1) else (1..3) assertSolutionEquals( @@ -172,7 +169,7 @@ internal class SolverTestImpl(private val solverFactory: SolverFactory) : Solver "write"("f"("x")) and "nl" - val solutions = solver.solve(query, maxDuration).toList() + val solutions = solver.solve(query, mediumDuration).toList() assertSolutionEquals( ktListOf(query.yes()), @@ -208,7 +205,7 @@ internal class SolverTestImpl(private val solverFactory: SolverFactory) : Solver val query = "write"("b") and "write"("c") and "write"("d") and "nl" - val solutions = solver.solve(query, maxDuration).toList() + val solutions = solver.solve(query, mediumDuration).toList() assertSolutionEquals( ktListOf(query.yes()), @@ -235,7 +232,7 @@ internal class SolverTestImpl(private val solverFactory: SolverFactory) : Solver ) var query = "findall"("N", "a"("N"), "L") - var solutions = solver.solve(query, maxDuration).toList() + var solutions = solver.solve(query, mediumDuration).toList() assertSolutionEquals( ktListOf(query.yes("L" to listOf(1, 2, 3))), @@ -243,7 +240,7 @@ internal class SolverTestImpl(private val solverFactory: SolverFactory) : Solver ) query = "findall"(`_`, false, "L") - solutions = solver.solve(query, maxDuration).toList() + solutions = solver.solve(query, mediumDuration).toList() assertSolutionEquals( ktListOf(query.yes("L" to emptyList())), @@ -251,7 +248,7 @@ internal class SolverTestImpl(private val solverFactory: SolverFactory) : Solver ) query = "findall"(`_`, "G", `_`) - solutions = solver.solve(query, maxDuration).toList() + solutions = solver.solve(query, mediumDuration).toList() assertSolutionEquals( ktListOf( @@ -273,7 +270,7 @@ internal class SolverTestImpl(private val solverFactory: SolverFactory) : Solver prolog { val solver = solverFactory.solverWithDefaultBuiltins() val query = truthOf(true) - val solutions = solver.solve(query, maxDuration).toList() + val solutions = solver.solve(query, mediumDuration).toList() assertSolutionEquals( ktListOf(query.yes()), @@ -331,7 +328,7 @@ internal class SolverTestImpl(private val solverFactory: SolverFactory) : Solver assertSolverSolutionsCorrect( solver = solverFactory.solverWithDefaultBuiltins(staticKb = ifThenTheory1), goalToSolutions = ifThen1ToSolution, - maxDuration = maxDuration + maxDuration = mediumDuration ) } @@ -340,7 +337,7 @@ internal class SolverTestImpl(private val solverFactory: SolverFactory) : Solver assertSolverSolutionsCorrect( solver = solverFactory.solverWithDefaultBuiltins(staticKb = ifThenTheory1), goalToSolutions = ifThenElse1ToSolution, - maxDuration = maxDuration + maxDuration = mediumDuration ) } @@ -349,7 +346,7 @@ internal class SolverTestImpl(private val solverFactory: SolverFactory) : Solver assertSolverSolutionsCorrect( solver = solverFactory.solverWithDefaultBuiltins(staticKb = ifThenTheory2), goalToSolutions = ifThenElse2ToSolution, - maxDuration = maxDuration + maxDuration = mediumDuration ) } @@ -358,7 +355,7 @@ internal class SolverTestImpl(private val solverFactory: SolverFactory) : Solver assertSolverSolutionsCorrect( solver = solverFactory.solverWithDefaultBuiltins(staticKb = ifThenTheory2), goalToSolutions = ifThen2ToSolution, - maxDuration = maxDuration + maxDuration = mediumDuration ) } @@ -367,7 +364,7 @@ internal class SolverTestImpl(private val solverFactory: SolverFactory) : Solver assertSolverSolutionsCorrect( solverFactory.solverWithDefaultBuiltins(staticKb = simpleFactTheory), simpleFactTheoryNotableGoalToSolutions, - maxDuration + mediumDuration ) } @@ -377,7 +374,7 @@ internal class SolverTestImpl(private val solverFactory: SolverFactory) : Solver assertSolverSolutionsCorrect( solverFactory.solverWithDefaultBuiltins(staticKb = simpleCutTheory), simpleCutTheoryNotableGoalToSolutions, - maxDuration + mediumDuration ) } @@ -386,7 +383,7 @@ internal class SolverTestImpl(private val solverFactory: SolverFactory) : Solver assertSolverSolutionsCorrect( solverFactory.solverWithDefaultBuiltins(staticKb = simpleCutAndConjunctionTheory), simpleCutAndConjunctionTheoryNotableGoalToSolutions, - maxDuration + mediumDuration ) } @@ -395,7 +392,7 @@ internal class SolverTestImpl(private val solverFactory: SolverFactory) : Solver assertSolverSolutionsCorrect( solverFactory.solverWithDefaultBuiltins(staticKb = cutConjunctionAndBacktrackingTheory), cutConjunctionAndBacktrackingTheoryNotableGoalToSolutions, - maxDuration + mediumDuration ) } @@ -413,7 +410,7 @@ internal class SolverTestImpl(private val solverFactory: SolverFactory) : Solver assertSolverSolutionsCorrect( solverFactory.solverWithDefaultBuiltins(staticKb = prologStandardExampleTheory), prologStandardExampleTheoryNotableGoalToSolution, - maxDuration + mediumDuration ) } @@ -422,7 +419,7 @@ internal class SolverTestImpl(private val solverFactory: SolverFactory) : Solver assertSolverSolutionsCorrect( solverFactory.solverWithDefaultBuiltins(staticKb = PrologStandardExampleTheories.prologStandardExampleWithCutTheory), prologStandardExampleWithCutTheoryNotableGoalToSolution, - maxDuration + mediumDuration ) } @@ -431,7 +428,7 @@ internal class SolverTestImpl(private val solverFactory: SolverFactory) : Solver assertSolverSolutionsCorrect( solverFactory.solverWithDefaultBuiltins(staticKb = customReverseListTheory), customReverseListTheoryNotableGoalToSolution, - maxDuration + mediumDuration ) } @@ -440,7 +437,7 @@ internal class SolverTestImpl(private val solverFactory: SolverFactory) : Solver assertSolverSolutionsCorrect( solverFactory.solverWithDefaultBuiltins(staticKb = conjunctionStandardExampleTheory), conjunctionStandardExampleTheoryNotableGoalToSolution, - maxDuration + mediumDuration ) } @@ -472,7 +469,7 @@ internal class SolverTestImpl(private val solverFactory: SolverFactory) : Solver assertSolverSolutionsCorrect( solverFactory.solverWithDefaultBuiltins(staticKb = database), goalToSolutions, - maxDuration + mediumDuration ) } } @@ -483,13 +480,13 @@ internal class SolverTestImpl(private val solverFactory: SolverFactory) : Solver assertSolverSolutionsCorrect( solverFactory.solverWithDefaultBuiltins(staticKb = callStandardExampleTheory), callStandardExampleTheoryGoalsToSolution, - maxDuration + mediumDuration ) assertSolverSolutionsCorrect( solverFactory.solverWithDefaultBuiltins(), callTestingGoalsToSolutions, - maxDuration + mediumDuration ) } @@ -504,7 +501,7 @@ internal class SolverTestImpl(private val solverFactory: SolverFactory) : Solver assertSolverSolutionsCorrect( solverFactory.solverWithDefaultBuiltins(staticKb = database), goalToSolutions, - maxDuration + mediumDuration ) } } @@ -515,13 +512,13 @@ internal class SolverTestImpl(private val solverFactory: SolverFactory) : Solver assertSolverSolutionsCorrect( solverFactory.solverWithDefaultBuiltins(staticKb = catchAndThrowTheoryExample), catchAndThrowTheoryExampleNotableGoalToSolution, - maxDuration + mediumDuration ) assertSolverSolutionsCorrect( solverFactory.solverWithDefaultBuiltins(), catchTestingGoalsToSolutions, - maxDuration + mediumDuration ) } @@ -555,7 +552,7 @@ internal class SolverTestImpl(private val solverFactory: SolverFactory) : Solver assertSolverSolutionsCorrect( solverFactory.solverWithDefaultBuiltins(staticKb = database), goalToSolutions, - maxDuration + mediumDuration ) } } @@ -566,7 +563,7 @@ internal class SolverTestImpl(private val solverFactory: SolverFactory) : Solver assertSolverSolutionsCorrect( solverFactory.solverWithDefaultBuiltins(), haltTestingGoalsToSolutions, - maxDuration + mediumDuration ) } @@ -575,7 +572,7 @@ internal class SolverTestImpl(private val solverFactory: SolverFactory) : Solver assertSolverSolutionsCorrect( solverFactory.solverWithDefaultBuiltins(staticKb = notStandardExampleTheory), notStandardExampleTheoryNotableGoalToSolution, - maxDuration + mediumDuration ) } @@ -617,7 +614,7 @@ internal class SolverTestImpl(private val solverFactory: SolverFactory) : Solver assertSolverSolutionsCorrect( solverFactory.solverWithDefaultBuiltins(staticKb = database), goalToSolutions, - maxDuration + mediumDuration ) } } @@ -628,7 +625,7 @@ internal class SolverTestImpl(private val solverFactory: SolverFactory) : Solver assertSolverSolutionsCorrect( solverFactory.solverWithDefaultBuiltins(staticKb = ifThenStandardExampleTheory), ifThenStandardExampleTheoryNotableGoalToSolution, - maxDuration + mediumDuration ) } @@ -637,7 +634,7 @@ internal class SolverTestImpl(private val solverFactory: SolverFactory) : Solver assertSolverSolutionsCorrect( solverFactory.solverWithDefaultBuiltins(), ifThenElseStandardExampleNotableGoalToSolution, - maxDuration + mediumDuration ) } @@ -646,7 +643,7 @@ internal class SolverTestImpl(private val solverFactory: SolverFactory) : Solver assertSolverSolutionsCorrect( solverFactory.solverWithDefaultBuiltins(staticKb = customRangeListGeneratorTheory), customRangeListGeneratorTheoryNotableGoalToSolution, - maxDuration + mediumDuration ) } @@ -655,7 +652,7 @@ internal class SolverTestImpl(private val solverFactory: SolverFactory) : Solver prolog { val solver = solverFactory.solverWithDefaultBuiltins() val query = atomOf("a") - val solutions = solver.solve(query, maxDuration).toList() + val solutions = solver.solve(query, mediumDuration).toList() assertSolutionEquals( ktListOf( @@ -678,7 +675,7 @@ internal class SolverTestImpl(private val solverFactory: SolverFactory) : Solver ) ) val query = "a"("N") - val solutions = solver.solve(query, maxDuration).toList() + val solutions = solver.solve(query, mediumDuration).toList() assertSolutionEquals( ktListOf( @@ -700,7 +697,7 @@ internal class SolverTestImpl(private val solverFactory: SolverFactory) : Solver ) ) val query = "a"("N") - val solutions = solver.solve(query, maxDuration).toList() + val solutions = solver.solve(query, mediumDuration).toList() assertSolutionEquals( with(query) { ktListOf(yes("N" to 3), yes("N" to 2)) }, @@ -721,7 +718,7 @@ internal class SolverTestImpl(private val solverFactory: SolverFactory) : Solver ) ) val query = "a"("N") - val solutions = solver.solve(query, maxDuration).toList() + val solutions = solver.solve(query, mediumDuration).toList() assertSolutionEquals( ktListOf( @@ -743,7 +740,7 @@ internal class SolverTestImpl(private val solverFactory: SolverFactory) : Solver ) ) val query = "a"("N") - val solutions = solver.solve(query, maxDuration).toList() + val solutions = solver.solve(query, mediumDuration).toList() assertSolutionEquals( ktListOf( @@ -763,7 +760,7 @@ internal class SolverTestImpl(private val solverFactory: SolverFactory) : Solver ) ) val query = atomOf("a") - val solutions = solver.solve(query, maxDuration).toList() + val solutions = solver.solve(query, mediumDuration).toList() assertSolutionEquals( ktListOf( @@ -785,7 +782,7 @@ internal class SolverTestImpl(private val solverFactory: SolverFactory) : Solver ) ) val query = atomOf("a") - val solutions = solver.solve(query, maxDuration).toList() + val solutions = solver.solve(query, mediumDuration).toList() assertSolutionEquals( ktListOf( @@ -805,7 +802,7 @@ internal class SolverTestImpl(private val solverFactory: SolverFactory) : Solver ) ) val query = "a"("N") - val solutions = solver.solve(query, maxDuration).toList() + val solutions = solver.solve(query, mediumDuration).toList() assertSolutionEquals( ktListOf( @@ -825,7 +822,7 @@ internal class SolverTestImpl(private val solverFactory: SolverFactory) : Solver ) ) val query = atomOf("a") - val solutions = solver.solve(query, maxDuration).toList() + val solutions = solver.solve(query, mediumDuration).toList() assertSolutionEquals( with(query) { ktListOf(yes(), yes()) }, @@ -844,7 +841,7 @@ internal class SolverTestImpl(private val solverFactory: SolverFactory) : Solver ) ) val query = "a"("N") - val solutions = solver.solve(query, maxDuration).toList() + val solutions = solver.solve(query, mediumDuration).toList() assertSolutionEquals( with(query) { ktListOf(yes("N" to 1), yes("N" to 2)) }, @@ -864,7 +861,7 @@ internal class SolverTestImpl(private val solverFactory: SolverFactory) : Solver val constants = ktListOf("a", "b", "c") val goal = "member"("X", constants.toTerm()) - val solutions = solver.solve(goal, maxDuration).toList() + val solutions = solver.solve(goal, mediumDuration).toList() assertSolutionEquals( ktListConcat( @@ -884,7 +881,7 @@ internal class SolverTestImpl(private val solverFactory: SolverFactory) : Solver val query = "assertz"("f"(2) impliedBy false) and "asserta"("f"(1) impliedBy true) - val solutions = solver.solve(query, maxDuration).toList() + val solutions = solver.solve(query, mediumDuration).toList() assertSolutionEquals( ktListOf(query.yes()), @@ -912,7 +909,7 @@ internal class SolverTestImpl(private val solverFactory: SolverFactory) : Solver val query = "retract"("f"("X")) - val solutions = solver.solve(query, maxDuration).toList() + val solutions = solver.solve(query, mediumDuration).toList() assertSolutionEquals( ktListOf( @@ -938,7 +935,7 @@ internal class SolverTestImpl(private val solverFactory: SolverFactory) : Solver val n = 100 - val solutions = solver.solve(query, maxDuration).take(n).toList() + val solutions = solver.solve(query, mediumDuration).take(n).toList() assertSolutionEquals( (0 until n).map { query.yes("X" to it) }, From f3e8e0f82ae630156057df492a0b1d20835c79d8 Mon Sep 17 00:00:00 2001 From: Giovanni Ciatto Date: Mon, 15 Jun 2020 13:55:40 +0200 Subject: [PATCH 4/5] + const in Info.kt --- core/build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build.gradle.kts b/core/build.gradle.kts index 7bf255238..97d221261 100644 --- a/core/build.gradle.kts +++ b/core/build.gradle.kts @@ -19,7 +19,7 @@ kotlin { |package $tuPrologPackage | |object Info { - | val VERSION = "${rootProject.version}" + | const val VERSION = "${rootProject.version}" |} """.trimMargin()) } From 0da0d518a42d6d9f2663eea29ea46c353b38e421 Mon Sep 17 00:00:00 2001 From: Giovanni Ciatto Date: Tue, 16 Jun 2020 19:29:12 +0200 Subject: [PATCH 5/5] update to gradle 6.5, and orchid 0.21.0 --- buildSrc/src/main/kotlin/Libs.kt | 30 ++++++++++++------------ buildSrc/src/main/kotlin/Versions.kt | 8 +++---- gradle/wrapper/gradle-wrapper.properties | 2 +- 3 files changed, 20 insertions(+), 20 deletions(-) diff --git a/buildSrc/src/main/kotlin/Libs.kt b/buildSrc/src/main/kotlin/Libs.kt index 3c792a023..553f0497a 100644 --- a/buildSrc/src/main/kotlin/Libs.kt +++ b/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 diff --git a/buildSrc/src/main/kotlin/Versions.kt b/buildSrc/src/main/kotlin/Versions.kt index 914d43cd1..97ef92b2f 100644 --- a/buildSrc/src/main/kotlin/Versions.kt +++ b/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" } /** diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index a4f0001d2..622ab64a3 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/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