This is an automated email from the git hooks/post-receive script. seamlik-guest pushed a commit to branch master in repository gradle.
commit 1d3dc799724742b29128ad33003c533b1d85c94d Merge: 1128ec8 b7dfe20 Author: Kai-Chung Yan <[email protected]> Date: Wed Sep 30 05:04:02 2015 +0800 Merge tag 'upstream/2.7' Upstream version 2.7 # gpg: Signature made Wed 30 Sep 2015 05:03:55 AM CST using RSA key ID 37FE9825 # gpg: Good signature from "Kai-Chung Yan (seamlik) <[email protected]>" # gpg: WARNING: This key is not certified with a trusted signature! # gpg: There is no indication that the signature belongs to the owner. # Primary key fingerprint: B88A 153A DD3D 973F 3B1F F79A DD1F AB89 37FE 9825 build.gradle | 28 +- .../docs/dsl/docbook/ClassDescriptionRenderer.java | 55 +- .../docs/dsl/docbook/ClassDocSuperTypeBuilder.java | 2 + .../build/docs/dsl/docbook/model/ClassDoc.groovy | 7 + .../docs/dsl/docbook/ClassDocRendererTest.groovy | 100 +- config/checkstyle/suppressions.xml | 7 + gradle/dependencies.gradle | 2 +- gradle/groovyProject.gradle | 9 +- gradle/idea.gradle | 1 - gradle/integTest.gradle | 21 +- gradle/java9.gradle | 6 +- gradle/pullRequestBuild.gradle | 76 ++ gradle/testGroupings.gradle | 15 +- gradle/wrapper/gradle-wrapper.properties | 4 +- settings.gradle | 1 + .../antlr/AbstractAntlrIntegrationTest.groovy | 1 + .../antlr/Antlr2PluginIntegrationTest.groovy | 40 +- .../antlr/Antlr3PluginIntegrationTest.groovy | 47 +- .../antlr/Antlr4PluginIntegrationTest.groovy | 73 +- .../plugins/antlr/AntlrSourceVirtualDirectory.java | 2 +- .../org/gradle/api/plugins/antlr/AntlrTask.java | 60 +- .../api/plugins/antlr/internal/AntlrExecuter.java | 222 +++- .../api/plugins/antlr/internal/AntlrSpec.java | 17 +- .../plugins/antlr/internal/AntlrSpecFactory.java | 5 +- .../antlr/internal/antlr2/MetadataExtracter.java | 63 +- .../antlr/internal/AntlrSpecFactoryTest.groovy | 27 +- .../internal/antlr2/MetadataExtracterTest.groovy | 105 ++ .../gradle/groovy/scripts/internal/AstUtils.java | 23 +- .../ScriptSourceDescriptionTransformer.java | 41 - .../scripts/internal/ScriptSourceTransformer.java | 50 + .../java/org/gradle/internal/SystemProperties.java | 4 + .../internal/file/RelativeFilePathResolver.java | 21 + .../java/org/gradle/internal/hash/HashUtil.java | 12 + .../src/main/java/org/gradle/internal/jvm/Jvm.java | 17 + .../org/gradle/internal/reflect/ClassDetails.java | 9 + .../gradle/internal/reflect/ClassInspector.java | 187 +-- .../internal/reflect/JavaReflectionUtil.java | 46 + .../org/gradle/internal/reflect/MethodSet.java | 49 + .../gradle/internal/reflect/MethodSignature.java | 40 + .../reflect/MethodSignatureEquivalence.java | 16 +- .../internal/reflect/MutableClassDetails.java | 87 ++ .../internal/reflect/MutablePropertyDetails.java | 53 + .../gradle/internal/reflect/PropertyDetails.java | 20 + .../src/main/java/org/gradle/util/TextUtil.java | 6 +- .../org/gradle/internal/hash/HashUtilTest.groovy | 27 +- .../groovy/org/gradle/internal/jvm/JvmTest.groovy | 26 +- .../internal/reflect/ClassInspectorTest.groovy | 64 + .../internal/reflect/JavaReflectionUtilTest.groovy | 17 + .../internal/reflect/MethodDescriptionTest.groovy | 11 + .../plugins/internal/BuildInitServices.java | 3 + .../AbstractFindBugsPluginIntegrationTest.groovy | 44 +- ...ckstylePluginDependenciesIntegrationTest.groovy | 80 ++ .../quality/CheckstylePluginIntegrationTest.groovy | 164 +-- .../CheckstylePluginVersionIntegrationTest.groovy | 177 +++ .../internal/FindBugsSpecBuilderTest.groovy | 12 +- .../gradle/api/plugins/quality/Checkstyle.groovy | 8 +- .../api/plugins/quality/CheckstylePlugin.groovy | 1 - .../api/plugins/quality/CheckstyleReports.java | 2 +- .../org/gradle/api/plugins/quality/FindBugs.groovy | 30 +- .../api/plugins/quality/FindBugsExtension.groovy | 13 + .../api/plugins/quality/FindBugsPlugin.groovy | 2 + .../internal/findbugs/FindBugsSpecBuilder.java | 26 +- .../plugins/quality/CheckstylePluginTest.groovy | 18 +- .../api/plugins/quality/FindBugsPluginTest.groovy | 8 +- .../gradle/api/plugins/quality/FindBugsTest.groovy | 17 + .../integtest/fixtures/CheckstyleCoverage.groovy | 29 + .../api/BuildScriptErrorIntegrationTest.groovy | 29 + .../api/ProgressLoggingIntegrationTest.groovy | 52 + .../BuildScriptVisibilityIntegrationTest.groovy | 245 ++++ .../api/dsl/DynamicObjectIntegrationTest.groovy | 1 + .../ClassLoadersCachingIntegrationTest.groovy | 27 +- .../taskfactory/TaskFactoryIntegrationTest.groovy | 38 + .../api/tasks/CopyTaskIntegrationTest.groovy | 29 + .../api/tasks/TaskRemovalIntegrationTest.groovy | 2 +- .../RuleBasedTaskActionsIntegrationTest.groovy | 87 ++ .../RuleBasedTaskReferenceIntegrationTest.groovy | 90 ++ .../execution/taskgraph/WithRuleBasedTasks.groovy | 48 + ...tiveBuildScriptEvaluationIntegrationTest.groovy | 2 + .../ScriptPluginClassLoadingIntegrationTest.groovy | 2 +- .../api/tasks/copyTestResources/src/two/two.b | 4 +- .../src/main/groovy/org/gradle/StartParameter.java | 4 +- .../groovy/org/gradle/TaskExecutionLogger.java | 8 +- .../org/gradle/api/artifacts/ResolveContext.java | 28 - .../org/gradle/api/artifacts/ResolveException.java | 12 +- .../org/gradle/api/artifacts/ResolvedArtifact.java | 6 + .../component/ComponentArtifactIdentifier.java | 35 + .../component/LibraryBinaryIdentifier.java | 44 + .../component/LibraryComponentIdentifier.java | 28 - .../component/LibraryComponentSelector.java | 17 + .../api/artifacts/dsl/DependencyHandler.java | 22 +- .../repositories/AuthenticationContainer.java | 28 + .../repositories/AuthenticationSupported.java | 38 +- .../org/gradle/api/file/ContentFilterable.java | 3 +- .../api/internal/DependencyClassPathProvider.java | 8 + .../gradle/api/internal/DocumentationRegistry.java | 6 +- .../api/internal/GradleDistributionLocator.java | 11 + .../dsl/dependencies/DefaultDependencyHandler.java | 6 +- .../dsl/dependencies/DependencyFactory.java | 4 +- .../repositories/DefaultPasswordCredentials.java | 0 .../DefaultGradleDistributionLocator.java | 117 ++ .../internal/classpath/DefaultModuleRegistry.java | 145 +-- .../org/gradle/api/internal/classpath/Module.java | 6 +- .../api/internal/classpath/ModuleRegistry.java | 7 + .../org/gradle/api/internal/file/FileResolver.java | 5 +- .../gradle/api/internal/file/copy/LineFilter.java | 33 +- .../initialization/DefaultScriptHandler.java | 30 +- .../DefaultScriptHandlerFactory.java | 8 +- .../plugins/DefaultObjectConfigurationAction.java | 3 +- .../org/gradle/api/internal/plugins/DslObject.java | 13 +- .../api/internal/project/AbstractProject.java | 60 +- .../project/DeferredProjectConfiguration.java | 8 +- .../api/internal/project/ProjectInternal.java | 5 +- .../api/internal/rules/ModelMapCreators.java | 2 +- .../groovy/org/gradle/api/invocation/Gradle.java | 2 +- .../main/groovy/org/gradle/api/tasks/Input.java | 5 + .../org/gradle/api/tasks/InputDirectory.java | 4 + .../groovy/org/gradle/api/tasks/InputFile.java | 4 + .../groovy/org/gradle/api/tasks/InputFiles.java | 3 + .../org/gradle/api/tasks/OutputDirectories.java | 3 + .../org/gradle/api/tasks/OutputDirectory.java | 3 + .../groovy/org/gradle/api/tasks/OutputFile.java | 3 + .../groovy/org/gradle/api/tasks/OutputFiles.java | 3 + .../tasks/incremental/IncrementalTaskInputs.java | 6 +- .../configuration/DefaultInitScriptProcessor.java | 3 +- .../configuration/DefaultScriptPluginFactory.java | 82 +- .../gradle/configuration/DefaultScriptTarget.java | 71 ++ .../org/gradle/configuration/InitScriptTarget.java | 42 + .../gradle/configuration/ProjectScriptTarget.java | 75 ++ .../gradle/configuration/ScriptPluginFactory.java | 3 +- .../org/gradle/configuration/ScriptTarget.java | 54 + .../gradle/configuration/SettingScriptTarget.java | 38 + .../project/BuildScriptProcessor.java | 3 +- .../internal/DefaultDeploymentRegistry.java | 88 ++ .../deployment/internal/DeploymentHandle.java | 25 + .../deployment/internal/DeploymentRegistry.java | 48 + .../BuildConfigurationActionExecuter.java | 37 + .../groovy/org/gradle/execution/BuildExecuter.java | 12 +- .../DefaultBuildConfigurationActionExecuter.java | 59 + .../org/gradle/execution/DefaultBuildExecuter.java | 35 +- .../gradle/execution/TaskSelectionException.java | 5 +- .../taskgraph/DefaultTaskGraphExecuter.java | 29 +- .../scripts/DefaultScriptCompilerFactory.java | 6 +- .../org/gradle/groovy/scripts/ScriptAware.java | 20 - .../org/gradle/groovy/scripts/ScriptCompiler.java | 2 +- .../groovy/scripts/ScriptExecutionListener.java | 4 +- .../org/gradle/groovy/scripts/ScriptRunner.java | 26 +- .../internal/AsmBackedEmptyScriptGenerator.java | 86 -- .../groovy/scripts/internal/BuildScriptData.java | 36 + .../internal/BuildScriptDataSerializer.java | 33 + .../scripts/internal/BuildScriptTransformer.java | 10 +- .../internal/CachingScriptClassCompiler.java | 22 +- .../internal/ClassCachingCompiledScript.java | 42 - .../groovy/scripts/internal/CompileOperation.java | 3 + .../groovy/scripts/internal/CompiledScript.java | 9 + .../internal/DefaultScriptCompilationHandler.java | 213 ++-- .../internal/DefaultScriptRunnerFactory.java | 30 +- .../FileCacheBackedScriptClassCompiler.java | 16 +- .../ImperativeStatementDetectingTransformer.java | 298 +---- .../scripts/internal/ScriptClassCompiler.java | 2 +- .../scripts/internal/ScriptCompilationHandler.java | 4 +- .../internal/ShortCircuitEmptyScriptCompiler.java | 25 +- .../initialization/DefaultExceptionAnalyser.java | 11 +- .../initialization/DefaultGradleLauncher.java | 70 +- .../DefaultGradleLauncherFactory.java | 40 +- .../org/gradle/initialization/GradleLauncher.java | 14 +- .../initialization/GradleLauncherFactory.java | 4 +- .../gradle/initialization/InitScriptHandler.java | 24 +- .../initialization/NotifyingSettingsLoader.java | 39 + .../initialization/NotifyingSettingsProcessor.java | 46 + .../ScriptEvaluatingSettingsProcessor.java | 2 +- .../org/gradle/initialization/SettingsHandler.java | 3 +- .../org/gradle/initialization/SettingsLoader.java | 24 + .../gradle/initialization/SettingsProcessor.java | 2 +- .../initialization/TasksCompletionListener.java | 26 - .../buildsrc/BuildSourceBuilder.java | 18 +- .../buildsrc/BuildSrcUpdateFactory.java | 1 - .../AuthenticationSupportedInternal.java | 11 +- .../authentication/AbstractAuthentication.java | 84 ++ .../authentication/AllSchemesAuthentication.java | 41 + .../authentication/AuthenticationInternal.java | 36 + .../DefaultAuthenticationContainer.java | 30 + .../ScriptUsageLocationReporter.java | 7 +- .../internal/graph/CachingDirectedGraphWalker.java | 6 +- .../internal/progress/BuildOperationDetails.java | 74 ++ .../internal/progress/BuildOperationExecutor.java | 36 +- .../internal/progress/BuildOperationInternal.java | 10 +- .../internal/progress/BuildOperationType.java | 45 - .../progress/DefaultBuildOperationExecutor.java | 71 +- .../internal/progress/InternalBuildListener.java | 3 + .../gradle/internal/progress/LoggerProvider.java | 2 +- .../internal/progress/OperationIdGenerator.java | 11 - .../internal/progress/OperationIdentifier.java | 21 +- .../internal/progress/OperationsHierarchy.java | 91 -- .../progress/OperationsHierarchyKeeper.java | 40 - .../service/scopes/BuildScopeServices.java | 74 +- .../service/scopes/BuildSessionScopeServices.java | 45 + .../service/scopes/GlobalScopeServices.java | 47 +- .../service/scopes/GradleScopeServices.java | 16 +- .../service/scopes/PluginServiceRegistry.java | 6 + .../service/scopes/ProjectScopeServices.java | 11 +- .../groovy/org/gradle/logging/ProgressLogger.java | 10 +- .../org/gradle/logging/ProgressLoggerFactory.java | 9 +- .../internal/ConsoleBackedProgressRenderer.java | 6 +- .../internal/DefaultProgressLoggerFactory.java | 72 +- .../org/gradle/logging/internal/LogEvent.java | 4 +- .../org/gradle/logging/internal/OutputEvent.java | 4 +- .../org/gradle/logging/internal/ProgressEvent.java | 2 +- .../internal/ProgressLogEventGenerator.java | 15 +- .../logging/internal/ProgressStartEvent.java | 14 +- .../logging/internal/StyledTextOutputEvent.java | 12 + .../internal/progress/ProgressOperations.java | 11 +- .../collection/internal/BridgedCollections.java | 4 +- .../internal/PolymorphicModelMapProjection.java | 8 +- .../use/internal/PluginRequestsSerializer.java | 3 - .../gradle/process/internal/DefaultExecHandle.java | 3 +- .../internal/DefaultProcessForkOptions.java | 2 +- .../org/gradle/process/internal/ExecHandle.java | 3 + .../internal/streams/ExecOutputHandleRunner.java | 8 +- .../testfixtures/internal/ProjectBuilderImpl.java | 4 +- .../internal/TestBuildScopeServices.java | 7 +- .../org/gradle/util/AvailablePortFinder.java | 1 + .../src/main/groovy/org/gradle/util/GUtil.java | 2 +- .../DependencyClassPathProviderTest.groovy | 14 +- .../api/internal/DocumentationRegistryTest.groovy | 6 +- .../DefaultDependencyHandlerTest.groovy | 13 + .../DefaultGradleDistributionLocatorTest.groovy | 124 ++ .../classpath/DefaultModuleRegistryTest.groovy | 104 +- .../api/internal/file/copy/LineFilterTest.groovy | 16 + .../initialization/DefaultScriptHandlerTest.groovy | 17 +- .../DefaultObjectConfigurationActionTest.groovy | 7 +- .../api/internal/project/DefaultProjectTest.groovy | 47 +- .../project/taskfactory/TaskFactoryTest.groovy | 1 - .../internal/tasks/DefaultTaskContainerTest.groovy | 2 +- .../util/DefaultProcessForkOptionsTest.groovy | 6 +- .../internal/AbstractFileLockManagerTest.groovy | 26 +- .../DefaultInitScriptProcessorTest.groovy | 3 +- .../DefaultScriptPluginFactoryTest.groovy | 143 ++- .../project/BuildScriptProcessorTest.groovy | 3 +- .../internal/DefaultDeploymentRegistryTest.groovy | 108 ++ ...aultBuildConfigurationActionExecuterTest.groovy | 114 ++ .../execution/DefaultBuildExecuterTest.groovy | 70 +- ...askExecutionPlanParallelTaskHandlingTest.groovy | 8 +- .../DefaultScriptCompilerFactoryTest.groovy | 4 +- .../AsmBackedEmptyScriptGeneratorTest.groovy | 37 - .../internal/BuildScriptDataSerializerTest.groovy | 32 + .../internal/BuildScriptTransformerSpec.groovy | 199 ++- .../internal/CachingScriptClassCompilerTest.groovy | 38 +- .../DefaultScriptCompilationHandlerTest.groovy | 404 ++++++ .../DefaultScriptCompilationHandlerTest.java | 346 ------ .../internal/DefaultScriptRunnerFactoryTest.java | 79 +- .../FileCacheBackedScriptClassCompilerTest.groovy | 17 +- .../ShortCircuitEmptyScriptCompilerTest.groovy | 21 +- .../DefaultExceptionAnalyserTest.java | 7 +- .../DefaultGradleLauncherFactoryTest.groovy | 10 +- .../initialization/DefaultGradleLauncherTest.java | 77 +- .../initialization/InitScriptHandlerTest.groovy | 43 +- .../buildsrc/BuildSourceBuilderTest.groovy | 18 +- .../DefaultAuthenticationContainerTest.groovy | 64 + .../ScriptUsageLocationReporterTest.groovy | 20 +- .../filewatch/DefaultFileWatcherFactoryTest.groovy | 5 +- .../graph/CachingDirectedGraphWalkerTest.groovy | 19 + .../DefaultBuildOperationExecutorTest.groovy | 261 +++- .../progress/OperationsHierarchyKeeperTest.groovy | 64 - .../progress/OperationsHierarchyTest.groovy | 138 --- .../service/scopes/BuildScopeServicesTest.groovy | 8 +- .../service/scopes/GlobalScopeServicesTest.java | 19 +- .../service/scopes/GradleScopeServicesTest.groovy | 10 + .../DefaultProgressLoggerFactoryTest.groovy | 166 ++- .../logging/internal/OutputSpecification.groovy | 8 +- .../progress/ProgressOperationsTest.groovy | 43 +- .../process/internal/DefaultExecHandleSpec.groovy | 5 +- .../streams/ExecOutputHandleRunnerTest.groovy | 44 + .../test/groovy/org/gradle/util/GUtilTest.groovy | 8 + .../util/ports/AbstractPortAllocatorTest.groovy | 33 + .../ports/FixedAvailablePortAllocatorTest.groovy | 134 ++ .../gradle/util/ports/ReservedPortRangeTest.groovy | 137 +++ .../gradle/test/fixtures/ConcurrentTestUtil.groovy | 800 ------------ .../ports/AbstractAvailablePortAllocator.groovy | 107 ++ .../gradle/util/ports/DefaultPortDetector.groovy | 46 + .../ports/DefaultReservedPortRangeFactory.groovy | 25 + .../util/ports/FixedAvailablePortAllocator.groovy | 73 ++ .../org/gradle/util/ports/PortAllocator.groovy | 35 + .../org/gradle/util/ports/PortDetector.groovy | 22 + .../org/gradle/util/ports/ReservedPortRange.groovy | 112 ++ .../util/ports/ReservedPortRangeFactory.groovy | 22 + .../ArtifactDependenciesIntegrationTest.groovy | 2 + ...ModuleDependenciesResolveIntegrationTest.groovy | 4 +- ...pendencyHandlerApiResolveIntegrationTest.groovy | 126 ++ .../ProjectDependencyResolveIntegrationTest.groovy | 58 +- .../ResolveCrossVersionIntegrationTest.groovy | 2 + .../integtests/resolve/ResolveTestFixture.groovy | 13 +- .../CacheReuseCrossVersionIntegrationTest.groovy | 2 + ...ationDependencyResolutionIntegrationTest.groovy | 278 ++++- ...amicRevisionRemoteResolveIntegrationTest.groovy | 2 +- ...IvyDynamicRevisionResolveIntegrationTest.groovy | 36 + .../ivy/IvyFileRepoResolveIntegrationTest.groovy | 30 + ...yModuleArtifactResolutionIntegrationTest.groovy | 30 + .../MavenFileRepoResolveIntegrationTest.groovy | 30 + .../MavenVersionRangeResolveIntegrationTest.groovy | 61 + .../artifacts/ArtifactDependencyResolver.java | 12 +- .../artifacts/ComponentMetadataProcessor.java | 6 + .../ComponentModuleMetadataProcessor.java | 7 + .../DefaultDependencyManagementServices.java | 46 +- .../artifacts/DefaultResolvedArtifact.java | 14 +- .../internal/artifacts/DefaultResolverResults.java | 125 ++ .../DependencyManagementBuildScopeServices.java | 149 ++- .../DependencyManagementGlobalScopeServices.java | 36 +- .../api/internal/artifacts/DependencyServices.java | 3 + .../artifacts/GlobalDependencyResolutionRules.java | 13 + .../api/internal/artifacts/ResolveContext.java | 36 + .../internal/artifacts/ResolveContextInternal.java | 31 - .../api/internal/artifacts/ResolverResults.java | 108 +- .../configurations/ConfigurationInternal.java | 2 +- .../configurations/DefaultConfiguration.java | 48 +- .../configurations/DirectBuildDependencies.java | 55 + .../artifacts/dsl/ModuleReplacementsData.java | 8 + .../CacheLockingArtifactDependencyResolver.java | 26 +- .../ivyservice/DefaultConfigurationResolver.java | 79 +- .../ivyservice/DefaultIvyDependencyPublisher.java | 3 +- .../ivyservice/DefaultLenientConfiguration.java | 21 +- .../ErrorHandlingArtifactDependencyResolver.java | 267 ---- .../ErrorHandlingConfigurationResolver.java | 265 ++++ .../ivyservice/IvyBackedArtifactPublisher.java | 40 +- .../ivyservice/LocalComponentConverter.java | 24 + .../ivyservice/LocalComponentFactory.java | 24 - ...lfResolvingDependencyConfigurationResolver.java | 115 ++ .../SelfResolvingDependencyResolver.java | 118 -- .../ShortCircuitEmptyConfigurationResolver.java | 110 ++ ...cuitEmptyConfigsArtifactDependencyResolver.java | 114 -- .../ivyservice/ivyresolve/ComponentResolvers.java | 28 + .../ivyresolve/DelegatingComponentResolvers.java | 59 + .../ivyservice/ivyresolve/IvyContextualiser.java | 28 - .../ivyresolve/NoRepositoriesResolver.java | 2 +- .../ivyservice/ivyresolve/RepositoryChain.java | 28 - .../ivyservice/ivyresolve/ResolveIvyFactory.java | 9 +- .../ivyresolve/ResolverProviderFactory.java | 24 + .../ivyservice/ivyresolve/UserResolverChain.java | 2 +- .../memcache/InMemoryArtifactsCache.java | 4 +- .../InMemoryCachedModuleComponentRepository.java | 1 - .../parser/GradlePomModuleDescriptorBuilder.java | 1 - .../ivyservice/ivyresolve/parser/PomReader.java | 57 +- .../ivyresolve/strategy/VersionRangeSelector.java | 16 +- .../moduleconverter/ComponentConverterSource.java | 39 - .../CompositeResolveLocalComponentFactory.java | 50 - .../ConfigurationBackedComponent.java | 39 + .../ConfigurationLocalComponentConverter.java | 75 ++ .../ConfigurationsToArtifactsConverter.java | 4 +- .../ConfigurationsToModuleDescriptorConverter.java | 4 +- .../DefaultConfigurationsToArtifactsConverter.java | 4 +- ...tConfigurationsToModuleDescriptorConverter.java | 11 +- .../ResolveLocalComponentFactory.java | 75 -- ...ultDependenciesToModuleDescriptorConverter.java | 8 +- .../DependenciesToModuleDescriptorConverter.java | 4 +- .../ProjectIvyDependencyDescriptorFactory.java | 2 - .../DefaultProjectComponentRegistry.java | 12 +- .../projectmodule/ProjectArtifactResolver.java | 78 -- .../projectmodule/ProjectDependencyResolver.java | 63 +- .../resolveengine/ComponentResolversChain.java | 141 +++ .../DefaultArtifactDependencyResolver.java | 183 +++ .../resolveengine/DefaultDependencyResolver.java | 175 --- .../resolveengine/artifact/ArtifactSet.java | 28 + .../resolveengine/artifact/DefaultArtifactSet.java | 97 ++ .../artifact/DefaultResolvedArtifactResults.java | 73 ++ .../artifact/DefaultResolvedArtifactsBuilder.java | 38 + .../artifact/DependencyArtifactsVisitor.java | 24 + .../artifact/ResolvedArtifactResults.java | 25 + .../resolveengine/artifact/ResolvedArtifacts.java | 24 + .../artifact/ResolvedArtifactsBuilder.java | 20 + .../artifact/ResolvedArtifactsGraphVisitor.java | 112 ++ .../resolveengine/graph/AbstractArtifactSet.java | 102 -- .../resolveengine/graph/ArtifactSet.java | 28 - .../graph/CompositeDependencyArtifactsVisitor.java | 46 + .../graph/CompositeDependencyGraphVisitor.java | 12 +- .../graph/ConfigurationArtifactSet.java | 53 - .../resolveengine/graph/DependencyArtifactSet.java | 48 - .../graph/DependencyGraphBuilder.java | 85 +- .../resolveengine/graph/DependencyGraphEdge.java | 39 + .../resolveengine/graph/DependencyGraphNode.java | 41 + .../graph/DependencyGraphPathResolver.java | 83 ++ .../graph/DependencyGraphVisitor.java | 10 +- .../ResolutionResultDependencyGraphVisitor.java | 43 - ...esolvedConfigurationDependencyGraphVisitor.java | 210 ---- ...lvedProjectConfigurationResultGraphVisitor.java | 50 - .../oldresult/DefaultResolvedArtifactResults.java | 71 -- .../oldresult/DefaultResolvedArtifactsBuilder.java | 33 - .../DefaultResolvedConfigurationBuilder.java | 8 +- .../oldresult/ResolvedArtifactResults.java | 29 - .../oldresult/ResolvedArtifactsBuilder.java | 26 - .../oldresult/ResolvedConfigurationBuilder.java | 4 +- ...esolvedConfigurationDependencyGraphVisitor.java | 105 ++ .../TransientConfigurationResultsBuilder.java | 21 +- .../TransientConfigurationResultsLoader.java | 1 + .../DefaultResolvedLocalComponentsResult.java | 42 + ...efaultResolvedLocalComponentsResultBuilder.java | 53 + ...tResolvedProjectConfigurationResultBuilder.java | 54 - ...DefaultResolvedProjectConfigurationResults.java | 32 - .../ResolvedLocalComponentsResult.java | 24 + .../ResolvedLocalComponentsResultBuilder.java | 26 + .../ResolvedLocalComponentsResultGraphVisitor.java | 62 + .../ResolvedProjectConfigurationResultBuilder.java | 25 - .../ResolvedProjectConfigurationResults.java | 21 - .../result/ComponentIdentifierSerializer.java | 11 +- .../result/ComponentSelectorSerializer.java | 4 +- .../ResolutionResultDependencyGraphVisitor.java | 44 + .../store/ResolutionResultsStoreFactory.java | 4 +- .../ivyservice/resolveengine/store/StoreSet.java | 4 +- .../query/DefaultArtifactResolutionQuery.java | 15 +- .../AbstractAuthenticationSupportedRepository.java | 50 +- .../repositories/DefaultBaseRepositoryFactory.java | 26 +- .../DefaultFlatDirArtifactRepository.java | 8 +- .../repositories/DefaultIvyArtifactRepository.java | 7 +- .../DefaultMavenArtifactRepository.java | 8 +- .../DefaultMavenLocalArtifactRepository.java | 8 +- .../DefaultExternalResourceArtifactResolver.java | 8 +- .../resolver/ExternalResourceArtifactResolver.java | 2 - .../resolver/ExternalResourceResolver.java | 25 +- ...rnalResourceResolverDescriptorParseContext.java | 6 +- ...ueSnapshotExternalResourceArtifactResolver.java | 4 - .../transport/RepositoryTransportFactory.java | 91 +- .../model/BuildableIvyModulePublishMetaData.java | 17 +- .../model/DefaultIvyModulePublishMetaData.java | 28 +- .../model/ModuleComponentArtifactIdentifier.java | 2 +- .../model/BuildableLocalComponentMetaData.java | 34 + .../model/DefaultLibraryBinaryIdentifier.java | 81 ++ .../model/DefaultLibraryComponentIdentifier.java | 74 -- .../model/DefaultLibraryComponentSelector.java | 23 +- .../local/model/DefaultLocalComponentMetaData.java | 128 +- .../model/LocalComponentArtifactIdentifier.java | 2 +- .../local/model/LocalComponentMetaData.java | 16 +- .../local/model/LocalConfigurationMetaData.java | 6 + .../local/model/MutableLocalComponentMetaData.java | 33 - .../PublishArtifactLocalArtifactMetaData.java | 15 +- .../model/ComponentArtifactIdentifier.java | 34 - .../component/model/ComponentArtifactMetaData.java | 1 + .../component/model/ComponentResolveMetaData.java | 1 - .../component/model/DefaultIvyArtifactName.java | 7 +- .../DefaultModuleDescriptorArtifactMetaData.java | 50 + .../model/LocalComponentDependencyMetaData.java | 1 - .../model/ModuleComponentArtifactsMetaData.java | 20 - .../model/ModuleDescriptorArtifactMetaData.java | 22 + .../resolve/ArtifactNotFoundException.java | 2 +- .../internal/resolve/ArtifactResolveException.java | 2 +- .../ResolveContextToComponentResolver.java | 2 +- .../result/BuildableArtifactResolveResult.java | 2 +- .../DefaultBuildableArtifactResolveResult.java | 2 +- .../transport/file/FileConnectorFactory.java | 42 + .../artifacts/DefaultResolvedArtifactTest.groovy | 12 +- .../artifacts/DefaultResolvedDependencyTest.java | 5 +- .../artifacts/DefaultResolverResultsSpec.groovy | 53 + .../internal/artifacts/ResolverResultsSpec.groovy | 69 -- .../configurations/DefaultConfigurationSpec.groovy | 34 +- ...cheLockingArtifactDependencyResolverTest.groovy | 17 +- ...orHandlingArtifactDependencyResolverTest.groovy | 164 --- .../ErrorHandlingConfigurationResolverTest.groovy | 164 +++ ...lvingDependencyConfigurationResolverTest.groovy | 137 +++ .../SelfResolvingDependencyResolverTest.groovy | 142 --- ...ortCircuitEmptyConfigurationResolverSpec.groovy | 74 ++ ...ptyConfigsArtifactDependencyResolverSpec.groovy | 78 -- .../ErrorHandlingArtifactResolverTest.groovy | 6 +- .../RepositoryChainArtifactResolverTest.groovy | 128 -- ...sitoryChainComponentMetaDataResolverTest.groovy | 580 --------- .../ivyresolve/ResolveIvyFactoryTest.groovy | 2 +- .../ResolverProviderArtifactResolverTest.groovy | 128 ++ ...verProviderComponentMetaDataResolverTest.groovy | 580 +++++++++ .../GradlePomModuleDescriptorParserTest.groovy | 50 + .../ivyresolve/parser/PomReaderProfileTest.groovy | 8 +- .../ivyresolve/parser/PomReaderTest.groovy | 38 +- .../DefaultVersionSelectorSchemeTest.groovy | 2 + .../strategy/VersionRangeSelectorTest.groovy | 13 + ...ConfigurationLocalComponentConverterTest.groovy | 56 + ...ltConfigurationsToArtifactsConverterTest.groovy | 4 +- ...figurationsToModuleDescriptorConverterTest.java | 17 +- .../ResolveLocalComponentFactoryTest.groovy | 58 - ...endenciesToModuleDescriptorConverterTest.groovy | 4 +- .../ProjectDependencyResolverTest.groovy | 33 +- .../DependencyGraphBuilderTest.groovy | 190 ++- .../ComponentIdentifierSerializerTest.groovy | 8 +- .../result/ComponentSelectorSerializerTest.groovy | 17 +- .../store/ResolutionResultsStoreFactoryTest.groovy | 12 +- .../DefaultArtifactResolutionQueryTest.groovy | 5 +- ...actAuthenticationSupportedRepositoryTest.groovy | 51 +- .../DefaultBaseRepositoryFactoryTest.groovy | 6 +- .../DefaultFlatDirArtifactRepositoryTest.groovy | 2 +- .../DefaultIvyArtifactRepositoryTest.groovy | 22 +- .../DefaultMavenArtifactRepositoryTest.groovy | 10 +- .../DefaultMavenLocalRepositoryTest.groovy | 6 +- ...shotExternalResourceArtifactResolverTest.groovy | 3 - .../RepositoryTransportFactoryTest.groovy | 108 +- .../DefaultIvyModulePublishMetaDataTest.groovy | 6 +- .../DefaultLibraryBinaryIdentifierTest.groovy | 80 ++ .../DefaultLibraryComponentIdentifierTest.groovy | 69 -- .../DefaultLibraryComponentSelectorTest.groovy | 79 +- .../model/DefaultLocalComponentMetaDataTest.groovy | 74 +- .../model/DefaultIvyArtifactNameTest.groovy | 7 +- .../resolve/ArtifactNotFoundExceptionTest.groovy | 2 +- ...efaultBuildableArtifactResolveResultTest.groovy | 3 +- ...tractIvyRemoteRepoResolveIntegrationTest.groovy | 2 + .../DetailedModelReportIntegrationTest.groovy | 201 +++ .../model/ModelReportIntegrationTest.groovy | 343 ++++-- .../internal/AbstractBinaryRenderer.java | 15 + .../components/internal/ComponentRenderer.java | 2 +- .../internal/ComponentReportRenderer.java | 2 +- .../components/internal/DiagnosticsServices.java | 3 + .../components/internal/SourceSetRenderer.java | 2 +- .../gradle/api/reporting/model/ModelReport.java | 4 + .../model/internal/ModelNodeRenderer.java | 96 +- .../internal/text/DefaultTextReportBuilder.java | 10 + .../internal/text/TextReportBuilder.java | 2 + .../internal/ComponentReportRendererTest.groovy | 2 +- .../model/ModelReportNodeBuilderTest.groovy | 42 + .../reporting/model/ModelReportParserTest.groovy | 142 +++ .../api/reporting/model/ReportNodeTest.groovy | 42 + .../model/internal/ModelNodeRendererTest.groovy | 44 + .../JvmComponentReportOutputFormatter.groovy | 32 + .../PlayComponentReportOutputFormatter.groovy | 29 + .../api/reporting/model/ConsoleReportOutput.groovy | 76 -- .../reporting/model/ModelReportNodeBuilder.groovy | 61 + .../api/reporting/model/ModelReportOutput.groovy | 86 ++ .../api/reporting/model/ModelReportParser.groovy | 140 +++ .../api/reporting/model/ParsedModelReport.groovy | 31 + .../gradle/api/reporting/model/ReportNode.groovy | 66 + .../gradle/AllDistributionIntegrationSpec.groovy | 2 +- .../gradle/BinDistributionIntegrationSpec.groovy | 2 +- subprojects/docs/docs.gradle | 2 + subprojects/docs/src/docs/css/dsl.css | 3 +- subprojects/docs/src/docs/css/javadoc.css | 2 +- subprojects/docs/src/docs/css/userguide.css | 6 +- subprojects/docs/src/docs/dsl/dsl.xml | 93 +- .../docs/src/docs/dsl/org.gradle.api.Buildable.xml | 41 + .../dsl/org.gradle.api.BuildableModelElement.xml | 44 + ...gradle.api.PolymorphicDomainObjectContainer.xml | 47 + ...ifacts.repositories.AuthenticationContainer.xml | 38 + ...ifacts.repositories.AuthenticationSupported.xml | 8 +- ....artifacts.repositories.PasswordCredentials.xml | 44 + .../org.gradle.api.credentials.AwsCredentials.xml | 44 + .../dsl/org.gradle.api.credentials.Credentials.xml | 38 + .../org.gradle.api.tasks.compile.JavaCompile.xml | 2 +- .../dsl/org.gradle.api.tasks.javadoc.Javadoc.xml | 2 +- .../org.gradle.authentication.Authentication.xml | 38 + ...dle.authentication.http.BasicAuthentication.xml | 38 + ...le.authentication.http.DigestAuthentication.xml | 38 + ...adle.nativeplatform.NativeLibraryBinarySpec.xml | 38 + .../dsl/org.gradle.platform.base.BinarySpec.xml | 4 +- .../dsl/org.gradle.platform.base.ToolChain.xml | 41 + .../src/docs/dsl/org.gradle.play.JvmClasses.xml | 47 + .../org.gradle.play.PlayApplicationBinarySpec.xml | 53 + .../dsl/org.gradle.play.PlayApplicationSpec.xml | 44 + .../src/docs/dsl/org.gradle.play.PublicAssets.xml | 44 + ...play.distribution.PlayDistributionContainer.xml | 22 + .../dsl/org.gradle.play.platform.PlayPlatform.xml | 47 + .../dsl/org.gradle.play.tasks.JavaScriptMinify.xml | 44 + ...g.gradle.play.tasks.PlayCoffeeScriptCompile.xml | 38 + .../src/docs/dsl/org.gradle.play.tasks.PlayRun.xml | 53 + .../dsl/org.gradle.play.tasks.RoutesCompile.xml | 56 + .../dsl/org.gradle.play.tasks.TwirlCompile.xml | 44 + .../org.gradle.play.toolchain.PlayToolChain.xml | 38 + ...javascript.coffeescript.CoffeeScriptCompile.xml | 38 + subprojects/docs/src/docs/dsl/plugins.xml | 7 +- subprojects/docs/src/docs/release/notes.md | 404 ++---- subprojects/docs/src/docs/stylesheets/dslHtml.xsl | 5 +- .../docs/src/docs/userguide/antlrPlugin.xml | 3 +- .../src/docs/userguide/buildScriptsTutorial.xml | 2 +- .../docs/src/docs/userguide/continuousBuild.xml | 3 +- .../docs/src/docs/userguide/customPlugins.xml | 2 +- subprojects/docs/src/docs/userguide/depMngmt.xml | 50 +- .../docs/src/docs/userguide/gradleDaemon.xml | 10 +- .../docs/src/docs/userguide/gradleWrapper.xml | 35 +- .../src/docs/userguide/img/playPluginModel.graphml | 210 ++++ .../src/docs/userguide/img/playPluginModel.png | Bin 0 -> 27543 bytes .../docs/src/docs/userguide/mavenPlugin.xml | 20 +- .../docs/src/docs/userguide/multiproject.xml | 2 +- .../docs/src/docs/userguide/nativeBinaries.xml | 4 +- .../docs/src/docs/userguide/newJavaPlugin.xml | 313 +++++ subprojects/docs/src/docs/userguide/newModel.xml | 164 ++- .../docs/src/docs/userguide/organizeBuildLogic.xml | 4 +- subprojects/docs/src/docs/userguide/playPlugin.xml | 560 +++++++++ .../docs/src/docs/userguide/scalaPlugin.xml | 5 +- .../docs/src/docs/userguide/standardPlugins.xml | 2 +- subprojects/docs/src/docs/userguide/testKit.xml | 180 +++ subprojects/docs/src/docs/userguide/userguide.xml | 3 + .../src/samples/jvmComponents/java/build.gradle | 26 - .../main/java/org/gradle/samples/HelloWorld.java | 7 - .../modelRules/basicRuleSourcePlugin/build.gradle | 60 +- .../samples/native-binaries/cpp-exe/build.gradle | 23 +- .../native-binaries/sourceset-variant/build.gradle | 28 + .../sourceset-variant/src/main/c/main.c | 10 + .../sourceset-variant/src/main/headers/platform.h | 17 + .../src/main/linux/platform-linux.c | 9 + .../sourceset-variant/src/main/mac/platform-mac.c | 9 + .../src/main/windows/platform-windows.c | 10 + .../newJavaPlugin/multiplecomponents/build.gradle | 45 + .../multiplecomponents/settings.gradle | 2 + .../src/client/java/org/gradle/Client.java | 9 + .../src/core/java/org/gradle/Person.java | 29 + .../src/core/resources/org/gradle/resource.xml | 1 + .../src/server/java/org/gradle/PersonServer.java | 10 + .../multiplecomponents/util/build.gradle | 11 + .../util/src/main/java/org/gradle/Utils.java | 5 + .../samples/newJavaPlugin/quickstart/build.gradle | 38 + .../src/main/java/org/gradle/Person.java | 29 + .../src/main/resources/org/gradle/resource.xml | 1 + .../targetplatforms/core/build.gradle | 28 + .../core/src/main/java/org/gradle/Person.java | 29 + .../core/src/main/java6/org/gradle/Person6.java | 10 + .../src/main/resources/org/gradle/resource.xml | 1 + .../targetplatforms/server/build.gradle | 22 + .../server/src/main/java/org/gradle/Server.java | 7 + .../newJavaPlugin/targetplatforms/settings.gradle | 2 + .../docs/src/samples/play/advanced/build.gradle | 24 +- .../docs/src/samples/play/advanced/conf/routes | 2 +- .../docs/src/samples/play/basic/build.gradle | 23 +- .../app/controllers/Application.scala | 14 + .../configure-compiler/app/views/index.scala.html | 7 + .../configure-compiler/app/views/main.scala.html | 15 + .../samples/play/configure-compiler/build.gradle | 35 + .../play/configure-compiler/conf/application.conf | 62 + .../samples/play/configure-compiler/conf/routes | 9 + .../configure-compiler/public/images/favicon.png | Bin 0 -> 687 bytes .../configure-compiler/public/javascripts/hello.js | 3 + .../public/stylesheets/main.css | 0 .../configure-compiler/test/ApplicationSpec.scala | 41 + .../configure-compiler/test/IntegrationSpec.scala | 24 + .../app/controllers/Application.scala | 14 + .../play/custom-assets/app/views/index.scala.html | 7 + .../play/custom-assets/app/views/main.scala.html | 15 + .../src/samples/play/custom-assets/build.gradle | 74 ++ .../play/custom-assets/conf/application.conf | 62 + .../src/samples/play/custom-assets/conf/routes | 9 + .../src/samples/play/custom-assets/copyright.txt | 15 + .../play/custom-assets/public/images/favicon.png | Bin 0 -> 687 bytes .../play/custom-assets/public/javascripts/hello.js | 3 + .../custom-assets}/public/stylesheets/main.css | 0 .../play/custom-assets/raw-assets/sample.js | 9 + .../src/samples/play/custom-distribution/LICENSE | 202 +++ .../src/samples/play/custom-distribution/README.md | 2 + .../app/controllers/Application.scala | 14 + .../custom-distribution/app/views/index.scala.html | 7 + .../custom-distribution/app/views/main.scala.html | 15 + .../samples/play/custom-distribution/build.gradle | 36 + .../play/custom-distribution/conf/application.conf | 62 + .../samples/play/custom-distribution/conf/routes | 9 + .../custom-distribution/public/images/favicon.png | Bin 0 -> 687 bytes .../public/javascripts/hello.js | 3 + .../public/stylesheets/main.css | 0 .../scripts/runPlayBinaryAsUser.sh | 14 + .../src/samples/play/multiproject/build.gradle | 15 +- .../play-2.4/app/controllers/Application.scala | 14 + .../play/play-2.4/app/views/index.scala.html | 7 + .../play/play-2.4/app/views/main.scala.html | 15 + .../docs/src/samples/play/play-2.4/build.gradle | 39 + .../samples/play/play-2.4/conf/application.conf | 62 + .../docs/src/samples/play/play-2.4/conf/routes | 9 + .../play/play-2.4/public/images/favicon.png | Bin 0 -> 687 bytes .../play/play-2.4/public/javascripts/hello.js | 3 + .../play/play-2.4}/public/stylesheets/main.css | 0 .../java/controllers/hello/HelloController.java | 30 + .../sourcesets/additional/javascript/old_sample.js | 10 + .../sourcesets/additional/javascript/sample.js | 9 + .../play/sourcesets/app/assets/greetings.js | 4 + .../sourcesets/app/controllers/Application.scala | 14 + .../docs/src/samples/play/sourcesets/build.gradle | 62 + .../samples/play/sourcesets/conf/application.conf | 62 + .../docs/src/samples/play/sourcesets/conf/routes | 13 + .../java/controllers/date/DateController.java | 32 + .../play/sourcesets/extra/routes/date.routes | 2 + .../play/sourcesets/extra/routes/hello.routes | 3 + .../play/sourcesets/extra/twirl/main.scala.html | 15 + .../play/sourcesets/public/images/favicon.png | Bin 0 -> 687 bytes .../play/sourcesets/public/javascripts/hello.js | 3 + .../play/sourcesets}/public/stylesheets/main.css | 0 .../src/samples/testKit/testKitJunit/build.gradle | 17 + .../gradle/sample/BuildLogicFunctionalTest.java | 77 ++ .../src/samples/testKit/testKitSpock/build.gradle | 16 + .../gradle/sample/BuildLogicFunctionalTest.groovy | 55 + .../testKit/testKitSpockClasspath/lib/build.gradle | 5 + .../groovy/org/gradle/sample/lib/Messages.groovy | 5 + .../testKitSpockClasspath/plugin/build.gradle | 36 + .../groovy/org/gradle/sample/HelloWorld.groovy | 28 + .../org/gradle/sample/HelloWorldPlugin.groovy | 26 + .../gradle/sample/BuildLogicFunctionalTest.groovy | 69 ++ .../testKit/testKitSpockClasspath/settings.gradle | 1 + .../artifacts/defineRepository/build.gradle | 30 + .../src/samples/userguide/files/copy/build.gradle | 6 +- .../basicRuleSourcePlugin-model-task.out | 127 +- .../userguideOutput/newJavaComponentReport.out | 29 + .../newJavaMultiComponents-clientJar.out | 9 + .../newJavaMultiComponents-serverJar.out | 9 + .../samples/userguideOutput/newJavaQuickstart.out | 9 + .../newJavaTargetPlatforms-java6MainJar.out | 8 + .../newJavaTargetPlatforms-server.out | 20 + .../userguideOutput/newJavaTargetPlatforms.out | 14 + .../userguideOutput/playComponentReport.out | 38 + .../gradle/ide/cdt/model/CprojectSettings.groovy | 4 +- .../internal/DefaultVisualStudioExtension.java | 6 +- .../internal/DefaultVisualStudioProject.groovy | 9 +- .../VisualStudioProjectConfiguration.groovy | 9 +- .../internal/VisualStudioProjectResolver.java | 17 +- .../visualstudio/plugins/VisualStudioPlugin.java | 6 +- .../tasks/GenerateFiltersFileTask.groovy | 5 +- .../tasks/GenerateProjectFileTask.groovy | 4 +- .../internal/AbsoluteFileNameTransformer.java | 26 - .../internal/RelativeFileNameTransformer.java | 10 +- .../VisualStudioProjectConfigurationTest.groovy | 10 +- .../VisualStudioProjectRegistryTest.groovy | 13 +- .../RelativeFileNameTransformerTest.groovy | 44 + .../eclipse/EclipseClasspathIntegrationTest.groovy | 116 ++ .../EclipseLinkedResourceIntegrationTest.groovy | 68 ++ .../ide/eclipse/EclipseProjectFixture.groovy | 5 + .../plugins/ide/eclipse/model/SourceFolder.groovy | 12 +- .../model/internal/SourceFoldersCreator.groovy | 80 +- .../ide/internal/tooling/EclipseModelBuilder.java | 9 +- .../plugins/ide/eclipse/EclipsePluginTest.groovy | 3 + .../ide/eclipse/model/SourceFolderTest.groovy | 17 +- .../model/internal/SourceFoldersCreatorTest.groovy | 137 +++ subprojects/integ-test/integ-test.gradle | 8 +- .../integtests/ApplicationIntegrationSpec.groovy | 2 +- .../BuildScriptClasspathIntegrationTest.java | 5 +- .../integtests/CacheProjectIntegrationTest.groovy | 4 +- .../integtests/CommandLineIntegrationTest.groovy | 37 +- .../ParallelTaskExecutionIntegrationTest.groovy | 6 +- .../gradle/integtests/StdioIntegrationTest.groovy | 24 +- .../BuildEnvironmentIntegrationTest.groovy | 5 +- .../SamplesWebQuickstartIntegrationTest.groovy | 19 +- .../samples/UserGuideSamplesIntegrationTest.groovy | 6 + .../samples/UserGuideSamplesRunner.groovy | 5 +- .../AbstractHttpDependencyResolutionTest.groovy | 4 +- .../fixtures/AbstractIntegrationSpec.groovy | 31 +- .../integtests/fixtures/AvailableJavaHomes.java | 1 + .../PersistentBuildProcessIntegrationTest.groovy | 3 +- .../fixtures/daemon/AbstractDaemonFixture.groovy | 7 + .../integtests/fixtures/daemon/DaemonFixture.java | 7 + .../fixtures/daemon/DaemonIntegrationSpec.groovy | 17 +- .../fixtures/executer/AbstractGradleExecuter.java | 252 ++-- .../fixtures/executer/DaemonGradleExecuter.java | 53 +- .../executer/DefaultGradleDistribution.java | 26 + .../fixtures/executer/ForkingGradleExecuter.java | 57 +- .../fixtures/executer/ForkingGradleHandle.java | 57 +- .../executer/GradleContextualExecuter.java | 2 +- .../fixtures/executer/GradleDistribution.java | 11 + .../fixtures/executer/GradleExecuter.java | 74 +- .../integtests/fixtures/executer/GradleHandle.java | 22 + .../fixtures/executer/GradleVersions.java | 2 +- .../fixtures/executer/InProcessGradleExecuter.java | 50 +- .../executer/OutputScrapingExecutionFailure.java | 5 +- .../executer/ParallelForkingGradleExecuter.java | 2 +- .../executer/ParallelForkingGradleHandle.java | 5 +- .../executer/ProgressLoggingFixture.groovy | 10 +- .../fixtures/jvm/InstalledJvmLocator.java | 2 +- .../integtests/fixtures/jvm/JvmInstallation.java | 3 + .../gradle/test/fixtures/ivy/IvyFileModule.groovy | 6 +- .../test/fixtures/server/http/HttpServer.groovy | 35 +- .../fixtures/server/http/TestProxyServer.groovy | 6 +- .../test/fixtures/server/sftp/SFTPServer.groovy | 15 +- .../fixtures/jvm/UbuntuJvmLocatorTest.groovy | 9 +- .../gradle/integtests/fixtures/UrlValidator.groovy | 26 +- .../gradle/test/fixtures/ConcurrentTestUtil.groovy | 806 ++++++++++++ .../fixtures/archive/ArchiveTestFixture.groovy | 12 + .../file/AbstractTestDirectoryProvider.java | 48 +- .../org/gradle/test/fixtures/file/ClassFile.groovy | 48 +- .../test/fixtures/file/LeaksFileHandles.java | 6 + .../file/TestDistributionDirectoryProvider.java | 7 +- .../file/TestNameTestDirectoryProvider.java | 7 +- .../internal/NativeServicesTestFixture.java | 9 +- .../src/main/groovy/org/gradle/util/Matchers.java | 5 +- .../org/gradle/util/SetSystemProperties.java | 9 +- .../groovy/org/gradle/util/TestPrecondition.groovy | 17 +- .../publish/ivy/IvyPublishBasicIntegTest.groovy | 4 +- ...yPublishDescriptorCustomizationIntegTest.groovy | 2 +- .../publish/ivy/IvyPublishHttpsIntegTest.groovy | 1 + .../publish/ivy/internal/IvyPublishServices.java | 4 +- .../internal/tasks/compile/ApiGroovyCompiler.java | 1 + .../org/gradle/api/tasks/compile/package-info.java | 20 - ...ustomComponentJarBinariesIntegrationTest.groovy | 136 +++ .../language/java/JarBinaryTypeVariantsTest.groovy | 116 ++ ...braryDependencyResolutionIntegrationTest.groovy | 1011 +++++++++++++++ ...guageDependencyResolutionIntegrationTest.groovy | 1292 +++++++++++++++++++- .../java/JavaLanguageIntegrationTest.groovy | 7 +- .../java/JavaSourceSetIntegrationTest.groovy | 61 +- .../MultipleBinaryTypesWithVariantsTest.groovy | 227 ++++ .../java/SampleJavaLanguageIntegrationTest.groovy | 69 +- .../java/SingleBinaryTypeWithVariantsTest.groovy | 392 ++++++ .../VariantAwareDependencyResolutionSpec.groovy | 322 +++++ .../compile/incremental/SelectiveCompiler.java | 2 +- .../gradle/api/tasks/compile/CompileOptions.java | 12 +- .../org/gradle/api/tasks/compile/JavaCompile.java | 24 +- .../org/gradle/api/tasks/compile/package-info.java | 20 - .../java/org/gradle/api/tasks/javadoc/Javadoc.java | 24 +- .../internal/DefaultJavaLanguageSourceSet.java | 4 +- .../internal/DefaultJavaLocalComponentFactory.java | 87 -- .../DefaultJavaSourceSetResolveContext.java | 75 -- .../JavaLanguagePluginServiceRegistry.java | 5 +- .../internal/JavaToolChainServiceRegistry.java | 3 + .../internal/ProjectLibraryDependencyResolver.java | 94 -- .../language/java/plugins/JavaLanguagePlugin.java | 122 +- .../api/tasks/compile/JavaCompileTest.groovy | 18 +- .../gradle/api/tasks/javadoc/JavadocTest.groovy | 22 +- .../DefaultJavaLanguageSourceSetTest.groovy | 28 +- .../DefaultJavaLocalComponentFactoryTest.groovy | 142 --- .../DefaultJavaSourceSetResolveContextTest.groovy | 58 - .../ResourceOnlyJvmLibraryIntegrationTest.groovy | 2 +- .../jvm/internal/JvmPluginServiceRegistry.java | 5 +- .../language/jvm/plugins/JvmResourcesPlugin.java | 2 +- .../AbstractJvmLanguageIntegrationTest.groovy | 20 +- ...AbstractJvmPluginLanguageIntegrationTest.groovy | 4 +- ...anguageIncrementalCompileIntegrationTest.groovy | 3 + .../language/c/CLanguageIntegrationTest.groovy | 2 +- .../language/cpp/CppLanguageIntegrationTest.groovy | 2 +- .../ParallelNativePluginsIntegrationTest.groovy | 2 + .../plugins/internal/AssembleTaskConfig.java | 3 +- .../nativeplatform/internal/CompileTaskConfig.java | 3 +- .../internal/registry/NativeLanguageServices.java | 3 + .../WindowsResourcesCompileTaskConfig.java | 3 +- .../AbstractNativeComponentPluginTest.groovy | 7 +- .../assembler/plugins/AssemblerPluginTest.groovy | 3 +- subprojects/language-scala/language-scala.gradle | 4 +- .../scala/JointScalaLangIntegrationTest.groovy | 45 + .../internal/tasks/scala/ZincScalaCompiler.java | 5 +- .../toolchain/DefaultScalaToolProvider.java | 2 +- .../toolchain/DownloadingScalaToolChain.java | 4 +- .../toolchain/ScalaToolChainServiceRegistry.java | 5 +- .../scala/plugins/ScalaLanguagePlugin.java | 2 +- .../language/scala/tasks/PlatformScalaCompile.java | 6 +- subprojects/launcher/launcher.gradle | 3 + .../BuildEnvironmentIntegrationTest.groovy | 11 +- .../GradleConfigurabilityIntegrationSpec.groovy | 2 +- .../AbstractContinuousIntegrationTest.groovy | 206 ---- .../CancellationContinuousIntegrationTest.groovy | 26 +- ...ntinuousBuildCancellationIntegrationTest.groovy | 102 ++ .../JdkVersionsContinuousIntegrationTest.groovy | 16 +- .../jdk7/SymlinkContinuousIntegrationTest.groovy | 3 + .../DaemonHealthLoggingIntegrationTest.groovy | 9 +- .../daemon/DaemonJvmSettingsIntegrationTest.groovy | 37 + .../launcher/daemon/DaemonLifecycleSpec.groovy | 10 +- .../DaemonOutputToggleIntegrationTest.groovy | 9 +- ...emonPerformanceMonitoringIntegrationTest.groovy | 13 +- .../daemon/DaemonReuseIntegrationTest.groovy | 1 - .../DaemonStartupMessageIntegrationTest.groovy | 13 +- .../DaemonSystemPropertiesIntegrationTest.groovy | 4 +- .../launcher/daemon/IsolatedDaemonSpec.groovy | 37 - .../daemon/SingleUseDaemonIntegrationTest.groovy | 36 +- .../gradle/launcher/cli/BuildActionsFactory.java | 16 +- .../org/gradle/launcher/cli/RunBuildAction.java | 8 +- .../PropertiesToDaemonParametersConverter.java | 6 +- .../launcher/daemon/bootstrap/DaemonMain.java | 9 +- .../daemon/bootstrap/ForegroundDaemonAction.java | 3 +- .../launcher/daemon/client/DaemonClient.java | 51 +- .../daemon/client/DaemonClientConnection.java | 11 +- .../daemon/client/DaemonClientGlobalServices.java | 14 + .../daemon/client/DaemonClientInputForwarder.java | 25 +- .../daemon/client/DaemonClientServices.java | 11 +- .../launcher/daemon/client/DaemonConnector.java | 8 +- .../daemon/client/DefaultDaemonConnector.java | 12 +- .../daemon/client/DefaultDaemonStarter.java | 40 +- .../client/EmbeddedDaemonClientServices.java | 1 + .../launcher/daemon/client/JvmVersionDetector.java | 78 ++ .../daemon/client/JvmVersionValidator.java | 56 +- .../client/NoUsableDaemonFoundException.java | 8 +- .../daemon/client/SingleUseDaemonClient.java | 3 +- .../launcher/daemon/client/StopDispatcher.java | 7 +- .../daemon/configuration/CurrentProcess.java | 31 +- .../daemon/configuration/DaemonParameters.java | 46 +- .../daemon/context/DaemonContextBuilder.java | 2 +- .../launcher/daemon/protocol/CloseInput.java | 5 +- .../launcher/daemon/protocol/CommandFailure.java | 29 - .../launcher/daemon/protocol/DaemonFailure.java | 29 - .../daemon/protocol/DaemonMessageSerializer.java | 295 +++++ .../gradle/launcher/daemon/protocol/Failure.java | 2 +- .../launcher/daemon/protocol/ForwardInput.java | 5 +- .../launcher/daemon/protocol/InputMessage.java | 19 + .../gradle/launcher/daemon/protocol/IoCommand.java | 22 - .../launcher/daemon/protocol/OutputMessage.java | 30 + .../launcher/daemon/server/DaemonServices.java | 6 +- .../daemon/server/DaemonTcpServerConnector.java | 8 +- .../daemon/server/DefaultDaemonConnection.java | 22 +- .../server/DefaultIncomingConnectionHandler.java | 19 +- .../daemon/server/IncomingConnectionHandler.java | 3 +- .../server/SynchronizedDispatchConnection.java | 24 +- .../server/exec/DefaultDaemonCommandExecuter.java | 7 +- .../launcher/daemon/server/exec/ExecuteBuild.java | 13 +- .../launcher/daemon/server/exec/ReturnResult.java | 4 +- .../server/exec/StartBuildOrRespondWithBusy.java | 4 +- .../gradle/launcher/exec/BuildActionExecuter.java | 3 +- .../exec/ContinuousBuildActionExecuter.java | 26 +- .../DaemonUsageSuggestingBuildActionExecuter.java | 5 +- .../exec/InProcessBuildActionExecuter.java | 13 +- .../internal/provider/BuildModelAction.java | 11 +- .../provider/ClientProvidedBuildAction.java | 12 +- .../internal/provider/ConnectionScopeServices.java | 11 +- .../provider/DaemonBuildActionExecuter.java | 5 +- .../internal/provider/DefaultConnection.java | 18 +- .../internal/provider/LauncherServices.java | 8 +- .../LoggingBridgingBuildActionExecuter.java | 5 +- .../internal/provider/ProviderConnection.java | 58 +- .../internal/provider/SubscribableBuildAction.java | 34 + .../provider/TestExecutionRequestAction.java | 94 ++ .../connection/ProviderOperationParameters.java | 2 + .../provider/events/DefaultTestDescriptor.java | 7 +- .../test/ProviderInternalJvmTestRequest.java | 67 + .../test/ProviderInternalTestExecutionRequest.java | 31 + .../launcher/cli/BuildActionsFactoryTest.groovy | 12 +- .../gradle/launcher/cli/RunBuildActionTest.groovy | 7 +- ...ropertiesToDaemonParametersConverterTest.groovy | 2 +- .../client/DaemonClientConnectionTest.groovy | 27 +- .../client/DaemonClientInputForwarderTest.groovy | 3 +- .../daemon/client/DaemonClientServicesTest.groovy | 1 + .../launcher/daemon/client/DaemonClientTest.groovy | 25 +- .../daemon/client/JvmVersionDetectorTest.groovy | 67 + .../daemon/client/JvmVersionValidatorTest.groovy | 65 - .../daemon/configuration/CurrentProcessTest.groovy | 21 +- .../configuration/DaemonParametersTest.groovy | 51 +- .../context/DaemonCompatibilitySpecSpec.groovy | 8 +- .../protocol/DaemonMessageSerializerTest.groovy | 181 +++ .../DaemonServerExceptionHandlingTest.groovy | 10 +- .../daemon/server/DaemonServicesTest.groovy | 3 +- .../server/DefaultDaemonConnectionTest.groovy | 26 +- .../exec/ContinuousBuildActionExecuterTest.groovy | 51 +- ...onUsageSuggestingBuildActionExecuterTest.groovy | 10 +- .../exec/InProcessBuildActionExecuterTest.groovy | 34 +- .../provider/DaemonBuildActionExecuterTest.groovy | 6 +- .../LoggingBridgingBuildActionExecuterTest.groovy | 14 +- .../provider/TestExecutionRequestActionTest.groovy | 46 + .../AbstractContinuousIntegrationTest.groovy | 215 ++++ .../Java7RequiringContinuousIntegrationTest.groovy | 0 .../maven/MavenPublishBasicIntegTest.groovy | 6 +- .../publish/maven/MavenPublishHttpIntegTest.groovy | 54 +- .../maven/MavenPublishHttpsIntegTest.groovy | 1 - .../maven/MavenPublishMultiProjectIntegTest.groovy | 2 +- .../action/AbstractMavenPublishAction.java | 17 + .../maven/internal/action/MavenDeployAction.java | 22 +- .../internal/action/SnapshotVersionManager.java | 18 - .../ProjectDependencyArtifactIdExtractorHack.java | 2 +- .../maven/internal/MavenPublishServices.java | 4 +- .../internal/publisher/MavenRemotePublisher.java | 5 +- .../internal/event/AbstractBroadcastDispatch.java | 58 + .../gradle/internal/event/BroadcastDispatch.java | 34 +- .../internal/event/DefaultListenerManager.java | 247 +++- .../org/gradle/internal/event/ListenerManager.java | 27 +- .../internal/serialize/BaseSerializerFactory.java | 15 + .../org/gradle/internal/serialize/Decoder.java | 2 +- .../serialize/DefaultSerializerRegistry.java | 69 +- .../internal/serialize/ObjectArraySerializer.java | 43 + .../gradle/internal/serialize/ObjectReader.java | 9 +- .../org/gradle/internal/serialize/Serializer.java | 6 +- .../internal/serialize/SerializerRegistry.java | 12 + .../org/gradle/internal/serialize/Serializers.java | 51 + .../internal/serialize/StatefulSerializer.java | 29 + .../internal/serialize/kryo/JavaSerializer.java | 5 +- .../serialize/kryo/StatefulSerializer.java | 28 - .../serialize/kryo/TypeSafeSerializer.java | 5 +- .../messaging/remote/ObjectConnectionBuilder.java | 6 +- .../internal/KryoBackedMessageSerializer.java | 60 + .../internal/hub/InterHubMessageSerializer.java | 31 +- .../hub/MessageHubBackedObjectConnection.java | 29 +- .../internal/hub/MethodInvocationSerializer.java | 2 +- .../remote/internal/inet/SocketConnection.java | 29 +- .../remote/internal/inet/TcpIncomingConnector.java | 9 +- .../remote/internal/inet/TcpOutgoingConnector.java | 38 +- .../event/DefaultListenerManagerTest.groovy | 763 ++++++++++++ .../internal/event/DefaultListenerManagerTest.java | 226 ---- .../internal/serialize/AbstractCodecTest.groovy | 14 +- .../serialize/BaseSerializerFactoryTest.groovy | 75 +- .../serialize/DefaultSerializerRegistryTest.groovy | 49 +- .../serialize/ObjectArraySerializerTest.groovy | 31 + .../internal/serialize/SerializersTest.groovy | 52 + .../KryoBackedMessageSerializerTest.groovy | 43 + .../hub/InterHubMessageSerializerTest.groovy | 15 +- .../hub/MethodInvocationSerializerTest.groovy | 7 +- .../internal/inet/MulticastConnectionTest.groovy | 7 +- .../remote/internal/inet/TcpConnectorTest.groovy | 177 ++- .../internal/serialize/SerializerSpec.groovy | 21 +- subprojects/model-core/model-core.gradle | 1 + .../model/ConfigurationCycleIntegrationTest.groovy | 14 +- .../ModelRuleBindingFailureIntegrationTest.groovy | 109 +- ...odelRuleBindingValidationIntegrationTest.groovy | 10 +- .../model/ModelRuleSamplesIntegrationTest.groovy | 2 + .../ModelRuleValidationIntegrationTest.groovy | 4 +- .../model/PluginRuleSourceIntegrationTest.groovy | 8 +- .../model/ScopedRuleSourceIntegrationTest.groovy | 23 +- .../model/TaskCreationIntegrationTest.groovy | 51 +- .../ComplexManagedTypeIntegrationTest.groovy | 219 ---- .../CyclicalManagedTypeIntegrationTest.groovy | 4 +- ...validManagedModelMutationIntegrationTest.groovy | 14 +- .../InvalidManagedModelRuleIntegrationTest.groovy | 8 +- .../managed/ManagedModelMapIntegrationTest.groovy | 6 +- ...odelPropertyTargetingRuleIntegrationTest.groovy | 73 +- .../model/managed/ManagedSetIntegrationTest.groovy | 47 +- .../ManagedTypeReferencesIntegrationTest.groovy | 92 ++ .../model/managed/ModelSetIntegrationTest.groovy | 45 +- .../NestedManagedTypeIntegrationTest.groovy | 148 +++ .../PolymorphicManagedTypeIntegrationTest.groovy | 5 + .../PrimitivesInManagedModelIntegrationTest.groovy | 231 ---- ...ScalarTypesInManagedModelIntegrationTest.groovy | 570 +++++++++ .../src/main/java/org/gradle/model/Managed.java | 12 +- .../src/main/java/org/gradle/model/ModelMap.java | 2 +- .../internal/ModelMapModelProjection.java | 10 +- .../internal/core/ChildNodeCreatorStrategy.java | 27 - .../core/ChildNodeInitializerStrategy.java | 26 + .../model/internal/core/EmptyModelProjection.java | 1 + .../internal/core/FactoryBasedNodeInitializer.java | 50 + .../gradle/model/internal/core/ModelAdapter.java | 2 +- .../gradle/model/internal/core/ModelCreator.java | 2 +- .../model/internal/core/ModelCreatorFactory.java | 41 - .../gradle/model/internal/core/ModelCreators.java | 22 +- .../internal/core/ModelMapGroovyDecorator.java | 6 + .../org/gradle/model/internal/core/ModelNode.java | 19 + .../model/internal/core/MutableModelNode.java | 3 - .../model/internal/core/NodeBackedModelMap.java | 122 +- .../model/internal/core/NodeBackedModelSet.java | 19 +- .../model/internal/core/NodeInitializer.java | 37 + .../core/ProjectionBackedModelCreator.java | 6 +- .../core/SpecializedModelMapProjection.java | 4 +- .../TypeCompatibilityModelProjectionSupport.java | 8 +- .../rule/describe/AbstractModelRuleDescriptor.java | 1 - .../rule/describe/MethodModelRuleDescriptor.java | 17 +- .../core/rule/describe/ModelRuleDescriptor.java | 4 + .../rule/describe/NestedModelRuleDescriptor.java | 19 + .../rule/describe/SimpleModelRuleDescriptor.java | 17 + .../inspect/DefaultModelCreatorFactory.java | 262 ---- .../inspect/ManagedChildNodeCreatorStrategy.java | 43 + .../inspect/ManagedModelCreationRuleExtractor.java | 23 +- .../internal/inspect/ManagedModelInitializer.java | 70 +- .../inspect/MethodModelRuleExtractors.java | 15 +- .../inspect/ProjectionOnlyNodeInitializer.java | 46 + .../manage/instance/ManagedProxyFactory.java | 17 +- .../manage/projection/ManagedModelProjection.java | 31 +- .../manage/schema/AbstractModelSchema.java | 35 + .../manage/schema/AbstractModelStructSchema.java | 77 ++ .../manage/schema/ManagedImplModelSchema.java | 29 + .../manage/schema/ModelCollectionSchema.java | 36 +- .../schema/ModelManagedImplStructSchema.java | 57 + .../internal/manage/schema/ModelMapSchema.java | 9 +- .../internal/manage/schema/ModelProperty.java | 56 +- .../model/internal/manage/schema/ModelSchema.java | 76 +- .../internal/manage/schema/ModelStructSchema.java | 34 +- .../schema/ModelUnmanagedImplStructSchema.java | 31 + .../internal/manage/schema/ModelValueSchema.java | 30 + .../schema/extract/DefaultModelSchemaStore.java | 9 +- .../manage/schema/extract/EnumStrategy.java | 13 +- .../schema/extract/JdkValueTypeStrategy.java | 45 +- ...dImplStructSchemaExtractionStrategySupport.java | 376 ++++++ .../schema/extract/ManagedImplStructStrategy.java | 80 ++ .../schema/extract/ManagedProxyClassGenerator.java | 282 ++++- .../manage/schema/extract/ManagedSetStrategy.java | 68 +- .../manage/schema/extract/ModelMapStrategy.java | 43 +- .../extract/ModelPropertyExtractionResult.java | 45 + .../manage/schema/extract/ModelSchemaAspect.java | 20 + .../extract/ModelSchemaAspectExtractionResult.java | 43 + .../ModelSchemaAspectExtractionStrategy.java | 26 + .../schema/extract/ModelSchemaAspectExtractor.java | 52 + .../extract/ModelSchemaExtractionContext.java | 11 +- .../extract/ModelSchemaExtractionStrategy.java | 5 +- .../schema/extract/ModelSchemaExtractor.java | 75 +- .../manage/schema/extract/ModelSchemaUtils.java | 172 +++ .../manage/schema/extract/ModelSetStrategy.java | 67 +- .../manage/schema/extract/PrimitiveStrategy.java | 28 +- .../extract/PropertyAccessorExtractionContext.java | 86 ++ .../manage/schema/extract/SetStrategy.java | 56 +- .../schema/extract/SpecializedMapStrategy.java | 12 +- .../StructSchemaExtractionStrategySupport.java | 231 ++++ .../manage/schema/extract/StructStrategy.java | 442 ------- .../extract/UnmanagedImplStructStrategy.java | 74 ++ .../manage/schema/extract/UnmanagedStrategy.java | 32 - .../internal/registry/DefaultModelRegistry.java | 189 +-- .../model/internal/registry/ModelNodeInternal.java | 49 +- .../internal/registry/ModelReferenceNode.java | 199 +++ .../registry/UnboundModelRulesException.java | 4 +- .../internal/report/unbound/UnboundRuleInput.java | 4 +- .../report/unbound/UnboundRulesReporter.java | 62 +- .../org/gradle/model/internal/type/ModelType.java | 15 + .../internal/type/TypeVariableTypeWrapper.java | 161 +++ .../gradle/model/ManagedModelMapTypesTest.groovy | 28 +- .../org/gradle/model/ManagedNamedTest.groovy | 12 +- .../model/ManagedNodeBackedModelMapTest.groovy | 25 +- .../model/UnmanagedNodeBackedModelMapTest.groovy | 14 +- .../describe/MethodModelRuleDescriptorTest.groovy | 28 +- .../internal/inspect/ModelRuleBindingTest.groovy | 2 +- .../internal/inspect/ModelRuleExtractorTest.groovy | 24 +- .../inspect/ModelRuleSourceDetectorTest.groovy | 4 +- .../inspect/MutationRuleExecutionOrderTest.groovy | 2 +- .../projection/ModelSetModelProjectionTest.groovy | 16 +- .../extract/DefaultModelSchemaStoreTest.groovy | 12 +- .../extract/ManagedProxyClassGeneratorTest.groovy | 210 +++- .../schema/extract/ModelSchemaExtractorTest.groovy | 520 +++++++- .../schema/extract/ModelSchemaUtilsTest.groovy | 92 ++ .../extract/ScalarTypesInManagedModelTest.groovy | 69 ++ ...TypeWithManagedSuperTypeExtractionStrategy.java | 36 + .../registry/DefaultModelRegistryTest.groovy | 244 ++-- .../internal/registry/ModelNodeInternalTest.groovy | 65 + .../model/internal/registry/RegistrySpec.groovy | 8 +- .../model/internal/registry/ScopedRuleTest.groovy | 41 +- .../report/unbound/UnboundRulesReporterTest.groovy | 23 +- .../internal/fixture/ModelRegistryHelper.java | 3 +- .../unbound/UnboundRulesReportMatchers.groovy | 38 - .../dsl/ModelDslCreationIntegrationTest.groovy | 3 +- ...odelDslRuleInputDetectionIntegrationSpec.groovy | 84 +- .../internal/NonTransformedModelDslBacking.java | 28 +- .../dsl/internal/TransformedModelDslBacking.java | 50 +- .../model/dsl/internal/transform/RuleMetadata.java | 2 + .../model/dsl/internal/transform/RuleVisitor.java | 1 + .../model/dsl/internal/transform/RulesVisitor.java | 13 +- .../dsl/internal/transform/SourceLocation.java | 7 +- .../NonTransformedModelDslBackingTest.groovy | 4 +- .../internal/TransformedModelDslBackingTest.groovy | 5 +- .../nativeintegration/services/NativeServices.java | 10 +- .../NativePlatformConsoleDetectorTest.groovy | 7 +- subprojects/performance/performance.gradle | 8 +- .../OldJavaPluginBigProjectPerformanceTest.groovy | 4 +- .../ProjectDependenciesPerformanceTest.groovy | 3 - .../performance/VariantsPerformanceTest.groovy | 12 +- .../src/templates/native-pch-source/pch.h | 10 +- .../CrossVersionPerformanceTestRunnerTest.groovy | 5 + .../fixture/GCLoggingCollectorTest.groovy | 2 +- .../fixture/BuildEventTimestampCollector.java | 2 +- .../performance/fixture/BuildExperimentRunner.java | 4 +- .../fixture/CompositeDataCollector.java | 4 +- .../gradle/performance/fixture/DataCollector.java | 2 +- .../performance/fixture/GCLoggingCollector.java | 2 +- .../org/gradle/performance/fixture/Git.groovy | 2 +- .../fixture/GradleExecuterBackedSession.groovy | 8 +- .../fixture/GradleInvocationSpec.groovy | 12 +- .../performance/fixture/MemoryInfoCollector.groovy | 2 +- .../fixture/ToolingApiBackedGradleSession.groovy | 2 +- subprojects/platform-base/platform-base.gradle | 1 + .../base/ComponentModelIntegrationTest.groovy | 217 ++-- .../base/CustomBinaryIntegrationTest.groovy | 6 +- .../CustomComponentBinariesIntegrationTest.groovy | 4 +- .../CustomComponentPluginIntegrationTest.groovy | 6 +- .../CustomComponentSourceSetIntegrationTest.groovy | 170 +++ .../VariantAspectExtractionIntegrationTest.groovy | 126 ++ .../AbstractLocalLibraryDependencyResolver.java | 178 +++ .../resolve/DefaultProjectModelResolver.java | 43 + .../LibraryResolutionErrorMessageBuilder.java | 163 +++ .../api/internal/resolve/ProjectModelResolver.java | 26 + .../api/internal/resolve/VariantsMatcher.java | 135 ++ .../gradle/language/base/FunctionalSourceSet.java | 2 - .../base/internal/DefaultFunctionalSourceSet.java | 11 - .../base/internal/DependentSourceSetInternal.java | 2 +- .../base/internal/LanguageSourceSetContainer.java | 50 - .../base/internal/SourceSetNotationParser.java | 70 -- .../base/internal/SourceTransformTaskConfig.java | 4 +- .../base/internal/model/ComponentBinaryRules.java | 61 + .../base/internal/model/ComponentRules.java | 9 +- .../DefaultLibraryLocalComponentMetaData.java | 51 + .../model/DefaultVariantDimensionSelector.java | 35 + .../DefaultVariantDimensionSelectorFactory.java | 41 + .../internal/model/DefaultVariantsMetaData.java | 104 ++ .../internal/model/VariantDimensionSelector.java | 39 + .../model/VariantDimensionSelectorFactory.java | 20 + .../base/internal/model/VariantsMetaData.java | 35 + .../internal/model/VariantsMetaDataHelper.java | 35 + .../DependentSourceSetLocalComponentConverter.java | 85 ++ .../resolve/DependentSourceSetResolveContext.java | 79 ++ .../internal/resolve/LibraryResolveException.java | 32 + .../base/plugins/ComponentModelBasePlugin.java | 52 +- .../language/base/plugins/LanguageBasePlugin.java | 2 +- .../base/sources/BaseLanguageSourceSet.java | 2 +- .../core/DomainObjectCollectionBackedModelMap.java | 239 ++++ .../core/DomainObjectSetBackedModelMap.java | 232 ---- .../java/org/gradle/platform/base/BinarySpec.java | 30 +- .../org/gradle/platform/base/ComponentSpec.java | 8 + .../platform/base/DependencySpecContainer.java | 22 +- .../platform/base/PlatformAwareComponentSpec.java | 2 +- .../java/org/gradle/platform/base/Variant.java | 39 + .../platform/base/binary/BaseBinarySpec.java | 58 +- .../platform/base/component/BaseComponentSpec.java | 47 +- .../platform/base/internal/BinaryNamingScheme.java | 5 - .../platform/base/internal/BinarySpecInternal.java | 10 +- .../base/internal/ComponentSpecInternal.java | 4 +- .../internal/DefaultDependencySpecContainer.java | 81 +- .../platform/base/internal/VariantAspect.java | 35 + .../internal/VariantAspectExtractionStrategy.java | 56 + .../base/internal/builder/TypeBuilderFactory.java | 23 + .../internal/registry/AbstractTypeBuilder.java | 13 +- .../registry/BinaryTasksModelRuleExtractor.java | 2 +- .../registry/BinaryTypeModelRuleExtractor.java | 18 +- .../ComponentModelBaseServiceRegistry.java | 50 +- .../registry/ComponentTypeModelRuleExtractor.java | 21 +- .../registry/LanguageTypeModelRuleExtractor.java | 18 +- .../internal/registry/TypeModelRuleExtractor.java | 17 +- .../toolchain/DefaultResolvedCompiler.java | 45 - .../internal/toolchain/DefaultResolvedTool.java | 43 - .../internal/toolchain/DefaultToolResolver.java | 178 --- .../base/internal/toolchain/ResolvedTool.java | 21 - .../base/internal/toolchain/ToolResolver.java | 29 - .../internal/resolve/VariantsMatcherTest.groovy | 233 ++++ .../ComponentTypeModelRuleExtractorTest.groovy | 10 +- .../internal/SourceSetNotationParserTest.groovy | 54 - .../model/DefaultVariantsMetaDataTest.groovy | 73 ++ .../internal/model/ParametrizedBinaryString.java | 26 + .../model/ParametrizedBinaryVariantDimension1.java | 26 + .../base/internal/model/ParametrizedVariant.java | 24 + .../base/internal/model/VariantDimension1.java | 22 + .../base/internal/model/VariantDimension2.java | 22 + .../base/internal/model/VariantDimension3.java | 20 + .../model/VariantsMetaDataHelperTest.groovy | 100 ++ .../LanguageTypeModelRuleExtractorTest.groovy | 6 +- ...dentSourceSetLocalComponentConverterTest.groovy | 136 +++ .../DependentSourceSetResolveContextTest.groovy | 64 + .../testinterfaces/CustomLanguageSourceSet.groovy | 21 + .../internal/testinterfaces/NotBinarySpec.groovy | 19 + .../testinterfaces/NotComponentSpec.groovy | 19 + .../base/internal/testinterfaces/RawLibrary.groovy | 21 + .../internal/testinterfaces/SomeBinarySpec.groovy | 21 + .../testinterfaces/SomeBinarySubType.groovy | 19 + .../testinterfaces/SomeComponentSpec.groovy | 21 + .../internal/testinterfaces/SomeLibrary.groovy | 21 + ...DomainObjectCollectionBackedModelMapTest.groovy | 45 + .../platform/base/binary/BaseBinarySpecTest.groovy | 42 + .../base/component/BaseComponentSpecTest.groovy | 14 +- ...SpecSpecializationSchemaExtractionStrategy.java | 38 + .../BinaryTasksModelRuleExtractorTest.groovy | 13 +- .../BinaryTypeModelRuleExtractorTest.groovy | 36 +- .../ComponentBinariesModelRuleExtractorTest.groovy | 12 +- .../toolchain/DefaultToolResolverTest.groovy | 128 -- .../base/component/BaseComponentFixtures.groovy | 10 +- .../jvm/ComponentReportIntegrationTest.groovy | 66 +- ...ustomJarBinarySpecSubtypeIntegrationTest.groovy | 237 ++++ .../gradle/jvm/JarBinariesIntegrationTest.groovy | 6 +- .../JvmComponentPluginIntegrationTest.groovy | 37 +- .../JvmLibraryResolutionErrorMessageBuilder.java | 151 +++ .../resolve/JvmLocalLibraryDependencyResolver.java | 44 + .../internal/resolve/LibraryPublishArtifact.java | 37 + .../main/java/org/gradle/jvm/JarBinarySpec.java | 6 + .../main/java/org/gradle/jvm/JvmBinarySpec.java | 10 +- .../java/org/gradle/jvm/JvmComponentExtension.java | 33 - .../org/gradle/jvm/internal/BuildDirHolder.java | 31 + .../gradle/jvm/internal/DefaultJarBinarySpec.java | 28 +- ...efaultJavaPlatformVariantDimensionSelector.java | 31 + .../jvm/internal/DependencyResolvingClasspath.java | 155 +++ .../org/gradle/jvm/internal/JarBinaryRules.java | 45 + .../gradle/jvm/internal/JarBinarySpecInternal.java | 8 +- .../gradle/jvm/internal/PlatformJvmServices.java | 35 - ...arBinarySpecSpecializationModelInitializer.java | 60 + ...SpecSpecializationSchemaExtractionStrategy.java | 40 + .../plugins/DefaultJvmComponentExtension.java | 34 - .../jvm/internal/services/PlatformJvmServices.java | 87 ++ .../jvm/platform/internal/DefaultJavaPlatform.java | 9 +- .../org/gradle/jvm/plugins/JvmComponentPlugin.java | 195 ++- ...e.internal.service.scopes.PluginServiceRegistry | 2 +- .../JvmLocalLibraryDependencyResolverTest.groovy | 250 ++++ ...JavaPlatformVariantDimensionSelectorTest.groovy | 74 ++ .../jvm/internal/DefaultJvmLibrarySpecTest.groovy | 2 +- .../internal/plugins/CreateJvmBinariesTest.groovy | 22 +- .../internal/DefaultJavaPlatformTest.groovy | 4 +- .../BinaryBuildTypesIntegrationTest.groovy | 6 +- .../BinaryConfigurationIntegrationTest.groovy | 155 +-- .../BinaryFlavorsIntegrationTest.groovy | 5 +- .../ComponentReportIntegrationTest.groovy | 11 +- .../LibraryDependenciesIntegrationTest.groovy | 2 +- .../NativeBinariesIntegrationTest.groovy | 2 +- .../NativePlatformSamplesIntegrationTest.groovy | 30 + .../TestSuiteDefinitionIntegrationSpec.groovy | 41 +- .../TestSuiteModelIntegrationSpec.groovy | 82 +- .../BinaryNativePlatformIntegrationTest.groovy | 2 +- .../GeneratedSourcesIntegrationTest.groovy | 2 +- ...GccToolChainCustomisationIntegrationTest.groovy | 2 + .../GccToolChainDiscoveryIntegrationTest.groovy | 2 + .../internal/AbstractNativeBinarySpec.java | 6 +- .../internal/AbstractNativeComponentSpec.java | 8 +- .../internal/AbstractNativeLibraryBinarySpec.java | 6 +- .../internal/DefaultSharedLibraryBinarySpec.java | 4 +- .../internal/configure/NativeComponentRules.java | 2 +- .../prebuilt/PrebuiltLibraryBinaryLocator.java | 14 +- .../resolve/ChainedLibraryBinaryLocator.java | 1 + .../resolve/CurrentProjectModelResolver.java | 39 + .../internal/resolve/DefaultLibraryResolver.java | 1 + .../internal/resolve/DefaultProjectLocator.java | 42 - .../internal/resolve/LibraryResolveException.java | 32 - .../resolve/NativeDependencyResolverServices.java | 15 +- .../resolve/ProjectLibraryBinaryLocator.java | 21 +- .../internal/resolve/ProjectLocator.java | 22 - .../internal/services/NativeBinaryServices.java | 3 + .../nativeplatform/platform/Architecture.java | 33 + .../nativeplatform/platform/NativePlatform.java | 62 +- .../nativeplatform/platform/OperatingSystem.java | 23 + .../plugins/NativeComponentModelPlugin.java | 187 ++- .../plugins/NativeComponentPlugin.groovy | 132 -- .../plugins/NativeComponentPlugin.java | 33 + .../internal/DefaultNativeTestSuiteBinarySpec.java | 2 +- .../test/plugins/NativeBinariesTestPlugin.java | 13 +- .../gcc/AbstractGccCompatibleToolChain.java | 13 + .../DefaultSharedLibraryBinarySpecTest.groovy | 9 +- .../DefaultStaticLibraryBinarySpecTest.groovy | 4 +- .../internal/NativeBinarySpecTest.groovy | 40 +- .../resolve/ProjectLibraryBinaryLocatorTest.groovy | 34 +- .../configure/TestNativeBinariesFactory.java | 2 +- subprojects/platform-play/platform-play.gradle | 4 +- ...xedPlayAndJavaLangProjectIntegrationTest.groovy | 71 -- ...dPlayAndJvmLibraryProjectIntegrationTest.groovy | 76 ++ ...edPlayAndScalaLangProjectIntegrationTest.groovy | 70 -- .../PlayAppWithFailingTestsIntegrationTest.groovy | 12 +- .../PlayBinaryApplicationIntegrationTest.groovy | 32 +- ...ayDistributionApplicationIntegrationTest.groovy | 20 +- ...ayMultiProjectApplicationIntegrationTest.groovy | 111 +- .../integtest/PlayPlatformIntegrationTest.groovy | 43 +- .../PlayTestApplicationIntegrationTest.groovy | 25 +- .../advanced/AdvancedAppContentVerifier.groovy | 41 - .../PlayBinaryAdvancedAppIntegrationTest.groovy | 12 +- ...ayDistributionAdvancedAppIntegrationTest.groovy | 14 +- .../PlayContinuousBuildIntegrationTest.groovy | 95 ++ ...ltiProjectContinuousBuildIntegrationTest.groovy | 181 +++ .../PlayMultiProjectReloadIntegrationTest.groovy | 208 ++++ .../continuous/PlayReloadIntegrationTest.groovy | 203 +++ .../DistributionTestExecHandleBuilder.groovy | 76 -- .../play/integtest/fixtures/PlayCoverage.groovy | 21 - ...ayMultiVersionApplicationIntegrationTest.groovy | 50 - .../PlayMultiVersionIntegrationTest.groovy | 28 - ...ultiVersionRunApplicationIntegrationTest.groovy | 47 - .../AbstractPlaySampleIntegrationTest.groovy | 32 +- .../MultiprojectPlaySampleIntegrationTest.groovy | 11 +- .../UserGuidePlaySamplesIntegrationTest.groovy | 131 ++ .../PlayApplicationPluginIntegrationTest.groovy | 69 +- .../PlayCoffeeScriptPluginIntegrationTest.groovy | 9 +- .../PlayDistributionPluginIntegrationTest.groovy | 23 +- .../PlayJavaScriptPluginIntegrationTest.groovy | 4 +- .../AbstractRoutesCompileIntegrationTest.groovy | 305 +++++ .../CoffeeScriptCompileIntegrationTest.groovy | 45 +- ...offeeScriptImplementationIntegrationTest.groovy | 16 +- .../tasks/DistributionZipIntegrationTest.groovy | 11 +- .../tasks/JavaScriptMinifyIntegrationTest.groovy | 29 +- .../Play23RoutesCompileIntegrationTest.groovy | 65 + .../Play24RoutesCompileIntegrationTest.groovy | 99 ++ .../play/tasks/PlayRunIntegrationTest.groovy | 84 ++ .../play/tasks/RoutesCompileIntegrationTest.groovy | 246 ---- .../play/tasks/TwirlCompileIntegrationTest.groovy | 48 +- .../play/tasks/TwirlVersionIntegrationTest.groovy | 34 +- .../fixtures/app/advancedplayapp/build.gradle | 16 - .../fixtures/app/basicplayapp/build.gradle | 11 - .../app/basicplayapp/test/ApplicationSpec.scala | 35 - .../app/basicplayapp/test/IntegrationSpec.scala | 34 - .../app/playappwithdependencies/build.gradle | 16 - .../test/ApplicationSpec.scala | 36 - .../test/IntegrationSpec.scala | 38 - .../fixtures/app/playmultiproject/build.gradle | 9 - .../test/FailingApplicationSpec.scala | 36 - .../test/FailingIntegrationSpec.scala | 36 - .../src/main/java/org/gradle/play/JvmClasses.java | 1 - .../org/gradle/play/PlayApplicationBinarySpec.java | 25 +- .../java/org/gradle/play/PlayApplicationSpec.java | 46 +- .../gradle/play/distribution/PlayDistribution.java | 4 + .../internal/DefaultPlayApplicationBinarySpec.java | 24 +- .../play/internal/DefaultPlayApplicationSpec.java | 11 + .../gradle/play/internal/DefaultPlayPlatform.java | 1 + .../PlayApplicationBinarySpecInternal.java | 8 +- .../play/internal/PlayPlatformNotationParser.java | 7 +- .../gradle/play/internal/PlayPlatformResolver.java | 2 +- .../gradle/play/internal/PlaySourceSetRules.java | 79 ++ .../play/internal/platform/PlayMajorVersion.java | 8 +- .../internal/routes/DefaultRoutesCompileSpec.java | 29 +- .../DefaultVersionedRoutesCompilerAdapter.java | 12 +- .../play/internal/routes/RoutesCompileSpec.java | 9 + .../play/internal/routes/RoutesCompiler.java | 2 +- .../internal/routes/RoutesCompilerAdapterV22X.java | 13 +- .../internal/routes/RoutesCompilerAdapterV23X.java | 11 +- .../internal/routes/RoutesCompilerAdapterV24X.java | 83 ++ .../internal/routes/RoutesCompilerFactory.java | 2 + .../routes/VersionedRoutesCompilerAdapter.java | 5 +- .../play/internal/run/DefaultPlayRunSpec.java | 28 +- .../run/DefaultVersionedPlayRunAdapter.java | 107 +- .../run/PlayApplicationDeploymentHandle.java | 74 ++ .../play/internal/run/PlayApplicationRunner.java | 12 +- .../internal/run/PlayApplicationRunnerFactory.java | 40 + .../internal/run/PlayApplicationRunnerToken.java | 27 +- .../play/internal/run/PlayRunAdapterV22X.java | 9 + .../play/internal/run/PlayRunAdapterV23X.java | 73 ++ .../play/internal/run/PlayRunAdapterV24X.java | 33 + .../org/gradle/play/internal/run/PlayRunSpec.java | 8 + .../internal/run/PlayRunWorkerServerProtocol.java | 2 + .../gradle/play/internal/run/PlayWorkerServer.java | 57 +- .../play/internal/run/VersionedPlayRunAdapter.java | 12 +- .../spec/PlayApplicationBinaryRenderer.java | 1 - .../internal/toolchain/DefaultPlayToolChain.java | 2 +- .../toolchain/DefaultPlayToolProvider.java | 39 +- .../toolchain/PlayToolChainServiceRegistry.java | 4 + .../internal/twirl/TwirlCompilerAdapterV10X.java | 2 +- .../internal/twirl/TwirlCompilerAdapterV22X.java | 3 +- .../play/internal/twirl/TwirlCompilerFactory.java | 6 +- .../twirl/VersionedTwirlCompilerAdapter.java | 2 +- .../org/gradle/play/platform/PlayPlatform.java | 12 + .../gradle/play/plugins/PlayApplicationPlugin.java | 176 ++- .../play/plugins/PlayCoffeeScriptPlugin.java | 20 +- .../play/plugins/PlayDistributionPlugin.java | 50 +- .../gradle/play/plugins/PlayJavaScriptPlugin.java | 30 +- .../play/plugins/PlayPluginConfigurations.java | 51 +- .../org/gradle/play/plugins/PlayTestPlugin.java | 13 +- .../org/gradle/play/tasks/JavaScriptMinify.java | 32 +- .../gradle/play/tasks/PlayCoffeeScriptCompile.java | 2 +- .../main/java/org/gradle/play/tasks/PlayRun.java | 119 +- .../java/org/gradle/play/tasks/RoutesCompile.java | 99 +- .../java/org/gradle/play/tasks/TwirlCompile.java | 59 +- .../gradle/scala/internal/reflect/ScalaMethod.java | 37 +- .../gradle/scala/internal/reflect/ScalaObject.java | 71 ++ .../DefaultPlayApplicationBinarySpecTest.groovy | 17 +- .../play/internal/DefaultPlayToolChainTest.groovy | 2 +- .../play/internal/PlayPlatformResolverTest.groovy | 2 +- .../run/PlayApplicationDeploymentHandleTest.groovy | 98 ++ .../run/PlayApplicationRunnerTokenTest.groovy | 56 + .../toolchain/DefaultPlayToolProviderTest.groovy | 26 +- .../play/plugins/PlayCoffeeScriptPluginTest.groovy | 13 +- .../play/plugins/PlayDistributionPluginTest.groovy | 2 - .../play/plugins/PlayJavaScriptPluginTest.groovy | 11 +- .../gradle/play/plugins/PlayTestPluginTest.groovy | 4 + .../org/gradle/play/tasks/PlayRunTest.groovy | 27 +- .../org/gradle/play/tasks/TwirlCompileTest.groovy | 24 +- ...ersionPlayContinuousBuildIntegrationTest.groovy | 33 + ...actMultiVersionPlayReloadIntegrationTest.groovy | 24 + ...stractPlayContinuousBuildIntegrationTest.groovy | 68 ++ .../fixtures/AdvancedRunningPlayApp.groovy | 48 + .../DistributionTestExecHandleBuilder.groovy | 110 ++ .../fixtures/MultiProjectRunningPlayApp.groovy | 36 + .../play/integtest/fixtures/PlayCoverage.groovy | 29 + ...ayMultiVersionApplicationIntegrationTest.groovy | 51 + .../PlayMultiVersionIntegrationTest.groovy | 30 + ...ultiVersionRunApplicationIntegrationTest.groovy | 33 + .../play/integtest/fixtures/RunningPlayApp.groovy | 110 ++ .../integtest/fixtures/app/AdvancedPlayApp.groovy | 0 .../integtest/fixtures/app/BasicPlayApp.groovy | 0 .../play/integtest/fixtures/app/PlayApp.groovy | 0 .../fixtures/app/PlayAppWithDependencies.groovy | 0 .../integtest/fixtures/app/PlayMultiProject.groovy | 0 .../fixtures/app/WithFailingTestsApp.groovy | 0 .../app/assets/javascripts/sample.js | 0 .../app/assets/javascripts/test.coffee | 0 .../app/controllers/Application.scala | 0 .../app/controllers/jva/PureJava.java | 0 .../app/controllers/scala/MixedJava.java | 0 .../app/advancedplayapp/app/models/DataType.java | 0 .../advancedplayapp/app/models/ScalaClass.scala | 0 .../app/special/strangename/Application.scala | 0 .../app/views/awesome/index.scala.html | 0 .../app/advancedplayapp/app/views/index.scala.html | 0 .../app/advancedplayapp/app/views/main.scala.html | 0 .../fixtures/app/advancedplayapp/build.gradle | 21 + .../fixtures/app/advancedplayapp/conf/jva.routes | 0 .../fixtures/app/advancedplayapp/conf/routes | 0 .../fixtures/app/advancedplayapp/conf/scala.routes | 0 .../basicplayapp/app/controllers/Application.scala | 0 .../app/basicplayapp/app/views/index.scala.html | 0 .../app/basicplayapp/app/views/main.scala.html | 0 .../fixtures/app/basicplayapp/build.gradle | 16 + .../fixtures/app/basicplayapp/conf/routes | 0 .../app/basicplayapp/test/ApplicationSpec.scala | 26 + .../app/basicplayapp/test/IntegrationSpec.scala | 23 + .../fixtures/app/basicplayapp/test/notATest.yaml | 0 .../app/controllers/Application.scala | 0 .../app/views/index.scala.html | 0 .../app/views/main.scala.html | 0 .../app/playappwithdependencies/build.gradle | 21 + .../app/playappwithdependencies/conf/routes | 0 .../test/ApplicationSpec.scala | 26 + .../test/IntegrationSpec.scala | 23 + .../app/playappwithdependencies/test/notATest.yaml | 0 .../fixtures/app/playmultiproject/build.gradle | 14 + .../app/playmultiproject/javalibrary/build.gradle | 0 .../javalibrary/src/main/java/org/test/Util.java | 0 .../primary/app/controllers/Application.scala | 0 .../app/playmultiproject/primary/build.gradle | 0 .../playmultiproject/primary/conf/application.conf | 0 .../app/playmultiproject/primary/conf/routes | 0 .../playmultiproject/primary/public/primary.txt | 0 .../fixtures/app/playmultiproject/settings.gradle | 0 .../app/controllers/submodule/Application.scala | 0 .../app/playmultiproject/submodule/build.gradle | 0 .../submodule/public/submodule.txt | 0 .../play/integtest/fixtures/app/shared/README | 0 .../fixtures/app/shared/conf/application.conf | 0 .../integtest/fixtures/app/shared/conf/logback.xml | 22 + .../fixtures/app/shared/public/images/favicon.svg | 0 .../app/shared/public/javascripts/hello.js | 0 .../app/shared/public/stylesheets/main.css | 0 .../test/FailingApplicationSpec.scala | 28 + .../test/FailingIntegrationSpec.scala | 25 + .../PluginUseClassLoadingIntegrationSpec.groovy | 2 + .../plugin/use/PluginUseDslIntegrationSpec.groovy | 2 +- ...esolutionDeprecatedClientIntegrationTest.groovy | 2 +- ...ginResolutionServiceCommsIntegrationTest.groovy | 13 +- .../internal/PluginUsePluginServiceRegistry.java | 9 +- subprojects/plugins/plugins.gradle | 1 + .../api/plugins/BasePluginIntegrationTest.groovy | 7 +- .../BasicGroovyCompilerIntegrationSpec.groovy | 16 + .../compile/InvokeDynamicGroovyCompilerSpec.groovy | 2 + .../BasicJavaCompilerIntegrationSpec.groovy | 3 +- .../gradle/testing/fixture/JUnitCoverage.groovy | 6 +- .../gradle/testing/fixture/TestNGCoverage.groovy | 8 +- .../JUnitClassLevelFilteringIntegrationTest.groovy | 88 ++ .../junit/JUnitFilteringIntegrationTest.groovy | 53 +- .../JUnitFilteringSupportIntegrationTest.groovy | 55 +- ...itIgnoreClassMultiVersionIntegrationSpec.groovy | 2 +- .../internal/java/AbstractLanguageSourceSet.java | 2 + .../jvm/DefaultClassDirectoryBinarySpec.java | 44 +- .../gradle/api/internal/tasks/CompileServices.java | 3 + .../tasks/testing/NoMatchingTestsReporter.java | 6 +- .../tasks/testing/filter/DefaultTestFilter.java | 23 +- .../testing/junit/JUnitTestClassExecuter.java | 58 +- .../tasks/testing/junit/JUnitTestEventAdapter.java | 14 +- .../tasks/testing/junit/JUnitTestFramework.java | 20 - .../testing/worker/ForkingTestClassProcessor.java | 2 +- .../tasks/testing/worker/TestEventSerializer.java | 47 +- .../internal/tasks/testing/worker/TestWorker.java | 4 +- .../api/plugins/LegacyJavaComponentPlugin.java | 11 +- .../groovy/org/gradle/api/tasks/testing/Test.java | 2 +- .../api/tasks/testing/TestExecutionException.java | 36 + .../org/gradle/api/tasks/testing/TestFilter.java | 38 +- .../main/groovy/org/gradle/jvm/package-info.java | 20 - .../api/internal/plugins/unixStartScript.txt | 6 +- .../jvm/DefaultClassDirectoryBinarySpecTest.groovy | 3 +- .../plugins/UnixStartScriptGeneratorTest.groovy | 2 +- .../testing/filter/DefaultTestFilterTest.groovy | 10 + .../junit/JUnitTestClassProcessorData.groovy | 4 +- .../junit/JUnitTestClassProcessorTest.groovy | 25 + .../testing/worker/TestEventSerializerTest.groovy | 22 +- .../tasks/testing/worker/TestWorkerTest.groovy | 107 +- .../gradle/api/plugins/JavaBasePluginTest.groovy | 2 +- .../api/publish/internal/PublishServices.java | 3 + subprojects/resources-http/resources-http.gradle | 2 +- .../authentication/http/BasicAuthentication.java | 27 + .../authentication/http/DigestAuthentication.java | 27 + .../gradle/authentication/http/package-info.java | 25 + .../authentication/DefaultBasicAuthentication.java | 26 + .../DefaultDigestAuthentication.java | 26 + .../http/AlwaysRedirectRedirectStrategy.java | 19 +- .../transport/http/DefaultHttpSettings.java | 22 +- .../transport/http/HttpClientConfigurer.java | 95 +- .../transport/http/HttpConnectorFactory.java | 17 +- .../resource/transport/http/HttpProxySettings.java | 5 +- .../http/HttpResourcesPluginServiceRegistry.java | 16 + .../resource/transport/http/HttpSettings.java | 8 +- .../http/RepeatableInputStreamEntity.java | 7 +- .../transport/http/ntlm/NTLMCredentials.java | 2 +- .../transport/http/HttpClientConfigurerTest.groovy | 14 +- .../transport/http/HttpClientHelperTest.groovy | 2 +- .../transport/http/ntlm/NTLMCredentialsTest.groovy | 2 +- .../s3/ivy/IvyS3RepoResolveIntegrationTest.groovy | 30 + .../maven/MavenS3RepoErrorsIntegrationTest.groovy | 22 + .../resource/transport/aws/s3/S3Client.java | 2 +- .../transport/aws/s3/S3ConnectorFactory.java | 16 +- .../aws/s3/S3ResourcesPluginServiceRegistry.java | 3 + .../ivy/IvySftpRepoErrorsIntegrationTest.groovy | 30 + .../MavenSftpRepoResolveIntegrationTest.groovy | 31 + .../resource/transport/sftp/SftpClientFactory.java | 2 +- .../transport/sftp/SftpConnectorFactory.java | 12 +- .../internal/resource/transport/sftp/SftpHost.java | 2 +- .../resource/transport/sftp/SftpResource.java | 2 +- .../transport/sftp/SftpResourceAccessor.java | 2 +- .../transport/sftp/SftpResourceLister.java | 2 +- .../transport/sftp/SftpResourceUploader.java | 2 +- .../sftp/SftpResourcesPluginServiceRegistry.java | 3 + .../transport/sftp/SftpClientFactoryTest.groovy | 24 +- .../org/gradle/authentication/Authentication.java | 29 + .../org/gradle/authentication/package-info.java | 25 + .../AuthenticationSchemeRegistry.java | 26 + .../DefaultAuthenticationSchemeRegistry.java | 37 + .../internal/resource/PasswordCredentials.java | 41 - .../connector/ResourceConnectorFactory.java | 3 + .../connector/ResourceConnectorSpecification.java | 7 +- subprojects/scala/scala.gradle | 2 +- .../gradle/integtests/fixtures/ZincCoverage.groovy | 24 + .../gradle/scala/ScalaPluginIntegrationTest.groovy | 5 +- ...AntInProcessScalaCompilerIntegrationTest.groovy | 9 +- ...ProcessOlderScalaCompilerIntegrationTest.groovy | 2 +- ...ScalaCompilerMultiVersionIntegrationTest.groovy | 80 ++ .../groovy/org/gradle/api/tasks/ScalaRuntime.java | 2 +- .../org/gradle/api/tasks/scala/package-info.java | 20 - .../plugins/sonar/SonarSmokeIntegrationTest.groovy | 13 +- .../org/gradle/sonar/runner/SonarTestServer.groovy | 15 +- .../testkit/TestKitEndUserIntegrationTest.groovy | 485 ++++++++ .../testkit/TestKitSamplesIntegrationTest.groovy | 53 + .../AbstractGradleRunnerIntegrationTest.groovy | 91 ++ .../GradleRunnerArgumentsIntegrationTest.groovy | 111 ++ .../GradleRunnerBuildFailureIntegrationTest.groovy | 165 +++ ...radleRunnerIsolatedDaemonIntegrationTest.groovy | 184 +++ ...leRunnerMechanicalFailureIntegrationTest.groovy | 141 +++ .../GradleRunnerResultIntegrationTest.groovy | 114 ++ .../runner/GradleRunnerSmokeIntegrationTest.groovy | 113 ++ .../org/gradle/testkit/runner/BuildResult.java | 103 ++ .../java/org/gradle/testkit/runner/BuildTask.java | 46 + .../org/gradle/testkit/runner/GradleRunner.java | 183 +++ .../InvalidRunnerConfigurationException.java | 37 + .../org/gradle/testkit/runner/TaskOutcome.java | 48 + .../testkit/runner/UnexpectedBuildFailure.java | 32 + .../testkit/runner/UnexpectedBuildSuccess.java | 32 + .../internal/ConstantTestKitDirProvider.java | 32 + .../runner/internal/DefaultBuildResult.java | 80 ++ .../testkit/runner/internal/DefaultBuildTask.java | 38 + .../runner/internal/DefaultGradleRunner.java | 200 +++ .../runner/internal/GradleExecutionResult.java | 60 + .../testkit/runner/internal/GradleExecutor.java | 24 + .../runner/internal/TempTestKitDirProvider.java | 33 + .../runner/internal/TestKitDirProvider.java | 23 + .../runner/internal/TestKitGradleExecutor.java | 151 +++ .../org/gradle/testkit/runner/package-info.java | 22 + .../runner/internal/DefaultBuildResultTest.groovy | 61 + .../runner/internal/DefaultGradleRunnerTest.groovy | 246 ++++ .../internal/TempTestKitDirProviderTest.groovy | 46 + subprojects/test-kit/test-kit.gradle | 7 + .../test/cunit/CUnitIntegrationTest.groovy | 52 +- .../googletest/GoogleTestIntegrationTest.groovy | 3 +- .../test/cunit/plugins/CUnitPlugin.java | 4 +- .../internal/DefaultGoogleTestTestSuiteSpec.java | 1 - .../test/googletest/plugins/GoogleTestPlugin.java | 8 +- .../nativeplatform/test/cunit/CUnitTest.groovy | 2 +- .../test/googletest/GoogleTestTest.groovy | 2 +- .../runner/BuildClientSubscriptionsSetup.java | 39 - .../provider/runner/BuildModelActionRunner.java | 4 - .../runner/ClientForwardingBuildListener.java | 4 +- .../runner/ClientForwardingTestListener.java | 35 +- .../runner/ClientProvidedBuildActionRunner.java | 4 - .../runner/SubscribableBuildActionRunner.java | 60 + .../TestExecutionBuildConfigurationAction.java | 121 ++ .../runner/TestExecutionRequestActionRunner.java | 71 ++ .../runner/TestExecutionResultEvaluator.java | 154 +++ .../provider/runner/ToolingBuilderServices.java | 19 +- ...estExecutionBuildConfigurationActionTest.groovy | 131 ++ .../TestExecutionRequestActionRunnerTest.groovy | 35 + .../runner/TestExecutionResultEvaluatorTest.groovy | 105 ++ .../integtests/tooling/TestLauncherSpec.groovy | 259 ++++ ...lingApiUnsupportedVersionIntegrationTest.groovy | 22 +- .../ContinuousBuildToolingApiSpecification.groovy | 22 +- .../tooling/fixture/GradleBuildCancellation.groovy | 56 + .../tooling/fixture/ProgressEvents.groovy | 233 ++++ .../integtests/tooling/fixture/TextUtil.java | 23 + .../integtests/tooling/fixture/ToolingApi.groovy | 23 +- .../ToolingApiCompatibilitySuiteRunner.groovy | 1 + .../ToolingApiEclipseModelCrossVersionSpec.groovy | 37 +- .../m3/ToolingApiLoggingCrossVersionSpec.groovy | 1 - .../m8/JavaConfigurabilityCrossVersionSpec.groovy | 4 +- .../m8/ToolingApiLoggingCrossVersionSpec.groovy | 1 - ...adlePropertiesToolingApiCrossVersionSpec.groovy | 10 +- .../M9JavaConfigurabilityCrossVersionSpec.groovy | 50 +- ...singCommandLineArgumentsCrossVersionSpec.groovy | 24 +- .../ToolingApiDeprecationsCrossVersionSpec.groovy | 101 -- ...ingApiUnsupportedVersionCrossVersionSpec.groovy | 121 ++ .../r112/UserHomeDirCrossVersionSpec.groovy | 4 + .../ProjectOutcomesModuleCrossVersionSpec.groovy | 4 +- ...pportedOperationFeedbackCrossVersionSpec.groovy | 2 +- ...ApiConfigurationOnDemandCrossVersionSpec.groovy | 4 +- .../tooling/r18/BuildActionCrossVersionSpec.groovy | 4 +- .../r18/BuildScriptModelCrossVersionSpec.groovy | 2 + ...ngApiUnsupportedBuildJvmCrossVersionSpec.groovy | 19 +- .../tooling/r22/BuildActionCrossVersionSpec.groovy | 4 +- .../r22/ClientShutdownCrossVersionSpec.groovy | 6 +- .../r23/StandardStreamsCrossVersionSpec.groovy | 18 +- .../r24/TestProgressCrossVersionSpec.groovy | 3 + .../r25/BuildProgressCrossVersionSpec.groovy | 316 +---- ...nuousBuildProgressEventsCrossVersionSpec.groovy | 11 +- ...usUnsupportedJavaVersionCrossVersionSpec.groovy | 2 + ...entHandleContinuousBuildCrossVersionSpec.groovy | 134 ++ .../tooling/r25/ProgressCrossVersionSpec.groovy | 120 +- .../r25/TaskProgressCrossVersionSpec.groovy | 440 +------ .../r25/TestProgressCrossVersionSpec.groovy | 538 +++----- .../r26/BuildProgressCrossVersionSpec.groovy | 85 ++ .../r26/TestLauncherCrossVersionSpec.groovy | 482 ++++++++ .../r27/TestLauncherCrossVersionSpec.groovy | 204 ++++ ...piEclipseLinkedResourcesCrossVersionSpec.groovy | 98 ++ .../org/gradle/tooling/BuildActionExecuter.java | 104 +- .../java/org/gradle/tooling/BuildLauncher.java | 94 +- .../org/gradle/tooling/ConfigurableLauncher.java | 136 +++ .../org/gradle/tooling/LongRunningOperation.java | 85 +- .../main/java/org/gradle/tooling/ModelBuilder.java | 100 +- .../java/org/gradle/tooling/ProjectConnection.java | 18 + .../org/gradle/tooling/TestExecutionException.java | 36 + .../main/java/org/gradle/tooling/TestLauncher.java | 114 ++ .../gradle/tooling/events/OperationDescriptor.java | 2 + .../gradle/tooling/events/ProgressListener.java | 2 +- .../internal/DefaultOperationDescriptor.java | 15 +- .../internal/OperationDescriptorWrapper.java | 23 + .../internal/DefaultTaskOperationDescriptor.java | 5 +- .../DefaultJvmTestOperationDescriptor.java | 6 +- .../internal/DefaultTestOperationDescriptor.java | 6 +- .../consumer/AbstractLongRunningOperation.java | 34 +- .../internal/consumer/ConnectionFactory.java | 4 +- .../consumer/DefaultBuildActionExecuter.java | 2 +- .../internal/consumer/DefaultBuildLauncher.java | 5 +- .../internal/consumer/DefaultGradleConnector.java | 2 - .../consumer/DefaultInternalJvmTestRequest.java | 62 + .../internal/consumer/DefaultModelBuilder.java | 12 +- .../consumer/DefaultProjectConnection.java | 5 + .../internal/consumer/DefaultTestLauncher.java | 137 +++ .../internal/consumer/ResultHandlerAdapter.java | 4 + .../internal/consumer/TestExecutionRequest.java | 63 + .../connection/AbstractConsumerConnection.java | 6 + .../BuildActionRunnerBackedConsumerConnection.java | 2 +- ...ConnectionVersion4BackedConsumerConnection.java | 69 -- .../consumer/connection/ConsumerConnection.java | 5 +- ...InternalConnectionBackedConsumerConnection.java | 27 +- .../ModelBuilderBackedConsumerConnection.java | 2 +- .../connection/NoToolingApiConnection.java | 11 +- .../NonCancellableConsumerConnectionAdapter.java | 5 + .../RethrowingErrorsConsumerActionExecutor.java | 42 + .../TestExecutionConsumerConnection.java | 41 + .../connection/UnsupportedActionRunner.java | 9 +- .../UnsupportedOlderVersionConnection.java | 75 ++ .../loader/DefaultToolingImplementationLoader.java | 7 +- .../parameters/BuildProgressListenerAdapter.java | 8 +- .../parameters/ConsumerOperationParameters.java | 41 +- .../internal/protocol/ConnectionVersion4.java | 3 +- .../protocol/test/InternalJvmTestRequest.java | 31 + .../test/InternalTestExecutionConnection.java | 36 + .../test/InternalTestExecutionException.java | 30 + .../test/InternalTestExecutionRequest.java | 34 + .../gradle/tooling/model/internal/Exceptions.java | 17 +- .../AbstractLongRunningOperationTest.groovy | 105 ++ .../consumer/DefaultTestLauncherTest.groovy | 93 ++ .../consumer/DistributionFactoryTest.groovy | 4 + ...ActionRunnerBackedConsumerConnectionTest.groovy | 3 +- ...tionVersion4BackedConsumerConnectionTest.groovy | 60 - ...alConnectionBackedConsumerConnectionTest.groovy | 19 +- ...ModelBuilderBackedConsumerConnectionTest.groovy | 3 +- .../TestExecutionConsumerConnectionTest.groovy | 55 + .../UnsupportedOlderVersionConnectionTest.groovy | 60 + .../DefaultToolingImplementationLoaderTest.groovy | 2 +- .../ConsumerOperationParametersTest.groovy | 48 +- subprojects/tooling-api/tooling-api.gradle | 7 + .../integtests/LiveOutputIntegrationTest.groovy | 2 +- .../ModelTasksGradleUIIntegrationTest.groovy | 2 +- ...projectProjectAndTaskListIntegrationTest.groovy | 2 +- .../org/gradle/integtests/OpenApiUiTest.groovy | 4 +- .../org/gradle/integtests/OutputUILordTest.groovy | 4 + .../gradleplugin/foundation/GradlePluginLord.java | 4 +- .../WrapperChecksumVerificationTest.groovy | 90 ++ .../WrapperConcurrentDownloadTest.groovy | 2 + .../WrapperCrossVersionIntegrationTest.groovy | 60 +- .../WrapperGenerationIntegrationTest.groovy | 2 +- .../integtests/WrapperHttpIntegrationTest.groovy | 2 + .../WrapperLoggingIntegrationTest.groovy | 2 + .../WrapperProjectIntegrationTest.groovy | 2 + .../WrapperUserHomeIntegrationTest.groovy | 2 + .../src/main/java/org/gradle/wrapper/Install.java | 63 +- .../org/gradle/wrapper/WrapperConfiguration.java | 9 + .../java/org/gradle/wrapper/WrapperExecutor.java | 16 +- .../groovy/org/gradle/wrapper/InstallTest.groovy | 3 + .../org/gradle/wrapper/WrapperExecutorTest.groovy | 6 +- .../org/gradle/wrapper/wrapper.properties | 1 + version.txt | 2 +- 1734 files changed, 53095 insertions(+), 20297 deletions(-) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/gradle.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
