From 47ba3a1be52dbee9982c24d2487779c36319db9e Mon Sep 17 00:00:00 2001 From: marracuene Date: Sat, 25 Jul 2020 16:25:11 +0200 Subject: [PATCH] Reinstate 2.7.3 coverage to tests. Remove 2.3 coverage. Set maxParallelForks to always 1 https://github.com/gradle/playframework/issues/142 Signed-off-by: marracuene --- .../gradle/playframework/TestSetupPlugin.kt | 3 ++- .../PlayRoutesPluginIntegrationTest.groovy | 18 ------------------ .../fixtures/multiversion/PlayCoverage.groovy | 3 +-- 3 files changed, 3 insertions(+), 21 deletions(-) diff --git a/buildSrc/src/main/kotlin/org/gradle/playframework/TestSetupPlugin.kt b/buildSrc/src/main/kotlin/org/gradle/playframework/TestSetupPlugin.kt index da6282e3..9e611f91 100644 --- a/buildSrc/src/main/kotlin/org/gradle/playframework/TestSetupPlugin.kt +++ b/buildSrc/src/main/kotlin/org/gradle/playframework/TestSetupPlugin.kt @@ -22,6 +22,7 @@ class TestSetupPlugin : Plugin { private fun determineMaxParallelForks(): Int { - return if ((Runtime.getRuntime().availableProcessors() / 2) < 1) 1 else (Runtime.getRuntime().availableProcessors() / 2) + // return if ((Runtime.getRuntime().availableProcessors() / 2) < 1) 1 else (Runtime.getRuntime().availableProcessors() / 2) + return 1 } } diff --git a/src/integTest/groovy/org/gradle/playframework/plugins/PlayRoutesPluginIntegrationTest.groovy b/src/integTest/groovy/org/gradle/playframework/plugins/PlayRoutesPluginIntegrationTest.groovy index c073bd94..e130aabb 100644 --- a/src/integTest/groovy/org/gradle/playframework/plugins/PlayRoutesPluginIntegrationTest.groovy +++ b/src/integTest/groovy/org/gradle/playframework/plugins/PlayRoutesPluginIntegrationTest.groovy @@ -120,24 +120,6 @@ class PlayRoutesPluginIntegrationTest extends AbstractIntegrationTest { findFile(compiledRouterFiles, 'Routes.scala') } - def "fails build if injected routes generator was configured for Play version < 2.4.0"() { - given: - buildFile << """ - play { - platform { - playVersion = '2.3.0' - } - injectedRoutesGenerator = true - } - """ - - when: - BuildResult result = buildAndFail(ROUTES_COMPILE_TASK_NAME) - - then: - result.output.contains('Injected routers are only supported in Play 2.4 or newer.') - } - static String getRoutes() { """ GET / controllers.HomeController.index diff --git a/src/integTestFixtures/groovy/org/gradle/playframework/fixtures/multiversion/PlayCoverage.groovy b/src/integTestFixtures/groovy/org/gradle/playframework/fixtures/multiversion/PlayCoverage.groovy index 3266644b..ee27d953 100644 --- a/src/integTestFixtures/groovy/org/gradle/playframework/fixtures/multiversion/PlayCoverage.groovy +++ b/src/integTestFixtures/groovy/org/gradle/playframework/fixtures/multiversion/PlayCoverage.groovy @@ -10,10 +10,9 @@ final class PlayCoverage { public static final VersionNumber DEFAULT = VersionNumber.parse(DEFAULT_PLAY_VERSION) public static final List ALL = [ - //VersionNumber.parse('2.3.10'), NO LONGER SUPPORTED VersionNumber.parse('2.4.11'), VersionNumber.parse('2.5.19'), - //VersionNumber.parse('2.7.3'), + VersionNumber.parse('2.7.3'), // Not supported yet // VersionNumber.parse('2.8.0'), DEFAULT