fix: recreate services instances (Fixes #9)

src/main/groovy/net/serenitybdd/plugins/gradle/AggregateTask.groovy

@@ -14,7 +14,7 @@ class AggregateTask extends SerenityAbstractTask {
     @TaskAction
     void aggregate() {
         updateProperties(project)
-        Path reportDirectory = SerenityAbstractTask.prepareReportDirectory(project)
+        Path reportDirectory = prepareReportDirectory(project)
 
         if (!project.serenity.projectKey) {
             project.serenity.projectKey = project.name
@@ -40,11 +40,9 @@ class AggregateTask extends SerenityAbstractTask {
             configuration.getEnvironmentVariables().setProperty('serenity.requirements.dir', project.serenity.requirementsDir)
         }
 
-        def reporter
+        DefaultRequirements requirements = testRoot ? new DefaultRequirements(testRoot) : new DefaultRequirements()
+        HtmlAggregateStoryReporter reporter = new HtmlAggregateStoryReporter(project.serenity.projectKey, requirements)
 
-        def requirements = (project.serenity.testRoot) ? new DefaultRequirements(project.serenity.testRoot) : new DefaultRequirements()
-
-        reporter = new HtmlAggregateStoryReporter(project.serenity.projectKey, requirements)
         reporter.outputDirectory = reportDirectory.toFile()
         reporter.testRoot = project.serenity.testRoot
         reporter.projectDirectory = project.projectDir.absolutePath
@@ -56,6 +54,6 @@ class AggregateTask extends SerenityAbstractTask {
             reporter.setGenerateTestOutcomeReports();
         }
         reporter.generateReportsForTestResultsFrom(reporter.outputDirectory)
-        new ResultChecker(reporter.outputDirectory).checkTestResults();
+        new ResultChecker(reporter.outputDirectory).checkTestResults()
     }
 }

src/main/groovy/net/serenitybdd/plugins/gradle/SerenityPlugin.groovy

@@ -1,5 +1,7 @@
 package net.serenitybdd.plugins.gradle
 
+
+import net.thucydides.core.guice.Injectors
 import org.gradle.api.Plugin
 import org.gradle.api.Project
 import org.gradle.api.plugins.JavaPlugin
@@ -8,6 +10,8 @@ class SerenityPlugin implements Plugin<Project> {
 
     @Override
     void apply(Project project) {
+        Injectors.setDefaultModule(new SerenityPluginModule())
+
         SerenityAbstractTask.updateSystemPath(project)
         project.pluginManager.apply(JavaPlugin.class)
         project.extensions.create("serenity", SerenityPluginExtension)

src/main/groovy/net/serenitybdd/plugins/gradle/SerenityPluginModule.groovy

@@ -0,0 +1,72 @@
+package net.serenitybdd.plugins.gradle
+
+import com.google.inject.AbstractModule
+import com.google.inject.Provides
+import com.google.inject.Singleton
+import net.serenitybdd.core.buildinfo.DriverCapabilityRecord
+import net.serenitybdd.core.buildinfo.PropertyBasedDriverCapabilityRecord
+import net.serenitybdd.core.history.FileSystemTestOutcomeSummaryRecorder
+import net.serenitybdd.core.history.HistoricalFlagProvider
+import net.serenitybdd.core.history.TestOutcomeSummaryRecorder
+import net.serenitybdd.core.time.InternalSystemClock
+import net.serenitybdd.core.time.SystemClock
+import net.thucydides.core.batches.BatchManager
+import net.thucydides.core.batches.BatchManagerProvider
+import net.thucydides.core.configuration.SystemPropertiesConfiguration
+import net.thucydides.core.issues.IssueTracking
+import net.thucydides.core.issues.SystemPropertiesIssueTracking
+import net.thucydides.core.logging.ConsoleLoggingListener
+import net.thucydides.core.logging.ThucydidesLogging
+import net.thucydides.core.model.flags.FlagProvider
+import net.thucydides.core.reports.json.JSONConverter
+import net.thucydides.core.reports.json.gson.GsonJSONConverter
+import net.thucydides.core.reports.remoteTesting.LinkGenerator
+import net.thucydides.core.reports.remoteTesting.RemoteTestingLinkManager
+import net.thucydides.core.requirements.ClasspathRequirementsProviderService
+import net.thucydides.core.requirements.MultiSourceRequirementsService
+import net.thucydides.core.requirements.RequirementsProviderService
+import net.thucydides.core.requirements.RequirementsService
+import net.thucydides.core.statistics.AtomicTestCount
+import net.thucydides.core.statistics.TestCount
+import net.thucydides.core.statistics.service.ClasspathTagProviderService
+import net.thucydides.core.statistics.service.TagProviderService
+import net.thucydides.core.steps.StepListener
+import net.thucydides.core.steps.di.ClasspathDependencyInjectorService
+import net.thucydides.core.steps.di.DependencyInjectorService
+import net.thucydides.core.util.EnvironmentVariables
+import net.thucydides.core.util.SystemEnvironmentVariables
+import net.thucydides.core.webdriver.Configuration
+
+// XXX: 2022-05-31 - Copied from (serenity-model)net/thucydides/core/guice/ThucydidesModule.java and edited
+// (trial/error) until https://github.com/serenity-bdd/serenity-gradle-plugin/issues/9 fixed.
+class SerenityPluginModule extends AbstractModule {
+
+    @Override
+    protected void configure() {
+        bind(SystemClock.class).to(InternalSystemClock.class).in(Singleton.class)
+        bind(Configuration.class).to(SystemPropertiesConfiguration.class)
+        bind(IssueTracking.class).to(SystemPropertiesIssueTracking.class).in(Singleton.class)
+        bind(BatchManager.class).toProvider(BatchManagerProvider.class).in(Singleton.class)
+        bind(LinkGenerator.class).to(RemoteTestingLinkManager.class).in(Singleton.class)
+        bind(JSONConverter.class).to(GsonJSONConverter.class).in(Singleton.class)
+
+        bind(TagProviderService.class).to(ClasspathTagProviderService.class)
+        bind(RequirementsProviderService.class).to(ClasspathRequirementsProviderService.class)
+        bind(RequirementsService.class).to(MultiSourceRequirementsService.class)
+        bind(DependencyInjectorService.class).to(ClasspathDependencyInjectorService.class)
+
+        bind(StepListener.class).annotatedWith(ThucydidesLogging.class).to(ConsoleLoggingListener.class).in(Singleton.class)
+
+        bind(DriverCapabilityRecord.class).to(PropertyBasedDriverCapabilityRecord.class)
+
+        bind(TestCount.class).to(AtomicTestCount.class).in(Singleton.class)
+
+        bind(FlagProvider.class).to(HistoricalFlagProvider.class).in(Singleton.class)
+        bind(TestOutcomeSummaryRecorder.class).to(FileSystemTestOutcomeSummaryRecorder.class).in(Singleton.class)
+    }
+
+    @Provides
+    EnvironmentVariables provideEnvironmentVariables() {
+        return SystemEnvironmentVariables.createEnvironmentVariables()
+    }
+}