This is an automated email from the git hooks/post-receive script. seamlik-guest pushed a commit to branch master in repository gradle.
commit d61e19729d63be37d678ecf613f8c9c4052435d4 Merge: 349eed7 38e436c Author: Kai-Chung Yan <[email protected]> Date: Wed Jul 8 17:40:15 2015 +0800 Merge tag 'upstream/2.5' Upstream version 2.5 build.gradle | 11 +- .../org/gradle/build/ReleasedVersions.groovy | 29 + config/checkstyle/suppressions.xml | 4 + gradle/dependencies.gradle | 23 +- gradle/groovyProject.gradle | 2 +- gradle/idea.gradle | 97 +- gradle/integTest.gradle | 165 ++- gradle/java9.gradle | 68 ++ gradle/strictCompile.gradle | 8 +- gradle/testFixtures.gradle | 10 +- gradle/wrapper.gradle | 2 +- gradle/wrapper/gradle-wrapper.properties | 4 +- gradlew | 2 +- gradlew.bat | 2 +- .../org/gradle/api/plugins/antlr/AntlrPlugin.java | 11 +- .../org/gradle/api/plugins/antlr/AntlrTask.java | 5 + .../ExpressionReplacingVisitorSupport.java | 431 ++++++++ .../internal/StatementReplacingVisitorSupport.java | 136 +++ .../src/main/java/org/gradle/internal/Actions.java | 15 + .../main/java/org/gradle/internal/BiActions.java | 20 + .../main/java/org/gradle/internal/FileUtils.java | 49 +- .../src/main/java/org/gradle/internal/Specs.java | 29 + .../org/gradle/internal/UncheckedException.java | 2 +- .../internal/classloader/ClassLoaderFactory.java | 2 + .../classloader/DefaultClassLoaderFactory.java | 15 +- .../java/org/gradle/internal/jvm/JdkTools.java | 25 +- .../src/main/java/org/gradle/internal/jvm/Jvm.java | 24 +- .../internal/reflect/JavaReflectionUtil.java | 8 + .../main/java/org/gradle/util/CollectionUtils.java | 28 +- .../org/gradle/internal/BiActionsTest.groovy | 52 + .../org/gradle/internal/FileUtilsTest.groovy | 28 +- .../groovy/org/gradle/internal/SpecsTest.groovy | 38 + .../org/gradle/internal/jvm/JdkToolsTest.groovy | 1 - .../groovy/org/gradle/internal/jvm/JvmTest.groovy | 49 +- .../internal/reflect/JavaReflectionUtilTest.groovy | 21 +- .../org/gradle/util/CollectionUtilsTest.groovy | 9 +- .../plugins/MavenConversionIntegrationTest.groovy | 5 +- .../plugins/internal/maven/Maven2Gradle.groovy | 2 +- .../internal/maven/MavenProjectXmlWriter.java | 4 +- .../internal/maven/MavenProjectsCreator.java | 27 +- ...LanguageLibraryProjectInitDescriptorSpec.groovy | 7 +- .../api/plugins/quality/CheckstylePlugin.groovy | 6 +- .../api/plugins/quality/CodeNarcPlugin.groovy | 6 +- .../api/plugins/quality/FindBugsPlugin.groovy | 8 +- .../api/plugins/quality/JDependPlugin.groovy | 10 +- .../gradle/api/plugins/quality/PmdPlugin.groovy | 10 +- .../gradle/NativeServicesIntegrationTest.groovy | 34 + .../ConfigurationOnDemandIntegrationTest.groovy | 16 +- .../ExternalScriptExecutionIntegrationTest.groovy | 2 + .../api/InitScriptExecutionIntegrationTest.groovy | 2 + .../PluginApplicationErrorIntegrationTest.groovy | 2 + .../SettingsScriptExecutionIntegrationTest.groovy | 2 + .../api/dsl/PluginDetectionIntegrationTest.groovy | 2 + .../ClassLoadersCachingIntegrationTest.groovy | 11 +- .../gradle/api/tasks/ArchiveIntegrationTest.groovy | 51 + .../api/tasks/TaskRemovalIntegrationTest.groovy | 4 - .../RuleBasedTaskExecutionIntegrationTest.groovy | 10 +- .../ScriptPluginClassLoadingIntegrationTest.groovy | 2 + .../groovy/org/gradle/BuildExceptionReporter.java | 2 +- .../src/main/groovy/org/gradle/StartParameter.java | 13 +- ...ExtensiblePolymorphicDomainObjectContainer.java | 3 +- .../src/main/groovy/org/gradle/api/Project.java | 26 + .../api/artifacts/ComponentSelectionRules.java | 12 +- .../org/gradle/api/artifacts/Configuration.java | 38 +- .../api/artifacts/DependencySubstitution.java | 22 +- .../api/artifacts/DependencySubstitutions.java | 169 +--- .../api/artifacts/FileCollectionDependency.java | 5 + .../artifacts/ModuleDependencySubstitution.java | 42 - .../artifacts/ProjectDependencySubstitution.java | 31 - .../gradle/api/artifacts/ResolutionStrategy.java | 48 +- .../org/gradle/api/artifacts/ResolveContext.java | 28 + .../org/gradle/api/artifacts/ResolveException.java | 10 +- .../component/LibraryComponentIdentifier.java | 28 + .../component/LibraryComponentSelector.java | 29 + .../internal/InternalTaskExecutionListener.java | 28 + .../api/execution/internal/TaskInputsListener.java | 41 + .../execution/internal/TaskOperationInternal.java | 45 + .../groovy/org/gradle/api/file/FileCollection.java | 2 + .../main/groovy/org/gradle/api/file/FileTree.java | 2 + .../org/gradle/api/internal/AbstractTask.java | 6 +- .../DefaultPolymorphicDomainObjectContainer.java | 69 +- .../DefaultPolymorphicNamedEntityInstantiator.java | 91 ++ ...lePolymorphicDomainObjectContainerInternal.java | 23 + .../NoFactoryRegisteredForTypeException.java | 20 + .../PolymorphicNamedEntityInstantiator.java | 26 + .../org/gradle/api/internal/TaskInternal.java | 2 - .../artifacts/DependencySubstitutionInternal.java | 3 +- .../ModuleDependencySubstitutionInternal.java | 25 - .../ProjectDependencySubstitutionInternal.java | 23 - .../dependencies/DefaultProjectDependency.java | 2 +- .../DefaultSelfResolvingDependency.java | 15 +- .../api/internal/file/AbstractFileCollection.java | 22 +- .../api/internal/file/AbstractFileResolver.java | 13 +- .../gradle/api/internal/file/AbstractFileTree.java | 13 +- .../AntFileCollectionMatchingTaskBuilder.groovy | 42 - .../file/AntFileCollectionMatchingTaskBuilder.java | 74 ++ .../api/internal/file/CompositeFileCollection.java | 10 +- .../api/internal/file/CompositeFileTree.java | 11 +- .../internal/file/DefaultCompositeFileTree.java | 9 +- .../api/internal/file/DefaultFileOperations.java | 19 +- .../internal/file/DefaultSourceDirectorySet.java | 6 +- .../api/internal/file/FileCollectionInternal.java | 37 + .../gradle/api/internal/file/FileOperations.java | 4 +- .../org/gradle/api/internal/file/FileResolver.java | 9 +- .../gradle/api/internal/file/FileSystemSubset.java | 152 +++ .../gradle/api/internal/file/FileTreeInternal.java | 22 + .../api/internal/file/ImmutableDirectoryTree.java | 85 ++ .../api/internal/file/ImmutablePatternSet.java | 103 ++ .../internal/file/MaybeCompressedFileResource.java | 21 +- .../gradle/api/internal/file/UnionFileTree.java | 19 +- .../api/internal/file/archive/TarFileTree.java | 19 +- .../api/internal/file/archive/ZipFileTree.java | 14 +- .../file/archive/compression/Bzip2Archiver.java | 2 +- .../compression/CompressedReadableResource.java | 22 + .../file/archive/compression/GzipArchiver.java | 2 +- ...pendenciesOnlyFileCollectionResolveContext.java | 6 +- .../DefaultFileCollectionResolveContext.java | 27 +- .../file/collections/DelegatingFileCollection.java | 20 +- .../file/collections/DelegatingFileTree.java | 5 +- .../file/collections/DirectoryFileTree.java | 25 +- .../internal/file/collections/DirectoryTrees.java | 45 + .../internal/file/collections/EmptyFileTree.java | 6 + .../collections/FileBackedDirectoryFileTree.java | 34 + .../internal/file/collections/FileTreeAdapter.java | 12 + .../LazilyInitializedFileCollection.java | 8 +- .../collections/LazilyInitializedFileTree.java | 8 +- .../api/internal/file/collections/MapFileTree.java | 53 +- .../internal/file/collections/MinimalFileTree.java | 3 + .../ResolvableFileCollectionResolveContext.java | 8 +- .../collections/SingleIncludePatternFileTree.java | 6 + .../file/collections/SingletonFileTree.java | 7 + .../initialization/DefaultScriptHandler.java | 46 +- .../DefaultScriptHandlerFactory.java | 7 +- .../ScriptHandlerClassLoaderFactory.java | 43 - .../initialization/ScriptHandlerFactory.java | 5 +- .../initialization/ScriptHandlerInternal.java | 26 + .../api/internal/project/AbstractProject.java | 67 +- .../internal/resources/DefaultResourceHandler.java | 12 +- .../FileCollectionBackedArchiveTextResource.java | 10 +- ...yRuleAwarePolymorphicDomainObjectContainer.java | 77 ++ ...tRuleAwareNamedDomainObjectFactoryRegistry.java | 64 ++ ...uleAwarePolymorphicNamedEntityInstantiator.java | 58 ++ .../api/internal/rules/ModelMapCreators.java | 74 ++ .../rules/NamedDomainObjectFactoryRegistry.java | 24 + .../RuleAwareNamedDomainObjectFactoryRegistry.java | 25 + .../RuleAwarePolymorphicDomainObjectContainer.java | 36 + ...uleAwarePolymorphicNamedEntityInstantiator.java | 23 + .../api/internal/tasks/DefaultTaskContainer.java | 69 +- .../tasks/DefaultTaskContainerFactory.java | 57 +- .../api/internal/tasks/TaskContainerInternal.java | 2 +- .../api/internal/tasks/TaskStateInternal.java | 8 +- .../SkipEmptySourceFilesTaskExecuter.java | 14 +- .../org/gradle/api/tasks/AntBuilderAware.groovy | 25 - .../org/gradle/api/tasks/AntBuilderAware.java | 24 + .../groovy/org/gradle/api/tasks/GradleBuild.java | 2 +- .../groovy/org/gradle/api/tasks/SourceTask.java | 3 +- .../groovy/org/gradle/api/tasks/TaskState.java | 11 + .../tasks/incremental/IncrementalTaskInputs.java | 5 +- .../org/gradle/api/tasks/util/PatternSet.java | 51 +- .../configuration/DefaultScriptPluginFactory.java | 7 +- .../execution/CancellableOperationManager.java | 29 + .../DefaultCancellableOperationManager.java | 70 ++ .../PassThruCancellableOperationManager.java | 33 + .../taskgraph/AbstractTaskPlanExecutor.java | 33 +- .../taskgraph/DefaultTaskGraphExecuter.java | 70 +- .../taskgraph/DefaultTaskPlanExecutor.java | 8 +- .../taskgraph/ParallelTaskPlanExecutor.java | 14 +- .../execution/taskgraph/TaskPlanExecutor.java | 11 +- .../org/gradle/groovy/scripts/DefaultScript.java | 48 +- .../initialization/BuildCancellationToken.java | 4 + .../gradle/initialization/BuildRequestContext.java | 12 + .../DefaultBuildCancellationToken.java | 3 +- .../initialization/DefaultBuildRequestContext.java | 27 +- .../DefaultCommandLineConverter.java | 8 + .../initialization/DefaultGradleLauncher.java | 133 ++- .../DefaultGradleLauncherFactory.java | 51 +- .../FixedBuildCancellationToken.java | 33 - .../org/gradle/initialization/GradleLauncher.java | 9 +- .../gradle/initialization/ReportedException.java | 25 + .../buildsrc/BuildSrcUpdateFactory.java | 4 +- .../filewatch/DefaultFileSystemChangeWaiter.java | 138 +++ .../filewatch/DefaultFileWatcherFactory.java | 72 ++ .../internal/filewatch/FileSystemChangeWaiter.java | 24 + .../org/gradle/internal/filewatch/FileWatcher.java | 37 + .../internal/filewatch/FileWatcherEvent.java | 70 ++ .../internal/filewatch/FileWatcherFactory.java | 40 + .../internal/filewatch/FileWatcherListener.java | 21 + .../filewatch/jdk7/Jdk7FileWatcherFactory.java | 51 + .../jdk7/WatchServiceFileWatcherBacking.java | 153 +++ .../filewatch/jdk7/WatchServicePoller.java | 84 ++ .../filewatch/jdk7/WatchServiceRegistrar.java | 158 +++ .../internal/progress/BuildOperationExecutor.java | 47 + .../internal/progress/BuildOperationInternal.java | 43 + .../internal/progress/BuildOperationType.java | 45 + .../progress/DefaultBuildOperationExecutor.java | 79 ++ .../internal/progress/InternalBuildListener.java | 24 + .../internal/progress/OperationIdGenerator.java | 57 ++ .../internal/progress/OperationIdentifier.java | 29 +- .../gradle/internal/progress/OperationResult.java | 44 + .../internal/progress/OperationStartEvent.java | 29 + .../internal/progress/OperationsHierarchy.java | 15 +- .../progress/OperationsHierarchyKeeper.java | 2 +- .../service/scopes/BuildScopeServices.java | 8 + .../service/scopes/GlobalScopeServices.java | 29 +- .../service/scopes/GradleScopeServices.java | 14 +- .../service/scopes/TaskExecutionServices.java | 61 +- .../org/gradle/internal/text/TreeFormatter.java | 2 +- .../groovy/org/gradle/logging/ProgressLogger.java | 4 +- .../internal/ConsoleBackedProgressRenderer.java | 6 +- .../internal/DefaultProgressLoggerFactory.java | 4 +- .../internal/LinePrefixingStyledTextOutput.java | 11 + .../logging/internal/ProgressCompleteEvent.java | 7 +- .../org/gradle/logging/internal/ProgressEvent.java | 7 +- .../internal/ProgressLogEventGenerator.java | 28 +- .../logging/internal/ProgressStartEvent.java | 13 +- .../collection/internal/BridgedCollections.java | 218 ++-- .../DomainObjectContainerModelProjection.java | 137 --- ...cTypesDomainObjectContainerModelProjection.java | 45 - .../internal/PolymorphicModelMapProjection.java | 50 + ...icTypeDomainObjectContainerModelProjection.java | 64 -- .../use/internal/PluginRequestApplicator.java | 4 +- .../gradle/process/internal/DefaultExecHandle.java | 5 +- .../gradle/process/internal/ExecHandleRunner.java | 7 +- .../process/internal/streams/StreamsForwarder.java | 6 +- .../process/internal/streams/StreamsHandler.java | 3 +- .../internal/TestBuildScopeServices.java | 4 +- .../org/gradle/api/file/ProjectCopySpecTest.groovy | 3 +- ...ltPolymorphicNamedEntityInstantiatorTest.groovy | 108 ++ .../org/gradle/api/internal/DefaultTaskTest.groovy | 21 +- .../DefaultProjectDependencyTest.groovy | 25 +- .../DefaultSelfResolvingDependencyTest.java | 16 +- .../internal/file/AbstractFileCollectionTest.java | 2 +- .../internal/file/BaseDirFileResolverSpec.groovy | 10 +- .../internal/file/CompositeFileCollectionTest.java | 18 +- .../api/internal/file/CompositeFileTreeTest.java | 18 +- .../internal/file/DefaultFileOperationsTest.groovy | 4 +- .../file/DelegatingFileCollectionTest.groovy | 28 +- .../api/internal/file/FileSystemSubsetTest.groovy | 138 +++ .../LazilyInitializedFileCollectionTest.groovy | 4 +- .../file/MaybeCompressedFileResourceTest.groovy | 36 +- .../api/internal/file/UnionFileCollectionTest.java | 5 +- .../api/internal/file/UnionFileTreeTest.java | 3 +- .../internal/file/archive/TarCopyActionTest.java | 2 +- .../api/internal/file/archive/TarFileTreeTest.java | 16 +- .../DefaultConfigurableFileCollectionTest.java | 5 +- .../DefaultFileCollectionResolveContextTest.groovy | 871 ++++++++-------- .../file/collections/FileTreeAdapterTest.groovy | 4 +- .../internal/file/collections/MapFileTreeTest.java | 26 +- .../file/copy/DefaultCopySpecResolutionTest.groovy | 6 +- .../DefaultScriptHandlerFactoryTest.groovy | 93 -- .../initialization/DefaultScriptHandlerTest.groovy | 56 +- .../DefaultObjectConfigurationActionTest.groovy | 4 +- .../internal/plugins/ExtensionContainerTest.groovy | 8 +- .../AnnotationProcessingTaskFactoryTest.java | 118 +-- ...warePolymorphicDomainObjectContainerTest.groovy | 75 ++ ...wareNamedDomainObjectFactoryRegistryTest.groovy | 51 + ...rePolymorphicNamedEntityInstantiatorTest.groovy | 49 + ...warePolymorphicDomainObjectContainerTest.groovy | 66 ++ .../internal/tasks/DefaultTaskInputsTest.groovy | 6 +- .../SkipEmptySourceFilesTaskExecuterTest.groovy | 11 +- .../org/gradle/api/tasks/GradleBuildTest.groovy | 17 +- .../gradle/api/tasks/util/PatternSetTest.groovy | 89 +- .../internal/AbstractFileLockManagerTest.groovy | 2 + .../cache/internal/DefaultCacheFactoryTest.groovy | 25 +- .../DefaultPersistentDirectoryCacheSpec.groovy | 7 +- ...tPersistentDirectoryStoreConcurrencyTest.groovy | 3 + .../btree/BTreePersistentIndexedCacheTest.java | 73 +- .../DefaultInitScriptProcessorTest.groovy | 4 +- .../DefaultScriptPluginFactoryTest.groovy | 3 +- .../DefaultCancellableOperationManagerTest.groovy | 116 +++ .../gradle/execution/TaskNameResolverTest.groovy | 24 +- .../taskgraph/DefaultTaskGraphExecuterSpec.groovy | 215 +++- .../taskgraph/DefaultTaskGraphExecuterTest.java | 77 +- .../taskgraph/DefaultTaskPlanExecutorTest.groovy | 21 +- .../taskgraph/TaskPlanExecutorFactoryTest.groovy | 3 +- .../CommandLineConverterTestSupport.java | 103 ++ .../DefaultBuildCancellationTokenSpec.groovy | 14 +- .../DefaultCommandLineConverterTest.groovy | 445 -------- .../DefaultCommandLineConverterTest.java | 362 +++++++ .../DefaultGradleLauncherFactoryTest.groovy | 2 +- .../initialization/DefaultGradleLauncherTest.java | 80 +- .../ParallelOptionsCommandLineConverterTest.groovy | 55 + .../DefaultFileSystemChangeWaiterTest.groovy | 173 ++++ .../DefaultFileWatcherFactoryNonJava7Test.groovy | 33 + .../filewatch/DefaultFileWatcherFactoryTest.groovy | 261 +++++ .../jdk7/WatchServiceFileWatcherBackingTest.groovy | 64 ++ .../DefaultBuildOperationExecutorTest.groovy | 214 ++++ .../progress/OperationsHierarchyKeeperTest.groovy | 4 +- .../progress/OperationsHierarchyTest.groovy | 16 +- .../service/scopes/GradleScopeServicesTest.groovy | 12 +- .../scopes/TaskExecutionServicesTest.groovy | 3 +- .../LinePrefixingStyledTextOutputTest.groovy | 135 +++ .../logging/internal/OutputSpecification.groovy | 17 +- .../internal/ProgressLogEventGeneratorTest.groovy | 34 + .../process/internal/DefaultExecHandleSpec.groovy | 5 +- .../internal/DefaultWorkerProcessTest.groovy | 2 + .../org/gradle/api/tasks/AbstractTaskTest.java | 7 + .../dependency-management.gradle | 47 +- .../ArtifactDependenciesIntegrationTest.groovy | 3 + .../ComponentReplacementIntegrationTest.groovy | 26 +- .../ConfigurationDefaultsIntegrationTest.groovy | 127 +++ .../DependencyExcludeResolveIntegrationTest.groovy | 3 + ...ependencyResolutionEventsIntegrationTest.groovy | 2 + .../DependencyResolveRulesIntegrationTest.groovy | 7 +- ...pendencySubstitutionRulesIntegrationTest.groovy | 722 +++++++------ .../DetachedConfigurationsIntegrationTest.groovy | 3 + .../ExtendingConfigurationsIntegrationTest.groovy | 3 + .../MetadataArtifactResolveTestFixture.groovy | 29 +- .../ProjectDependenciesIntegrationTest.groovy | 3 + .../ProjectDependencyResolveIntegrationTest.groovy | 144 ++- .../PublishAndResolveIntegrationTest.groovy | 183 ++++ .../ResolutionResultApiIntegrationTest.groovy | 3 + .../ResolvedConfigurationIntegrationTest.groovy | 3 + .../UnsupportedConfigurationMutationTest.groovy | 270 ++++- ...rDependencyExcludeResolveIntegrationTest.groovy | 42 +- .../ivy/IvyHttpsRepoResolveIntegrationTest.groovy | 2 + ...yModuleArtifactResolutionIntegrationTest.groovy | 2 +- .../MavenHttpsRepoResolveIntegrationTest.groovy | 2 + ...nModuleArtifactResolutionIntegrationTest.groovy | 2 +- .../artifacts/ArtifactDependencyResolver.java | 9 +- .../internal/artifacts/ConfigurationResolver.java | 3 +- .../DefaultDependencyManagementServices.java | 5 +- .../artifacts/DefaultResolvedArtifact.java | 8 +- .../DependencyManagementBuildScopeServices.java | 6 +- .../DependencyManagementGlobalScopeServices.java | 7 +- .../internal/artifacts/ResolveContextInternal.java | 31 + .../api/internal/artifacts/ResolverResults.java | 70 +- .../configurations/ConfigurationInternal.java | 17 +- .../configurations/DefaultConfiguration.java | 391 +++++-- .../DefaultConfigurationContainer.java | 9 +- .../configurations/MutationValidator.java | 14 +- .../configurations/ResolutionStrategyInternal.java | 22 +- .../dsl/ComponentModuleMetadataContainer.java | 4 +- .../dsl/DefaultComponentMetadataHandler.java | 4 +- .../ivyservice/AbstractDependencySubstitution.java | 73 -- .../CacheLockingArtifactDependencyResolver.java | 21 +- .../ivyservice/DefaultConfigurationResolver.java | 9 +- .../DefaultDependencyResolveDetails.java | 95 -- .../ivyservice/DefaultIvyDependencyPublisher.java | 2 +- .../ivyservice/DefaultLenientConfiguration.java | 45 +- .../DefaultModuleDependencySubstitution.java | 50 - .../DefaultProjectDependencySubstitution.java | 28 - .../ivyservice/DependencySubstitutionResolver.java | 61 -- .../ErrorHandlingArtifactDependencyResolver.java | 93 +- .../ivyservice/IvyBackedArtifactPublisher.java | 17 +- .../ivyservice/IvyModuleDescriptorWriter.java | 3 + .../api/internal/artifacts/ivyservice/IvyUtil.java | 28 +- .../ivyservice/IvyXmlModuleDescriptorWriter.java | 59 +- .../ivyservice/LocalComponentFactory.java | 10 +- .../SelfResolvingDependencyResolver.java | 19 +- ...cuitEmptyConfigsArtifactDependencyResolver.java | 31 +- .../clientmodule/ClientModuleResolver.java | 24 +- .../DefaultDependencyResolveDetails.java | 95 ++ .../DefaultDependencySubstitution.java | 81 ++ .../DefaultDependencySubstitutions.java | 196 ++++ .../DependencySubstitutionResolver.java | 52 + .../DependencySubstitutionsInternal.java | 35 + .../ModuleSelectorStringNotationConverter.java | 61 ++ .../UnversionedModuleComponentSelector.java | 62 ++ .../BaseModuleComponentRepositoryAccess.java | 4 +- ...cheLockReleasingModuleComponentsRepository.java | 7 +- .../CachingModuleComponentRepository.java | 19 +- .../ivyresolve/ComponentMetaDataResolveState.java | 10 +- .../DefaultVersionedComponentChooser.java | 6 +- .../ivyresolve/DynamicVersionResolver.java | 10 +- .../ErrorHandlingModuleComponentRepository.java | 4 +- ...amicResolveModuleComponentRepositoryAccess.java | 7 +- .../ivyresolve/LocalModuleComponentRepository.java | 8 +- .../ivyresolve/ModuleComponentRepository.java | 3 - .../ModuleComponentRepositoryAccess.java | 7 +- .../ivyresolve/NoRepositoriesResolver.java | 9 +- .../ivyservice/ivyresolve/RepositoryChain.java | 5 +- .../ivyresolve/RepositoryChainAdapter.java | 71 -- .../RepositoryChainComponentMetaDataResolver.java | 145 +++ .../RepositoryChainDependencyResolver.java | 143 --- ...sitoryChainDependencyToComponentIdResolver.java | 52 + .../ivyservice/ivyresolve/ResolveIvyFactory.java | 33 +- .../StartParameterResolutionOverride.java | 2 +- .../ivyservice/ivyresolve/UserResolverChain.java | 30 +- .../ivyresolve/VersionedComponentChooser.java | 4 +- .../InMemoryCachedModuleComponentRepository.java | 5 +- .../ivyresolve/parser/DescriptorParseContext.java | 4 +- .../parser/DisconnectedDescriptorParseContext.java | 4 +- .../parser/GradlePomModuleDescriptorParser.java | 12 +- .../parser/IvyXmlModuleDescriptorParser.java | 8 +- .../CachedModuleDescriptorParseContext.java | 6 +- .../moduleconverter/ComponentConverterSource.java | 39 + .../CompositeResolveLocalComponentFactory.java | 50 + .../DefaultConfigurationsToArtifactsConverter.java | 27 +- ...tConfigurationsToModuleDescriptorConverter.java | 8 +- .../ResolveLocalComponentFactory.java | 39 +- .../AbstractIvyDependencyDescriptorFactory.java | 60 +- ...ultDependenciesToModuleDescriptorConverter.java | 2 +- .../DefaultDependencyDescriptorFactory.java | 5 +- .../dependencies/DependencyDescriptorFactory.java | 3 +- ...ternalModuleIvyDependencyDescriptorFactory.java | 43 +- .../IvyDependencyDescriptorFactory.java | 3 +- .../ProjectIvyDependencyDescriptorFactory.java | 36 +- .../DefaultProjectComponentRegistry.java | 8 +- .../projectmodule/ProjectArtifactResolver.java | 20 +- .../projectmodule/ProjectDependencyResolver.java | 52 +- .../resolutionstrategy/DefaultCachePolicy.java | 2 +- .../DefaultComponentSelectionRules.java | 6 +- .../DefaultDependencySubstitutions.java | 267 ----- .../DefaultResolutionStrategy.java | 30 +- .../DependencySubstitutionsInternal.java | 34 - .../ModuleForcingResolveRule.java | 12 +- .../resolveengine/DefaultDependencyResolver.java | 68 +- .../DefaultDependencyToConfigurationResolver.java | 33 +- .../DefaultModuleResolutionFilter.java | 190 +++- .../resolveengine/ModuleResolutionFilter.java | 13 +- .../resolveengine/graph/AbstractArtifactSet.java | 102 ++ .../resolveengine/graph/ArtifactSet.java | 28 + .../graph/ConfigurationArtifactSet.java | 53 + .../resolveengine/graph/DependencyArtifactSet.java | 48 + .../graph/DependencyGraphBuilder.java | 91 +- .../ResolutionResultDependencyGraphVisitor.java | 2 +- ...esolvedConfigurationDependencyGraphVisitor.java | 64 +- ...lvedProjectConfigurationResultGraphVisitor.java | 4 +- .../oldresult/DefaultResolvedArtifactResults.java | 71 ++ .../oldresult/DefaultResolvedArtifactsBuilder.java | 33 + .../DefaultResolvedConfigurationBuilder.java | 83 +- .../oldresult/DefaultResolvedGraphResults.java | 51 + .../oldresult/ResolvedArtifactResults.java | 29 + .../oldresult/ResolvedArtifactsBuilder.java | 26 + .../oldresult/ResolvedConfigurationBuilder.java | 14 +- .../oldresult/ResolvedConfigurationResults.java | 32 - .../oldresult/ResolvedContentsMapping.java | 4 +- .../oldresult/ResolvedGraphResults.java | 31 + .../TransientConfigurationResultsBuilder.java | 4 +- .../TransientConfigurationResultsLoader.java | 53 + .../DefaultResolvedProjectConfiguration.java | 44 + .../DefaultResolvedProjectConfigurationResult.java | 74 -- ...tResolvedProjectConfigurationResultBuilder.java | 28 +- ...DefaultResolvedProjectConfigurationResults.java | 8 +- .../ResolvedProjectConfiguration.java | 25 + .../ResolvedProjectConfigurationResult.java | 27 - .../ResolvedProjectConfigurationResults.java | 4 +- .../result/ComponentIdentifierSerializer.java | 15 +- .../result/ComponentSelectorSerializer.java | 29 +- .../resolveengine/store/DefaultBinaryStore.java | 4 +- .../DefaultLocalMavenRepositoryLocator.java | 4 +- .../mvnsettings/DefaultMavenSettingsProvider.java | 4 +- .../mvnsettings/MavenSettingsProvider.java | 4 +- .../query/DefaultArtifactResolutionQuery.java | 28 +- .../resolver/ExternalResourceResolver.java | 38 +- ...rnalResourceResolverDescriptorParseContext.java | 18 +- .../repositories/resolver/IvyResolver.java | 15 +- .../repositories/resolver/MavenResolver.java | 20 +- .../DependencyClassPathNotationConverter.java | 4 +- .../ModuleIdentiferNotationConverter.java | 64 -- .../ModuleIdentifierNotationConverter.java | 67 ++ .../AbstractModuleComponentResolveMetaData.java | 32 +- .../model/BuildableIvyModulePublishMetaData.java | 12 + .../model/BuildableIvyModuleResolveMetaData.java | 2 +- .../model/DefaultIvyModulePublishMetaData.java | 98 +- .../model/DefaultIvyModuleResolveMetaData.java | 9 +- .../model/DefaultMavenModuleResolveMetaData.java | 7 +- .../DefaultModuleComponentArtifactIdentifier.java | 5 - .../DefaultModuleComponentArtifactMetaData.java | 12 - .../external/model/IvyModulePublishMetaData.java | 6 + .../model/ModuleComponentArtifactMetaData.java | 6 - .../model/ModuleComponentResolveMetaData.java | 15 +- .../model/DefaultLibraryComponentIdentifier.java | 74 ++ .../model/DefaultLibraryComponentSelector.java | 83 ++ .../model/DefaultLocalArtifactIdentifier.java | 72 -- .../local/model/DefaultLocalComponentMetaData.java | 288 ++++-- .../model/DslOriginDependencyMetaDataWrapper.java | 30 +- .../local/model/LocalArtifactMetaData.java | 25 - .../model/LocalComponentArtifactIdentifier.java | 25 + .../local/model/LocalComponentMetaData.java | 4 - .../local/model/LocalConfigurationMetaData.java | 28 + .../local/model/MissingLocalArtifactMetaData.java | 84 ++ .../local/model/MutableLocalComponentMetaData.java | 11 +- .../PublishArtifactLocalArtifactMetaData.java | 106 ++ .../AbstractModuleDescriptorBackedMetaData.java | 19 +- .../component/model/ComponentOverrideMetadata.java | 40 + .../component/model/ComponentResolveMetaData.java | 28 +- .../component/model/ConfigurationMetaData.java | 11 + .../model/DefaultComponentOverrideMetadata.java | 75 ++ .../component/model/DefaultDependencyMetaData.java | 38 +- .../component/model/DefaultIvyArtifactName.java | 27 +- .../component/model/DependencyMetaData.java | 31 +- .../model/LocalComponentDependencyMetaData.java | 156 +++ .../model/ModuleComponentArtifactsMetaData.java | 20 + .../resolver/ComponentMetaDataResolver.java | 4 +- .../resolver/DependencyToComponentResolver.java | 29 - .../resolver/ModuleToComponentResolver.java | 30 - .../ResolveContextToComponentResolver.java | 27 + .../result/BuildableComponentResolveResult.java | 4 +- .../DefaultBuildableComponentResolveResult.java | 7 +- .../artifacts/DefaultResolvedArtifactTest.groovy | 8 +- .../artifacts/DefaultResolvedDependencyTest.java | 2 +- .../internal/artifacts/ResolverResultsSpec.groovy | 28 +- .../DefaultConfigurationContainerSpec.groovy | 8 +- .../DefaultConfigurationContainerTest.groovy | 6 +- .../configurations/DefaultConfigurationSpec.groovy | 1068 +++++++++++++++++++- .../configurations/DefaultConfigurationTest.java | 906 ----------------- .../DefaultDependencyResolveDetailsSpec.groovy | 154 --- .../DefaultModuleDependencySubstitutionTest.groovy | 192 ---- ...DefaultProjectDependencySubstitutionTest.groovy | 102 -- .../DependencySubstitutionResolverSpec.groovy | 84 -- ...orHandlingArtifactDependencyResolverTest.groovy | 12 +- .../SelfResolvingDependencyResolverTest.groovy | 12 +- ...ptyConfigsArtifactDependencyResolverSpec.groovy | 1 + .../clientmodule/ClientModuleResolverTest.groovy | 25 +- .../DefaultDependencyResolveDetailsSpec.groovy | 153 +++ .../DefaultDependencySubstitutionSpec.groovy | 85 ++ .../DefaultDependencySubstitutionsSpec.groovy | 245 +++++ .../DependencySubstitutionResolverSpec.groovy | 83 ++ ...oduleSelectorStringNotationConverterTest.groovy | 59 ++ .../CachingModuleComponentRepositoryTest.groovy | 6 +- .../DefaultVersionedComponentChooserTest.groovy | 16 +- ...solveModuleComponentRepositoryAccessTest.groovy | 19 +- .../ivyresolve/RepositoryChainAdapterTest.groovy | 72 -- ...sitoryChainComponentMetaDataResolverTest.groovy | 580 +++++++++++ .../RepositoryChainDependencyResolverTest.groovy | 582 ----------- .../ivyresolve/ResolveIvyFactoryTest.groovy | 11 +- ...emoryCachedModuleComponentRepositoryTest.groovy | 30 +- ...adlePomModuleDescriptorParserProfileTest.groovy | 42 +- .../GradlePomModuleDescriptorParserTest.groovy | 52 +- .../modulecache/ModuleDescriptorStoreTest.groovy | 3 +- ...ltConfigurationsToArtifactsConverterTest.groovy | 66 +- ...figurationsToModuleDescriptorConverterTest.java | 17 +- .../ResolveLocalComponentFactoryTest.groovy | 10 +- ...actDependencyDescriptorFactoryInternalTest.java | 48 +- ...endenciesToModuleDescriptorConverterTest.groovy | 2 +- .../DefaultDependencyDescriptorFactoryTest.groovy | 6 +- ...ernalModuleDependencyDescriptorFactoryTest.java | 21 +- .../ProjectDependencyDescriptorFactoryTest.groovy | 16 +- .../ProjectDependencyResolverTest.groovy | 59 +- .../DefaultCachePolicySpec.groovy | 4 +- .../DefaultComponentSelectionRulesTest.groovy | 2 +- .../DefaultDependencySubstitutionsSpec.groovy | 328 ------ .../DefaultResolutionStrategySpec.groovy | 19 +- .../ModuleForcingResolveRuleSpec.groovy | 13 +- .../DefaultModuleResolutionFilterTest.groovy | 52 +- .../DependencyGraphBuilderTest.groovy | 54 +- .../ComponentIdentifierSerializerTest.groovy | 14 + .../result/ComponentSelectorSerializerTest.groovy | 18 +- .../store/DefaultBinaryStoreTest.groovy | 8 + .../DefaultArtifactResolutionQueryTest.groovy | 14 +- ...DependencyClassPathNotationConverterTest.groovy | 4 +- .../ModuleIdentiferNotationConverterTest.groovy | 52 - .../ModuleIdentifierNotationConverterTest.groovy | 52 + ...stractModuleComponentResolveMetaDataTest.groovy | 33 - .../DefaultIvyModulePublishMetaDataTest.groovy | 60 +- ...faultModuleComponentArtifactMetaDataTest.groovy | 21 +- .../DefaultLibraryComponentIdentifierTest.groovy | 69 ++ .../DefaultLibraryComponentSelectorTest.groovy | 104 ++ .../DefaultLocalArtifactIdentifierTest.groovy | 67 -- .../model/DefaultLocalComponentMetaDataTest.groovy | 185 ++-- .../model/MissingLocalArtifactMetaDataTest.groovy | 75 ++ .../model/DefaultDependencyMetaDataTest.groovy | 4 +- .../model/DefaultIvyArtifactNameTest.groovy | 27 + ...faultBuildableComponentResolveResultTest.groovy | 7 +- .../ComponentReportIntegrationTest.groovy | 15 +- .../model/ModelReportIntegrationTest.groovy | 151 ++- .../model/ModelReportTaskIntegrationTest.groovy | 32 + ...pendencyInsightReportTaskIntegrationTest.groovy | 15 +- .../DependencyReportTaskIntegrationTest.groovy | 53 +- .../api/reporting/components/ComponentReport.java | 6 +- .../components/internal/ComponentRenderer.java | 10 +- .../internal/ComponentReportRenderer.java | 14 +- .../components/internal/SourceSetRenderer.java | 46 +- .../internal/TypeAwareBinaryRenderer.java | 6 + .../gradle/api/reporting/model/ModelReport.java | 24 +- .../model/internal/ModelNodeRenderer.java | 61 ++ .../model/internal/ModelReportRenderer.java | 56 - .../model/internal/TextModelReportRenderer.java | 32 + .../internal/text/DefaultTextReportBuilder.java | 9 +- .../gradle/configuration/TaskDetailPrinter.java | 2 +- .../internal/ComponentRendererTest.groovy | 18 +- .../internal/ComponentReportRendererTest.groovy | 17 +- .../internal/SourceSetRendererTest.groovy | 87 +- .../AbstractComponentReportIntegrationTest.groovy | 5 +- .../ComponentReportOutputFormatter.groovy | 18 +- .../NativeComponentReportIntegrationTest.groovy | 23 + .../NativeComponentReportOutputFormatter.groovy | 45 + .../api/reporting/model/ConsoleReportOutput.groovy | 76 ++ .../gradle/AllDistributionIntegrationSpec.groovy | 4 +- .../gradle/BinDistributionIntegrationSpec.groovy | 2 +- .../org/gradle/DistributionIntegrationSpec.groovy | 2 +- subprojects/docs/docs.gradle | 3 +- .../dsl/org.gradle.api.artifacts.Configuration.xml | 3 + ...radle.api.artifacts.DependencySubstitutions.xml | 34 + ...org.gradle.api.artifacts.ResolutionStrategy.xml | 8 +- ...adle.api.tasks.compile.GroovyCompileOptions.xml | 6 +- .../dsl/org.gradle.language.DependentSourceSet.xml | 44 - ....language.nativeplatform.DependentSourceSet.xml | 47 + ...ge.nativeplatform.HeaderExportingSourceSet.xml} | 0 ...tform.tasks.AbstractNativeSourceCompileTask.xml | 38 + subprojects/docs/src/docs/dsl/plugins.xml | 1 - subprojects/docs/src/docs/release/notes-next.md | 113 --- .../docs/src/docs/release/notes-template.md | 2 +- subprojects/docs/src/docs/release/notes.md | 570 +++++------ .../docs/src/docs/userguide/antlrPlugin.xml | 8 +- .../docs/src/docs/userguide/commandLine.xml | 33 +- .../docs/src/docs/userguide/continuousBuild.xml | 162 +++ .../docs/src/docs/userguide/customTasks.xml | 5 + subprojects/docs/src/docs/userguide/depMngmt.xml | 474 +++++---- .../docs/src/docs/userguide/distributionPlugin.xml | 4 +- .../docs/src/docs/userguide/nativeBinaries.xml | 44 +- subprojects/docs/src/docs/userguide/newModel.xml | 14 +- .../docs/src/docs/userguide/signingPlugin.xml | 30 +- .../docs/src/docs/userguide/sonarRunnerPlugin.xml | 121 ++- subprojects/docs/src/docs/userguide/userguide.xml | 1 + .../docs/src/docs/userguide/workingWithFiles.xml | 4 +- subprojects/docs/src/samples/antlr/build.gradle | 6 +- .../samples/customModel/componentType/build.gradle | 6 +- .../documentation/DocumentationPlugin.groovy | 8 +- .../groovy/sample/markdown/MarkdownPlugin.groovy | 6 +- .../samples/dependency-substitution/build.gradle | 49 + .../dependency-substitution/project1/build.gradle | 3 + .../dependency-substitution/project2/build.gradle | 3 + .../dependency-substitution/project3/build.gradle | 2 + .../repo/org.example/project1/1.0/ivy-1.0.xml | 20 + .../repo/org.example/project2/1.0/ivy-1.0.xml | 20 + .../repo/org.example/project3/1.0/ivy-1.0.xml | 17 + .../dependency-substitution/settings.gradle | 18 + .../modelRules/basicRuleSourcePlugin/build.gradle | 2 +- .../src/samples/modelRules/modelDsl/build.gradle | 2 +- .../native-binaries/google-test/build.gradle | 5 + .../pre-compiled-headers/build.gradle | 59 ++ .../pre-compiled-headers/src/hello/cpp/hello.cpp | 5 + .../pre-compiled-headers/src/hello/headers/hello.h | 13 + .../pre-compiled-headers/src/hello/headers/pch.h | 5 + .../pre-compiled-headers/src/main/cpp/main.cpp | 7 + .../artifacts/defineConfiguration/build.gradle | 10 + .../artifacts/dependency-substitution/build.gradle | 16 + .../artifacts/resolutionStrategy/build.gradle | 16 +- .../userguide/tasks/incrementalTask/build.gradle | 5 + .../basicRuleSourcePlugin-model-task.out | 16 +- .../userguideOutput/nativeComponentReport.out | 4 +- .../main/groovy/org/gradle/plugins/ear/Ear.groovy | 2 +- ...VisualStudioSingleProjectIntegrationTest.groovy | 43 + .../gradle/ide/cdt/model/CprojectSettings.groovy | 6 +- subprojects/ide/ide.gradle | 1 - .../eclipse/AbstractEclipseIntegrationTest.groovy | 177 ++-- .../eclipse/EclipseClasspathIntegrationTest.groovy | 198 +++- ...pseDependencySubstitutionIntegrationTest.groovy | 14 +- .../ide/eclipse/EclipseIntegrationTest.groovy | 116 ++- ...lipseWtpWebAndJavaProjectIntegrationTest.groovy | 4 +- ...deaDependencySubstitutionIntegrationTest.groovy | 15 +- .../plugins/ide/idea/IdeaIntegrationTest.groovy | 23 +- .../ide/idea/IdeaMultiModuleIntegrationTest.groovy | 70 +- .../src/main/java/org/gradle/api/PersonList.java | 4 +- .../expectedFiles/apiClasspath.xml | 13 +- .../expectedFiles/commonClasspath.xml | 21 +- .../expectedFiles/groovyprojectClasspath.xml | 11 +- .../expectedFiles/javabaseprojectClasspath.xml | 2 +- .../expectedFiles/webAppJava6Classpath.xml | 17 +- .../expectedFiles/webAppJava6WtpComponent.xml | 16 + .../expectedFiles/webAppWithVarsClasspath.xml | 8 +- .../expectedFiles/webserviceClasspath.xml | 21 +- .../expectedFiles/webserviceWtpComponent.xml | 4 + .../src/main/java/org/gradle/api/PersonList.java | 4 +- .../canCreateAndDeleteMetaData/master/build.gradle | 96 -- .../webAppJava6/build.gradle | 4 + .../main/java/org/gradle/webservice/TestTest.java | 4 +- .../expectedFiles/api/api.iml.xml | 2 +- .../expectedFiles/webservice/webservice.iml.xml | 20 +- .../expectedFiles/root.iml.xml | 4 +- .../ide/eclipse/model/AbstractLibrary.groovy | 16 + .../ide/eclipse/model/EclipseClasspath.groovy | 24 +- .../ide/eclipse/model/ProjectDependency.groovy | 18 +- .../eclipse/model/internal/ClasspathFactory.groovy | 11 +- .../model/internal/ExportedEntriesUpdater.groovy | 33 - .../model/internal/ProjectDependencyBuilder.groovy | 10 +- .../plugins/ide/idea/model/ModuleDependency.groovy | 2 +- .../plugins/ide/idea/model/ModuleLibrary.groovy | 2 +- .../internal/tooling/BuildInvocationsBuilder.java | 15 +- .../ide/internal/tooling/EclipseModelBuilder.java | 4 +- .../ide/internal/tooling/GradleProjectBuilder.java | 16 +- .../tooling/ToolingModelBuilderSupport.java | 32 + .../eclipse/DefaultEclipseExternalDependency.java | 9 +- .../eclipse/DefaultEclipseProjectDependency.java | 9 +- .../resolver/DefaultIdeDependencyResolver.java | 100 +- .../tooling/model/DefaultBuildInvocations.java | 45 + .../tooling/model/LaunchableGradleProjectTask.java | 32 + .../tooling/model/LaunchableGradleTask.java | 101 ++ .../model/LaunchableGradleTaskSelector.java | 100 ++ .../ide/idea/model/ModuleDependencyTest.groovy | 12 +- .../ide/idea/model/ModuleLibraryTest.groovy | 12 +- subprojects/integ-test/integ-test.gradle | 4 + .../BuildScriptClasspathIntegrationTest.java | 4 +- .../integtests/CustomPluginIntegrationTest.groovy | 2 + .../DistributionLocatorIntegrationTest.groovy | 4 +- ...gacyAndComponentJvmPluginIntegrationTest.groovy | 31 +- .../MixedNativeAndJvmProjectIntegrationTest.groovy | 41 +- .../integtests/ProjectLayoutIntegrationTest.groovy | 8 + ...ssingBinaryCompatibilityCrossVersionSpec.groovy | 3 + .../BuildEnvironmentIntegrationTest.groovy | 8 +- .../AutoTestedSamplesCoreIntegrationTest.groovy | 2 +- .../SamplesCustomPluginIntegrationTest.groovy | 2 + ...lesDependencySubstitutionIntegrationTest.groovy | 63 ++ ...SamplesGroovyMultiProjectIntegrationTest.groovy | 2 + ...mplesMultiProjectBuildSrcIntegrationTest.groovy | 4 +- .../SamplesWebProjectIntegrationTest.groovy | 4 +- .../samples/UserGuideSamplesRunner.groovy | 10 +- .../internal-integ-testing.gradle | 3 + .../fixtures/AbstractIntegrationSpec.groovy | 36 +- .../integtests/fixtures/AvailableJavaHomes.java | 115 +-- .../fixtures/FluidDependenciesResolveRunner.groovy | 62 ++ .../ForkScalaCompileInDaemonModeFixture.groovy | 3 + .../PersistentBuildProcessIntegrationTest.groovy | 38 + .../fixtures/daemon/AbstractDaemonFixture.groovy | 134 +++ .../fixtures/daemon/DaemonContextParser.java | 77 ++ .../integtests/fixtures/daemon/DaemonFixture.java | 54 + .../fixtures/daemon/DaemonIntegrationSpec.groovy | 59 ++ .../fixtures/daemon/DaemonLogFileStateProbe.groovy | 84 ++ .../fixtures/daemon/DaemonLogsAnalyzer.groovy | 81 ++ .../daemon/DaemonRegistryStateProbe.groovy | 40 + .../fixtures/daemon/DaemonStateProbe.java | 21 + .../integtests/fixtures/daemon/DaemonsFixture.java | 41 + .../integtests/fixtures/daemon/LegacyDaemon.groovy | 56 + .../fixtures/daemon/TestableDaemon.groovy | 60 ++ .../fixtures/executer/AbstractGradleExecuter.java | 55 + .../fixtures/executer/DaemonGradleExecuter.java | 6 + .../fixtures/executer/ExecutionResult.java | 6 +- .../fixtures/executer/ForkingGradleExecuter.java | 29 +- .../fixtures/executer/GradleExecuter.java | 22 +- .../integtests/fixtures/executer/GradleHandle.java | 3 +- .../fixtures/executer/GradleVersions.java | 30 + .../fixtures/executer/InProcessGradleExecuter.java | 112 +- .../executer/OutputScrapingExecutionResult.java | 24 +- .../fixtures/jvm/InstalledJvmLocator.java | 20 +- .../versions/ReleasedVersionDistributions.java | 10 + .../test/fixtures/plugin/PluginBuilder.groovy | 4 +- .../server/http/CyclicBarrierHttpServer.java | 27 + .../test/fixtures/server/http/HttpServer.groovy | 7 + .../fixtures/jvm/UbuntuJvmLocatorTest.groovy | 4 +- .../ReleasedVersionDistributionsTest.groovy | 8 + .../test/fixtures/concurrent/BlockTarget.groovy | 2 +- .../test/fixtures/concurrent/ConcurrentSpec.groovy | 2 + .../test/fixtures/concurrent/Instants.groovy | 6 + .../file/AbstractTestDirectoryProvider.java | 66 +- .../test/fixtures/file/LeaksFileHandles.java | 25 + .../test/fixtures/file/TestFileHelper.groovy | 4 +- .../main/groovy/org/gradle/util/RedirectStdIn.java | 53 +- .../main/groovy/org/gradle/util/Requires.groovy | 11 +- .../groovy/org/gradle/util/TestPrecondition.groovy | 10 +- .../gradle/util/TestPreconditionExtension.groovy | 8 +- .../api/publish/ivy/IvyPublishHttpIntegTest.groovy | 4 +- .../publish/ivy/IvyPublishHttpsIntegTest.groovy | 4 + .../ivy/IvyHttpPublishIntegrationTest.groovy | 2 + .../IvySingleProjectPublishIntegrationTest.groovy | 43 + .../publisher/DependencyResolverIvyPublisher.java | 3 +- .../api/publish/ivy/plugins/IvyPublishPlugin.java | 4 +- ...actIvyRemoteLegacyPublishIntegrationTest.groovy | 2 + .../testing/jacoco/plugins/JacocoPlugin.groovy | 12 +- .../coffeescript/CoffeeScriptBasePlugin.groovy | 15 +- .../plugins/javascript/envjs/EnvJsPlugin.groovy | 17 +- .../plugins/javascript/jshint/JsHintPlugin.groovy | 20 +- .../plugins/javascript/rhino/RhinoPlugin.groovy | 8 +- .../internal/tasks/compile/ApiGroovyCompiler.java | 9 +- .../api/tasks/compile/GroovyCompileOptions.java | 30 + .../tasks/compile/GroovyCompileOptionsTest.groovy | 3 +- ...guageDependencyResolutionIntegrationTest.groovy | 85 ++ .../java/JavaLanguageIntegrationTest.groovy | 4 +- .../java/JavaSourceSetIntegrationTest.groovy | 241 +++++ .../internal/DefaultJavaLanguageSourceSet.java | 18 +- .../internal/DefaultJavaLocalComponentFactory.java | 87 ++ .../DefaultJavaSourceSetResolveContext.java | 75 ++ .../internal/ProjectLibraryDependencyResolver.java | 94 ++ .../language/java/plugins/JavaLanguagePlugin.java | 105 +- .../DefaultJavaLanguageSourceSetTest.groovy | 107 ++ .../DefaultJavaLocalComponentFactoryTest.groovy | 142 +++ .../DefaultJavaSourceSetResolveContextTest.groovy | 58 ++ .../language/fixtures/TestJavaComponent.groovy | 5 + .../ResourceOnlyJvmLibraryIntegrationTest.groovy | 34 +- .../compile/daemon/CompilerDaemonStarter.java | 1 + .../jvm/IncrementalTestJvmComponent.groovy | 2 + ...AbstractJvmPluginLanguageIntegrationTest.groovy | 81 +- ...eLanguageIncrementalBuildIntegrationTest.groovy | 10 +- ...anguageIncrementalCompileIntegrationTest.groovy | 8 +- .../AbstractNativeLanguageIntegrationTest.groovy | 2 + ...ctNativePreCompiledHeaderIntegrationTest.groovy | 578 +++++++---- .../DuplicateBaseNamesIntegrationTest.groovy | 4 +- ...yLanguageIncrementalBuildIntegrationTest.groovy | 3 + .../AssemblyLanguageIntegrationTest.groovy | 2 + ...CLanguageIncrementalBuildIntegrationTest.groovy | 2 + .../language/c/CLanguageIntegrationTest.groovy | 4 +- ...CPreCompiledHeaderSourcesIntegrationTest.groovy | 10 +- .../c/CppCallingCLanguageIntegrationTest.groovy | 2 + .../language/c/MixedLanguageIntegrationTest.groovy | 2 + ...pLanguageIncrementalBuildIntegrationTest.groovy | 2 + ...anguageIncrementalCompileIntegrationTest.groovy | 2 + .../language/cpp/CppLanguageIntegrationTest.groovy | 4 +- ...pPreCompiledHeaderSourcesIntegrationTest.groovy | 10 +- .../NativeLanguageSamplesIntegrationTest.groovy | 25 +- ...CLanguageIncrementalBuildIntegrationTest.groovy | 2 +- ...CPreCompiledHeaderSourcesIntegrationTest.groovy | 8 +- .../ObjectiveCUnsupportedIntegrationTest.groovy | 4 +- ...pPreCompiledHeaderSourcesIntegrationTest.groovy | 8 +- .../ObjectiveCppUnsupportedIntegrationTest.groovy | 2 + ...ResourcesIncrementalBuildIntegrationTest.groovy | 2 + .../rc/WindowsResourcesIntegrationTest.groovy | 2 + .../gradle/language/c/plugins/CLangPCHPlugin.java | 58 -- .../org/gradle/language/c/plugins/CLangPlugin.java | 13 +- .../org/gradle/language/c/plugins/CPlugin.java | 1 - .../java/org/gradle/language/c/tasks/CCompile.java | 4 +- .../language/cpp/plugins/CppLangPCHPlugin.java | 59 -- .../gradle/language/cpp/plugins/CppLangPlugin.java | 13 +- .../org/gradle/language/cpp/plugins/CppPlugin.java | 1 - .../org/gradle/language/cpp/tasks/CppCompile.java | 4 +- .../AbstractHeaderExportingDependentSourceSet.java | 15 +- .../internal/AbstractNativeCompileSpec.java | 11 +- .../nativeplatform/internal/CompileTaskConfig.java | 39 +- .../internal/PCHCompileTaskConfig.java | 27 +- .../internal/SourceCompileTaskConfig.java | 57 ++ .../internal/incremental/CompilationFileState.java | 1 + .../incremental/CompilationStateSerializer.java | 39 +- .../incremental/DefaultIncrementalCompilation.java | 11 +- .../incremental/DefaultSourceIncludes.java | 81 -- .../incremental/DefaultSourceIncludesParser.java | 13 +- .../incremental/DefaultSourceIncludesResolver.java | 9 +- .../incremental/IncrementalCompilation.java | 5 - .../incremental/IncrementalCompileProcessor.java | 11 +- .../incremental/IncrementalNativeCompiler.java | 19 +- .../incremental/sourceparser/CSourceParser.java | 9 +- .../incremental/sourceparser/DefaultInclude.java | 104 ++ .../sourceparser/DefaultSourceIncludes.java | 97 ++ .../sourceparser/RegexBackedCSourceParser.java | 35 +- .../tasks/AbstractNativeCompileTask.java | 50 +- .../tasks/AbstractNativeSourceCompileTask.java | 63 ++ .../plugins/ObjectiveCLangPCHPlugin.java | 58 -- .../objectivec/plugins/ObjectiveCLangPlugin.java | 13 +- .../objectivec/plugins/ObjectiveCPlugin.java | 1 - .../objectivec/tasks/ObjectiveCCompile.java | 4 +- .../plugins/ObjectiveCppLangPCHPlugin.java | 58 -- .../plugins/ObjectiveCppLangPlugin.java | 12 +- .../objectivecpp/plugins/ObjectiveCppPlugin.java | 1 - .../objectivecpp/tasks/ObjectiveCppCompile.java | 4 +- .../AbstractNativeComponentPluginTest.groovy | 20 +- .../assembler/plugins/AssemblerPluginTest.groovy | 14 +- .../gradle/language/c/tasks/CCompileTest.groovy | 16 +- .../c/tasks/CPreCompiledHeaderCompileTest.groovy | 72 ++ .../language/cpp/tasks/CppCompileTest.groovy | 11 + .../tasks/CppPreCompiledHeaderCompileTest.groovy | 72 ++ .../CompilationStateSerializerTest.groovy | 10 +- .../DefaultSourceIncludesParserTest.groovy | 34 +- .../DefaultSourceIncludesResolverTest.groovy | 10 +- .../IncrementalCompileProcessorTest.groovy | 1 + .../sourceparser/DefaultIncludeTest.groovy | 43 + .../sourceparser/DefaultSourceIncludesTest.groovy | 44 + .../RegexBackedCSourceParserTest.groovy | 77 +- .../objectivec/tasks/ObjectiveCCompileTest.groovy | 83 ++ .../ObjectiveCPreCompiledHeaderCompileTest.groovy | 72 ++ .../tasks/ObjectiveCppCompileTest.groovy | 83 ++ ...ObjectiveCppPreCompiledHeaderCompileTest.groovy | 72 ++ .../org/gradle/language/scala/ScalaPlatform.java | 2 + .../scala/fixtures/TestScalaComponent.groovy | 5 + subprojects/launcher/launcher.gradle | 6 +- .../GradleConfigurabilityIntegrationSpec.groovy | 4 +- .../AbstractContinuousIntegrationTest.groovy | 206 ++++ .../ArchivesContinuousIntegrationTest.groovy | 147 +++ .../BuildSrcContinuousIntegrationTest.groovy | 60 ++ .../CancellationContinuousIntegrationTest.groovy | 89 ++ .../Java7RequiringContinuousIntegrationTest.groovy | 24 + .../JdkVersionsContinuousIntegrationTest.groovy | 84 ++ .../MultiProjectContinuousIntegrationTest.groovy | 160 +++ .../SimpleJavaContinuousIntegrationTest.groovy | 267 +++++ .../SmokeContinuousIntegrationTest.groovy | 308 ++++++ .../jdk7/SymlinkContinuousIntegrationTest.groovy | 112 ++ .../daemon/DaemonFeedbackIntegrationSpec.groovy | 19 +- .../DaemonHealthLoggingIntegrationTest.groovy | 6 +- .../DaemonInitScriptHandlingIntegrationTest.groovy | 1 + ...itialCommunicationFailureIntegrationSpec.groovy | 1 + .../launcher/daemon/DaemonIntegrationSpec.groovy | 58 -- .../launcher/daemon/DaemonLifecycleSpec.groovy | 5 +- .../DaemonNativeServicesIntegrationTest.groovy | 34 - .../DaemonOutputToggleIntegrationTest.groovy | 1 + ...emonPerformanceMonitoringIntegrationTest.groovy | 7 +- .../daemon/DaemonReuseIntegrationTest.groovy | 2 + .../DaemonStartupMessageIntegrationTest.groovy | 8 +- .../DaemonSystemPropertiesIntegrationTest.groovy | 1 + .../daemon/DispachingFailureIntegrationSpec.groovy | 2 + .../launcher/daemon/IsolatedDaemonSpec.groovy | 4 +- .../LocaleSupportDaemonIntegrationTest.groovy | 1 + .../ProcessCrashHandlingIntegrationTest.groovy | 1 + .../daemon/SingleUseDaemonIntegrationTest.groovy | 2 +- .../daemon/StoppingDaemonIntegrationSpec.groovy | 1 + .../gradle/launcher/cli/BuildActionsFactory.java | 98 +- .../launcher/cli/CommandLineActionFactory.java | 2 +- .../launcher/cli/ExceptionReportingAction.java | 2 +- .../java/org/gradle/launcher/cli/Parameters.java | 54 + .../gradle/launcher/cli/ParametersConverter.java | 94 ++ .../org/gradle/launcher/cli/RunBuildAction.java | 2 +- .../cli/converter/DaemonCommandLineConverter.java | 10 + .../launcher/daemon/bootstrap/DaemonMain.java | 44 +- .../daemon/bootstrap/DaemonOutputConsumer.java | 43 +- .../launcher/daemon/client/DaemonClient.java | 4 +- .../daemon/client/DaemonClientServices.java | 8 +- .../daemon/client/DaemonClientServicesSupport.java | 1 - .../daemon/client/DefaultDaemonStarter.java | 56 +- .../client/EmbeddedDaemonClientServices.java | 22 +- .../daemon/client/JvmVersionValidator.java | 23 +- .../daemon/configuration/DaemonParameters.java | 35 +- .../launcher/daemon/server/DaemonServices.java | 39 +- .../daemon/server/DaemonStateCoordinator.java | 4 +- .../launcher/daemon/server/api/HandleStop.java | 36 + .../server/exec/DefaultDaemonCommandExecuter.java | 32 +- .../launcher/daemon/server/exec/ExecuteBuild.java | 2 +- .../server/exec/StopHandlingCommandExecuter.java | 45 - .../launcher/exec/BuildActionParameters.java | 4 + .../org/gradle/launcher/exec/BuildExecuter.java | 24 + .../exec/ContinuousBuildActionExecuter.java | 167 +++ .../exec/DefaultBuildActionParameters.java | 18 +- .../exec/InProcessBuildActionExecuter.java | 22 +- .../gradle/launcher/exec/ReportedException.java | 25 - .../internal/impl/DefaultBuildInvocations.java | 45 - .../internal/impl/LaunchableGradleProjectTask.java | 32 - .../internal/impl/LaunchableGradleTask.java | 91 -- .../impl/LaunchableGradleTaskSelector.java | 100 -- .../provider/BuildClientSubscriptions.java | 52 + .../internal/provider/BuildModelAction.java | 10 +- .../provider/ClientProvidedBuildAction.java | 10 +- .../internal/provider/ConnectionScopeServices.java | 4 +- .../provider/DaemonBuildActionExecuter.java | 27 +- .../internal/provider/DefaultConnection.java | 23 +- .../provider/InternalCancellationTokenAdapter.java | 7 +- .../internal/provider/LauncherServices.java | 26 +- .../internal/provider/ProviderConnection.java | 66 +- .../provider/events/AbstractOperationResult.java | 25 + .../provider/events/AbstractProgressEvent.java | 39 + .../internal/provider/events/AbstractResult.java | 48 + .../provider/events/AbstractTaskResult.java | 25 + .../provider/events/AbstractTestProgressEvent.java | 39 - .../provider/events/AbstractTestResult.java | 29 +- .../provider/events/DefaultFailureResult.java | 35 + .../events/DefaultOperationDescriptor.java | 55 + .../DefaultOperationFinishedProgressEvent.java | 38 + .../DefaultOperationStartedProgressEvent.java | 30 + .../provider/events/DefaultSuccessResult.java | 24 + .../provider/events/DefaultTaskDescriptor.java | 62 ++ .../provider/events/DefaultTaskFailureResult.java | 35 + .../events/DefaultTaskFinishedProgressEvent.java | 38 + .../provider/events/DefaultTaskSkippedResult.java | 33 + .../events/DefaultTaskStartedProgressEvent.java | 30 + .../provider/events/DefaultTaskSuccessResult.java | 33 + .../provider/events/DefaultTestDescriptor.java | 3 +- .../provider/events/DefaultTestFailureResult.java | 7 +- .../events/DefaultTestFinishedProgressEvent.java | 3 +- .../provider/events/DefaultTestSkippedResult.java | 7 +- .../events/DefaultTestStartedProgressEvent.java | 3 +- .../provider/events/DefaultTestSuccessResult.java | 7 +- .../launcher/cli/BuildActionsFactoryTest.groovy | 7 +- .../cli/ExceptionReportingActionTest.groovy | 2 +- .../gradle/launcher/cli/RunBuildActionTest.groovy | 4 +- .../bootstrap/DaemonOutputConsumerTest.groovy | 61 +- .../daemon/client/DaemonCancelForwarderTest.groovy | 6 +- .../DaemonServerExceptionHandlingTest.groovy | 6 +- .../exec/ContinuousBuildActionExecuterTest.groovy | 225 +++++ .../exec/DefaultBuildActionParametersTest.groovy | 2 +- .../exec/InProcessBuildActionExecuterTest.groovy | 54 +- .../internal/provider/ClasspathInfererTest.groovy | 2 + .../provider/DaemonBuildActionExecuterTest.groovy | 4 +- .../daemon/testing/AbstractDaemonFixture.groovy | 102 -- .../daemon/testing/DaemonContextParser.java | 77 -- .../launcher/daemon/testing/DaemonFixture.java | 54 - .../daemon/testing/DaemonLogFileStateProbe.groovy | 84 -- .../daemon/testing/DaemonLogsAnalyzer.groovy | 81 -- .../daemon/testing/DaemonRegistryStateProbe.groovy | 40 - .../launcher/daemon/testing/DaemonStateProbe.java | 21 - .../launcher/daemon/testing/DaemonsFixture.java | 41 - .../launcher/daemon/testing/LegacyDaemon.groovy | 57 -- .../launcher/daemon/testing/TestableDaemon.groovy | 61 -- subprojects/maven/maven.gradle | 2 +- .../maven/MavenPublishBasicIntegTest.groovy | 3 + .../publish/maven/MavenPublishHttpIntegTest.groovy | 154 ++- .../maven/MavenPublishHttpsIntegTest.groovy | 6 +- .../maven/MavenPublishIntegrationTest.groovy | 3 + ...MavenPublishNonUniqueSnapshotVersionTest.groovy | 53 + .../action/AbstractMavenPublishAction.java | 206 ++-- .../action/LoggingMavenTransferListener.java | 36 +- .../maven/internal/action/MavenDeployAction.java | 88 +- .../maven/internal/action/MavenInstallAction.java | 26 +- .../internal/action/MavenWagonDeployAction.java | 7 +- .../maven/internal/action/ParsedMavenPom.java | 64 -- .../internal/action/SnapshotVersionManager.java | 87 ++ .../internal/deployer/AbstractMavenResolver.java | 3 +- .../maven/internal/pom/DefaultMavenPom.java | 22 +- .../pom/DefaultPomDependenciesConverter.java | 5 +- .../maven/internal/pom/PlexusLoggerAdapter.java | 4 + .../wagon/RepositoryTransportDeployWagon.java | 11 +- .../maven/internal/wagon/WagonRegistry.java | 45 - .../internal/publisher/MavenRemotePublisher.java | 8 +- .../publisher/ValidatingMavenPublisher.java | 6 +- .../internal/tasks/MavenPomFileGenerator.java | 10 +- .../publish/maven/plugins/MavenPublishPlugin.java | 10 +- .../RepositoryTransportDeployWagonTest.groovy | 2 +- .../publisher/ValidatingMavenPublisherTest.groovy | 2 +- subprojects/model-core/model-core.gradle | 5 +- .../model/ConfigurationCycleIntegrationTest.groovy | 105 +- .../gradle/model/ModelReuseIntegrationTest.groovy | 53 +- .../ModelRuleBindingFailureIntegrationTest.groovy | 20 +- ...odelRuleBindingValidationIntegrationTest.groovy | 5 +- .../model/ModelRuleCachingIntegrationTest.groovy | 10 +- .../ModelRuleValidationIntegrationTest.groovy | 4 - ...ationRuleApplicationOrderIntegrationTest.groovy | 77 +- .../model/PluginRuleSourceIntegrationTest.groovy | 36 +- .../model/ScopedRuleSourceIntegrationTest.groovy | 22 +- .../model/TaskCreationIntegrationTest.groovy | 59 +- ...actClassBackedManagedTypeIntegrationTest.groovy | 39 +- .../ComplexManagedTypeIntegrationTest.groovy | 15 +- .../CyclicalManagedTypeIntegrationTest.groovy | 10 +- .../EnumsInManagedModelIntegrationTest.groovy | 3 - ...nterfaceBackedManagedTypeIntegrationTest.groovy | 29 +- ...validManagedModelMutationIntegrationTest.groovy | 30 +- .../InvalidManagedModelRuleIntegrationTest.groovy | 19 +- .../managed/ManagedModelMapIntegrationTest.groovy | 333 ++++++ ...odelPropertyTargetingRuleIntegrationTest.groovy | 25 +- .../model/managed/ManagedSetIntegrationTest.groovy | 80 +- ...anagedTypeImplementationClassCachingSpec.groovy | 5 +- ...peWithUnmanagedPropertiesIntegrationTest.groovy | 10 +- .../model/managed/ModelSetIntegrationTest.groovy | 546 ++++++++++ .../PolymorphicManagedTypeIntegrationTest.groovy | 25 +- .../PrimitivesInManagedModelIntegrationTest.groovy | 44 +- .../src/main/java/org/gradle/model/Defaults.java | 2 +- .../src/main/java/org/gradle/model/Managed.java | 15 +- .../src/main/java/org/gradle/model/ModelMap.java | 172 ++++ .../src/main/java/org/gradle/model/ModelSet.java | 61 ++ .../gradle/model/collection/CollectionBuilder.java | 13 +- .../org/gradle/model/collection/ManagedSet.java | 4 +- .../internal/ModelMapModelProjection.java | 188 ++++ .../internal/core/ActionBackedModelAction.java | 59 -- .../model/internal/core/BaseInstanceFactory.java | 98 ++ .../internal/core/BiActionBackedModelAction.java | 70 -- .../internal/core/ChainingModelProjection.java | 29 +- .../internal/core/ChildNodeCreatorStrategy.java | 27 + .../internal/core/CollectionBuilderModelView.java | 283 ------ .../internal/core/DefaultCollectionBuilder.java | 314 ------ .../model/internal/core/DefaultModelViewState.java | 78 ++ .../internal/core/DelegatingCollectionBuilder.java | 157 --- .../core/DirectNodeInputUsingModelAction.java | 62 ++ .../model/internal/core/DirectNodeModelAction.java | 70 -- .../core/DirectNodeNoInputsModelAction.java | 70 ++ .../model/internal/core/EmptyModelProjection.java | 10 +- .../model/internal/core/InputUsingModelAction.java | 70 ++ .../model/internal/core/InstanceFactory.java | 29 + .../model/internal/core/InstanceModelView.java | 14 +- .../model/internal/core/ModelActionRole.java | 24 +- .../gradle/model/internal/core/ModelAdapter.java | 3 + .../gradle/model/internal/core/ModelCreator.java | 2 +- .../gradle/model/internal/core/ModelCreators.java | 100 +- .../internal/core/ModelMapGroovyDecorator.java | 242 +++++ .../org/gradle/model/internal/core/ModelNode.java | 25 +- .../org/gradle/model/internal/core/ModelPath.java | 31 +- .../gradle/model/internal/core/ModelPredicate.java | 66 ++ .../gradle/model/internal/core/ModelPromise.java | 4 +- .../gradle/model/internal/core/ModelReference.java | 66 +- .../gradle/model/internal/core/ModelRegistrar.java | 29 - .../model/internal/core/ModelViewFactory.java | 23 + .../gradle/model/internal/core/ModelViewState.java | 28 + .../model/internal/core/MutableModelNode.java | 41 +- .../internal/core/NamedEntityInstantiators.java | 28 + .../model/internal/core/NoInputsModelAction.java | 59 ++ .../model/internal/core/NodeBackedModelMap.java | 325 ++++++ .../model/internal/core/NodeBackedModelSet.java | 182 ++++ .../core/ProjectionBackedModelCreator.java | 18 +- .../core/SpecializedModelMapProjection.java | 124 +++ .../TypeCompatibilityModelProjectionSupport.java | 4 +- .../model/internal/core/TypedModelProjection.java | 70 ++ .../internal/core/UnmanagedModelProjection.java | 19 + .../rule/describe/NestedModelRuleDescriptor.java | 4 + .../rule/describe/StandardDescriptorFactory.java | 38 + .../inspect/DefaultModelCreatorFactory.java | 222 +++- .../internal/inspect/ManagedModelInitializer.java | 19 +- .../internal/inspect/ManagedSetInitializer.java | 40 - .../internal/inspect/MethodBackedModelAction.java | 5 + .../UnmanagedModelCreationRuleExtractor.java | 2 +- .../manage/projection/ManagedModelProjection.java | 6 + .../projection/ManagedSetModelProjection.java | 244 ----- .../manage/schema/ModelCollectionSchema.java | 15 + .../internal/manage/schema/ModelMapSchema.java | 40 + .../model/internal/manage/schema/ModelSchema.java | 17 +- .../internal/manage/schema/ModelSchemaStore.java | 2 + .../manage/schema/cache/ModelSchemaCache.java | 2 +- .../extract/AbstractProxyClassGenerator.java | 51 + .../schema/extract/DefaultModelSchemaStore.java | 5 + .../InvalidManagedModelElementTypeException.java | 2 + .../schema/extract/JdkValueTypeStrategy.java | 4 +- .../ManagedCollectionProxyClassGenerator.java | 75 ++ .../schema/extract/ManagedProxyClassGenerator.java | 38 +- .../manage/schema/extract/ManagedSetStrategy.java | 59 +- .../manage/schema/extract/ModelMapStrategy.java | 83 ++ .../schema/extract/ModelSchemaExtractor.java | 15 +- .../manage/schema/extract/ModelSetStrategy.java | 32 + .../manage/schema/extract/SetStrategy.java | 82 ++ .../schema/extract/SpecializedMapStrategy.java | 67 ++ .../manage/schema/extract/StructStrategy.java | 41 +- .../registry/AnyStateBindingPredicate.java | 33 + .../internal/registry/BinderCreationListener.java | 42 - .../model/internal/registry/BindingPredicate.java | 63 ++ .../model/internal/registry/CreatorRuleBinder.java | 8 +- .../internal/registry/DefaultModelRegistry.java | 1047 +++++++++++++------ .../model/internal/registry/ModelBinding.java | 56 +- .../internal/registry/ModelCreationListener.java | 45 +- .../gradle/model/internal/registry/ModelGraph.java | 114 ++- .../model/internal/registry/ModelNodeInternal.java | 83 +- .../model/internal/registry/ModelRegistry.java | 18 +- .../model/internal/registry/MutatorRuleBinder.java | 53 +- .../model/internal/registry/NodeAtState.java | 61 ++ .../registry/OneOfTypeBinderCreationListener.java | 44 +- .../registry/PathBinderCreationListener.java | 33 +- .../gradle/model/internal/registry/RuleBinder.java | 94 +- .../model/internal/registry/RuleBindings.java | 187 ++++ .../model/internal/registry/RuleContext.java | 64 ++ .../model/internal/registry/SingleNodeBinding.java | 20 + .../internal/registry/UnboundRulesProcessor.java | 31 +- .../report/IncompatibleTypeReferenceReporter.java | 8 +- .../model/internal/type/ClassTypeWrapper.java | 15 +- .../org/gradle/model/internal/type/ModelType.java | 11 +- .../org/gradle/model/internal/type/ModelTypes.java | 34 +- .../model/internal/type/NullTypeWrapper.java | 33 - .../internal/type/ParameterizedTypeWrapper.java | 53 +- .../gradle/model/internal/type/TypeWrapper.java | 2 +- .../model/internal/type/WildcardTypeWrapper.java | 25 +- .../gradle/model/ManagedModelMapTypesTest.groovy | 112 ++ .../org/gradle/model/ManagedNamedTest.groovy | 88 ++ .../model/ManagedNodeBackedModelMapTest.groovy | 860 ++++++++++++++++ .../org/gradle/model/NamedThingInterface.java | 26 + .../src/test/groovy/org/gradle/model/Special.java | 23 + .../gradle/model/SpecialNamedThingInterface.java | 24 + .../model/UnmanagedNodeBackedModelMapTest.groovy | 872 ++++++++++++++++ .../internal/CollectionBuilderModelViewTest.groovy | 51 - .../internal/DefaultCollectionBuilderTest.groovy | 842 --------------- .../collection/internal/HasDependencies.groovy | 27 - .../gradle/model/collection/internal/Special.java | 23 - .../core/ModelMapGroovyDecoratorTest.groovy | 40 + .../model/internal/core/ModelPathTest.groovy | 50 +- .../model/internal/core/ModelReferenceTest.groovy | 112 ++ .../model/internal/core/ModelTypeJavaTest.java | 19 + .../model/internal/core/ModelTypeTest.groovy | 33 + .../core/NamedEntityInstantiatorsTest.groovy | 39 + .../describe/StandardDescriptorFactoryTest.groovy | 38 + .../internal/inspect/ModelRuleExtractorTest.groovy | 11 +- .../ManagedSetModelProjectionTest.groovy | 170 ---- .../projection/ModelSetModelProjectionTest.groovy | 170 ++++ .../extract/DefaultModelSchemaStoreTest.groovy | 14 +- ...ManagedCollectionProxyClassGeneratorTest.groovy | 89 ++ .../schema/extract/ModelSchemaExtractorTest.groovy | 130 ++- .../manage/schema/extract/SpecialManagedSet.java | 21 - .../manage/schema/extract/SpecialModelSet.java | 21 + .../registry/DefaultModelRegistryTest.groovy | 389 ++++++- .../model/internal/registry/HasDependencies.groovy | 27 + .../model/internal/registry/ModelGraphTest.groovy | 68 +- .../registry/ModelRegistryEphemeralNodeTest.groovy | 68 +- .../model/internal/registry/RegistrySpec.groovy | 275 +++++ .../internal/registry/RuleBindingsTest.groovy | 479 +++++++++ .../model/internal/registry/ScopedRuleTest.groovy | 1 - .../registry/UnboundRulesProcessorTest.groovy | 229 +---- .../internal/fixture/ModelRegistryHelper.java | 178 ++-- .../dsl/ModelDslCreationIntegrationTest.groovy | 104 +- .../model/dsl/ModelDslIntegrationTest.groovy | 70 +- .../ModelDslRuleDetectionIntegrationSpec.groovy | 4 +- ...odelDslRuleInputDetectionIntegrationSpec.groovy | 152 ++- .../NestedModelDslUsageIntegrationSpec.groovy | 6 +- .../internal/NonTransformedModelDslBacking.java | 4 +- .../dsl/internal/TransformedModelDslBacking.java | 57 +- .../model/dsl/internal/inputs/RuleInputAccess.java | 4 +- .../internal/inputs/RuleInputAccessBacking.java | 6 + .../dsl/internal/transform/InputReferences.java | 73 ++ .../model/dsl/internal/transform/RuleMetadata.java | 18 +- .../model/dsl/internal/transform/RuleVisitor.java | 115 ++- .../NonTransformedModelDslBackingTest.groovy | 4 +- .../internal/TransformedModelDslBackingTest.groovy | 11 +- .../filesystem/services/FileSystemServices.java | 2 +- subprojects/performance/performance.gradle | 35 +- subprojects/performance/src/generator.groovy | 4 + .../NativePreCompiledHeaderPerformanceTest.groovy | 46 + .../NativeScenarioPerformanceTest.groovy | 1 - .../templates/native-pch-component/build.gradle | 40 + .../src/templates/native-pch-source/lib.c | 8 + .../src/templates/native-pch-source/pch.h | 10 + .../src/templates/project-with-source/build.gradle | 4 + .../src/templates/variants-new-model/build.gradle | 8 +- .../performance/results/ReportGeneratorTest.groovy | 2 + subprojects/platform-base/platform-base.gradle | 2 + .../base/AssembleTaskIntegrationTest.groovy | 4 +- .../base/ComponentModelIntegrationTest.groovy | 838 +++++++++++++++ .../base/ComponentTypeSampleIntegTest.groovy | 33 +- .../base/CustomBinaryIntegrationTest.groovy | 13 +- .../base/CustomBinaryTasksIntegrationTest.groovy | 44 +- .../CustomComponentBinariesIntegrationTest.groovy | 120 ++- .../CustomComponentPluginIntegrationTest.groovy | 119 ++- .../base/LanguageTypeIntegrationTest.groovy | 7 +- .../base/LanguageTypeSampleIntegrationTest.groovy | 2 +- .../ComponentModelBasePluginIntegrationTest.groovy | 131 +++ .../LifecycleBasePluginIntegrationTest.groovy | 4 +- .../gradle/language/base/FunctionalSourceSet.java | 4 +- .../gradle/language/base/LanguageSourceSet.java | 6 +- .../base/internal/DefaultFunctionalSourceSet.java | 15 +- .../base/internal/DependentSourceSetInternal.java | 25 + .../base/internal/LanguageSourceSetContainer.java | 11 +- .../base/internal/LanguageSourceSetInternal.java | 4 + .../internal/model/BinarySpecFactoryRegistry.java | 64 ++ .../base/internal/model/ComponentRules.java | 105 ++ .../internal/model/ComponentSpecInitializer.java | 54 + .../base/plugins/ComponentModelBasePlugin.java | 141 ++- .../language/base/plugins/LanguageBasePlugin.java | 73 +- .../language/base/plugins/LifecycleBasePlugin.java | 2 +- .../base/sources/BaseLanguageSourceSet.java | 4 + .../core/DomainObjectSetBackedModelMap.java | 232 +++++ .../java/org/gradle/platform/base/BinarySpec.java | 24 +- .../java/org/gradle/platform/base/BinaryTasks.java | 7 +- .../java/org/gradle/platform/base/BinaryType.java | 3 - .../gradle/platform/base/ComponentBinaries.java | 5 +- .../org/gradle/platform/base/ComponentSpec.java | 9 +- .../platform/base/ComponentSpecContainer.java | 4 +- .../org/gradle/platform/base/ComponentType.java | 5 +- .../org/gradle/platform/base/DependencySpec.java | 44 + .../platform/base/DependencySpecBuilder.java | 47 + .../platform/base/DependencySpecContainer.java | 46 + .../org/gradle/platform/base/LanguageType.java | 3 - .../platform/base/binary/BaseBinarySpec.java | 11 +- .../platform/base/component/BaseComponentSpec.java | 166 ++- .../platform/base/internal/BinarySpecFactory.java | 26 + .../platform/base/internal/BinarySpecInternal.java | 4 + .../platform/base/internal/ComponentSpecAware.java | 25 + .../base/internal/ComponentSpecFactory.java | 26 + .../base/internal/ComponentSpecInternal.java | 1 + .../base/internal/DefaultBinaryContainer.java | 5 +- .../internal/DefaultComponentSpecContainer.java | 29 - .../base/internal/DefaultDependencySpec.java | 103 ++ .../internal/DefaultDependencySpecContainer.java | 134 +++ ...nnotationDrivenComponentModelRuleExtractor.java | 14 +- .../registry/BinaryTasksModelRuleExtractor.java | 75 +- .../registry/BinaryTypeModelRuleExtractor.java | 43 +- .../registry/CollectionBuilderBasedRule.java | 97 -- .../ComponentBinariesModelRuleExtractor.java | 55 +- .../ComponentModelBaseServiceRegistry.java | 9 +- .../registry/ComponentTypeModelRuleExtractor.java | 46 +- .../base/internal/registry/ModelMapBasedRule.java | 98 ++ .../RuleAwarePolymorphicDomainObjectContainer.java | 52 - .../internal/test/DefaultTestSuiteContainer.java | 28 - .../platform/base/test/TestSuiteContainer.java | 4 +- .../ComponentTypeModelRuleExtractorTest.groovy | 12 +- .../LanguageTypeModelRuleExtractorTest.groovy | 7 +- .../plugins/ComponentModelBasePluginTest.groovy | 283 ------ .../base/plugins/LifecycleBasePluginTest.groovy | 3 +- .../base/component/BaseComponentSpecTest.groovy | 34 +- .../BinaryTasksModelRuleExtractorTest.groovy | 24 +- .../BinaryTypeModelRuleExtractorTest.groovy | 12 +- .../ComponentBinariesModelRuleExtractorTest.groovy | 28 +- ...warePolymorphicDomainObjectContainerTest.groovy | 66 -- .../base/component/BaseComponentFixtures.groovy | 44 + subprojects/platform-jvm/platform-jvm.gradle | 1 + .../jvm/ComponentReportIntegrationTest.groovy | 32 +- .../gradle/jvm/ModelReuseIntegrationTest.groovy | 62 ++ .../JvmComponentPluginIntegrationTest.groovy | 111 +- .../org/gradle/jvm/plugins/JvmComponentPlugin.java | 12 +- .../src/main/java/org/gradle/jvm/tasks/Jar.java | 2 +- .../archives/internal/DefaultManifestTest.groovy | 6 +- .../jvm/internal/DefaultJvmLibrarySpecTest.groovy | 17 +- .../internal/plugins/CreateJvmBinariesTest.groovy | 14 +- .../BinaryBuildTypesIntegrationTest.groovy | 9 +- .../BinaryConfigurationIntegrationTest.groovy | 2 + .../BinaryFlavorsIntegrationTest.groovy | 8 +- .../ComponentReportIntegrationTest.groovy | 20 +- .../LibraryApiDependenciesIntegrationTest.groovy | 6 +- .../LibraryBinariesIntegrationTest.groovy | 2 + .../LibraryDependenciesIntegrationTest.groovy | 2 + .../ModelReuseIntegrationTest.groovy | 85 ++ .../NativeBinariesIntegrationTest.groovy | 13 +- .../NativePlatformSamplesIntegrationTest.groovy | 4 +- .../PrebuiltLibrariesIntegrationTest.groovy | 2 + .../TestSuiteDefinitionIntegrationSpec.groovy | 138 +++ .../TestSuiteModelIntegrationSpec.groovy | 352 +++++++ .../BinaryNativePlatformIntegrationTest.groovy | 4 +- .../GeneratedSourcesIntegrationTest.groovy | 8 +- ...rceSetCompileDependenciesIntegrationTest.groovy | 2 + .../SourceSetDependenciesIntegrationTest.groovy | 8 +- ...SourceSetLinkDependenciesIntegrationTest.groovy | 3 +- .../CommonToolchainCustomizationIntegTest.groovy | 2 + .../GccToolChainDiscoveryIntegrationTest.groovy | 4 +- .../MultipleNativeToolChainIntegrationTest.groovy | 2 + .../NativeToolChainDiscoveryIntegrationTest.groovy | 2 + ...sualCppToolChainDiscoveryIntegrationTest.groovy | 9 +- .../nativeplatform/DependentSourceSet.java | 19 +- .../internal/DependentSourceSetInternal.java | 27 + .../language/nativeplatform/internal/Include.java | 23 + .../nativeplatform/internal/IncludeType.java | 21 + .../nativeplatform/internal/SourceIncludes.java | 8 +- .../internal/AbstractNativeBinarySpec.java | 20 +- .../internal/AbstractNativeComponentSpec.java | 3 +- .../internal/NativeBinarySpecInternal.java | 8 +- .../internal/NativePlatformResolver.java | 12 +- .../configure/DefaultNativeBinariesFactory.java | 77 -- .../internal/configure/NativeBinaries.java | 93 ++ .../internal/configure/NativeBinariesFactory.java | 28 - .../internal/configure/NativeBinaryRules.java | 72 ++ .../configure/NativeBinarySpecInitializer.java | 51 - .../internal/configure/NativeComponentRules.java | 169 ++++ .../configure/NativeComponentSpecInitializer.java | 109 -- ...DefaultPreCompiledHeaderTransformContainer.java | 33 - .../internal/pch/PchEnabledLanguageTransform.java | 26 + .../pch/PreCompiledHeaderTransformContainer.java | 23 - .../prebuilt/PrebuiltLibraryInitializer.java | 3 +- .../internal/resolve/DefaultLibraryResolver.java | 5 +- .../resolve/LibraryNativeDependencyResolver.java | 7 +- .../resolve/NativeDependencyResolverServices.java | 5 +- .../resolve/ProjectLibraryBinaryLocator.java | 29 +- .../internal/services/NativeBinaryServices.java | 4 + .../platform/internal/NativePlatforms.java | 4 +- .../plugins/NativeComponentModelPlugin.java | 194 ++-- .../tasks/PrefixHeaderFileGenerateTask.java | 16 +- .../test/plugins/NativeBinariesTestPlugin.java | 55 +- .../toolchain/internal/NativeCompileSpec.java | 5 +- .../toolchain/internal/NativeCompiler.java | 46 +- .../internal/PCHObjectDirectoryGeneratorUtil.java | 39 - .../toolchain/internal/PCHUtils.java | 108 ++ .../toolchain/internal/PlatformToolProvider.java | 2 - .../toolchain/internal/PreCompiledHeader.java | 58 ++ .../internal/PrefixHeaderFileGeneratorUtil.java | 49 - .../internal/UnavailablePlatformToolProvider.java | 7 +- .../toolchain/internal/gcc/Assembler.java | 10 + .../internal/gcc/GccCompatibleNativeCompiler.java | 2 +- .../internal/gcc/GccPlatformToolProvider.java | 1 - .../toolchain/internal/msvcpp/Assembler.java | 5 +- .../toolchain/internal/msvcpp/CPCHCompiler.java | 2 +- .../toolchain/internal/msvcpp/CppPCHCompiler.java | 2 +- .../internal/msvcpp/VisualCppNativeCompiler.java | 11 +- .../VisualCppPCHSourceFileGeneratorUtil.java | 62 -- .../msvcpp/VisualCppPCHSourceFileTransformer.java | 36 - .../msvcpp/VisualCppPlatformToolProvider.java | 13 +- .../internal/msvcpp/WindowsResourceCompiler.java | 3 + .../internal/DefaultNativeComponentTest.groovy | 6 +- .../DefaultNativeExecutableBinarySpecTest.groovy | 15 +- .../DefaultNativeExecutableSpecTest.groovy | 6 +- .../internal/DefaultNativeLibrarySpecTest.groovy | 5 +- .../DefaultSharedLibraryBinarySpecTest.groovy | 13 +- .../DefaultStaticLibraryBinarySpecTest.groovy | 12 +- .../internal/NativeBinarySpecTest.groovy | 12 +- .../DefaultNativeBinariesFactoryTest.groovy | 103 -- .../configure/NativeBinaryRulesTest.groovy | 109 ++ .../NativeBinarySpecInitializerTest.groovy | 99 -- .../configure/NativeComponentRulesTest.groovy | 145 +++ .../NativeComponentSpecInitializerTest.groovy | 180 ---- .../resolve/ProjectLibraryBinaryLocatorTest.groovy | 33 +- .../plugins/NativeComponentModelPluginTest.groovy | 47 +- .../toolchain/internal/NativeCompilerTest.groovy | 3 + .../toolchain/internal/PCHUtilsTest.groovy | 118 +++ .../PrefixHeaderFileGeneratorUtilTest.groovy | 46 - .../toolchain/internal/gcc/CPCHCompilerTest.groovy | 39 + .../internal/gcc/CppPCHCompilerTest.groovy | 39 + .../gcc/GccCompatibleNativeCompilerTest.groovy | 3 +- .../internal/gcc/ObjectiveCCompilerTest.groovy | 39 + .../internal/gcc/ObjectiveCPCHCompilerTest.groovy | 39 + .../internal/gcc/ObjectiveCppCompilerTest.groovy | 39 + .../gcc/ObjectiveCppPCHCompilerTest.groovy | 39 + .../internal/msvcpp/CPCHCompilerTest.groovy | 44 + .../internal/msvcpp/CppPCHCompilerTest.groovy | 46 + .../msvcpp/VisualCppNativeCompilerTest.groovy | 10 +- .../VisualCppPCHSourceFileGeneratorUtilTest.groovy | 52 - .../VisualCppPCHSourceFileTransformerTest.groovy | 49 - .../fixtures/NativePlatformsTestFixture.java | 9 +- .../fixtures/app/CHelloWorldApp.groovy | 36 +- .../fixtures/app/CPCHHelloWorldApp.groovy | 186 ---- .../fixtures/app/CommonHeaderHelloWorldApp.groovy | 40 + .../fixtures/app/CppHelloWorldApp.groovy | 36 +- .../fixtures/app/CppPCHHelloWorldApp.groovy | 187 ---- .../fixtures/app/IncrementalHelloWorldApp.java | 2 +- .../fixtures/app/MixedLanguageHelloWorldApp.groovy | 6 +- .../fixtures/app/ObjectiveCHelloWorldApp.groovy | 36 +- .../fixtures/app/ObjectiveCPCHHelloWorldApp.groovy | 190 ---- .../fixtures/app/ObjectiveCppHelloWorldApp.groovy | 34 +- .../app/ObjectiveCppPCHHelloWorldApp.groovy | 187 ---- .../fixtures/app/PCHHelloWorldApp.groovy | 31 - .../configure/TestNativeBinariesFactory.java | 42 + .../integtest/PlayPlatformIntegrationTest.groovy | 19 + .../PlayApplicationPluginIntegrationTest.groovy | 29 +- .../PlayCoffeeScriptPluginIntegrationTest.groovy | 4 +- .../PlayJavaScriptPluginIntegrationTest.groovy | 4 +- ...offeeScriptImplementationIntegrationTest.groovy | 4 + .../play/tasks/RoutesCompileIntegrationTest.groovy | 74 +- .../play/tasks/TwirlCompileIntegrationTest.groovy | 18 +- .../fixtures/app/basicplayapp/test/notATest.yaml | 7 + .../app/playappwithdependencies/test/notATest.yaml | 7 + .../DefaultPlayDistributionContainer.java | 2 +- .../gradle/play/plugins/PlayApplicationPlugin.java | 65 +- .../play/plugins/PlayCoffeeScriptPlugin.java | 8 +- .../play/plugins/PlayDistributionPlugin.java | 20 +- .../gradle/play/plugins/PlayJavaScriptPlugin.java | 11 +- .../java/org/gradle/play/plugins/PlayPlugin.java | 2 +- .../org/gradle/play/plugins/PlayTestPlugin.java | 12 +- .../main/java/org/gradle/play/tasks/PlayRun.java | 3 +- .../play/plugins/PlayCoffeeScriptPluginTest.groovy | 4 +- .../play/plugins/PlayDistributionPluginTest.groovy | 6 +- .../play/plugins/PlayJavaScriptPluginTest.groovy | 4 +- .../gradle/play/plugins/PlayTestPluginTest.groovy | 14 +- .../org/gradle/play/tasks/PlayRunTest.groovy | 10 +- .../use/DeployedPortalIntegrationSpec.groovy | 2 + ...readyOnClasspathDetectionIntegrationSpec.groovy | 2 + .../NonDeclarativePluginUseIntegrationSpec.groovy | 2 + ...tPluginResolutionFailuresIntegrationSpec.groovy | 4 +- .../use/RuleSourcePluginUseIntegrationSpec.groovy | 2 + ...lutionCachingCrossVersionIntegrationTest.groovy | 2 + .../PluginResolutionCachingIntegrationTest.groovy | 2 + ...esolutionDeprecatedClientIntegrationTest.groovy | 2 + ...ginResolutionServiceCommsIntegrationTest.groovy | 2 + .../PluginResolutionServiceIntegrationSpec.groovy | 2 + .../internal/DefaultPluginRequestApplicator.java | 16 +- .../PluginResolutionServiceTestServer.groovy | 2 + .../api/plugins/BasePluginIntegrationTest.groovy | 2 + .../gradle/api/plugins/BuildSrcPluginTest.groovy | 6 +- .../BasicGroovyCompilerIntegrationSpec.groovy | 110 +- .../InProcessGroovyCompilerIntegrationTest.groovy | 3 + .../java/ComponentReportIntegrationTest.groovy | 10 +- .../BasicJavaCompilerIntegrationSpec.groovy | 4 +- .../compile/JavaCompilerIntegrationSpec.groovy | 3 + .../gradle/testing/TestTaskIntegrationTest.groovy | 8 +- .../JUnitConsoleLoggingIntegrationTest.groovy | 20 +- .../TestNGConsoleLoggingIntegrationTest.groovy | 16 +- .../internal/DefaultDistributionContainer.java | 3 +- .../distribution/plugins/DistributionPlugin.groovy | 6 +- .../internal/java/AbstractLanguageSourceSet.java | 1 + .../jvm/ClassDirectoryBinarySpecInternal.java | 3 + .../jvm/DefaultClassDirectoryBinarySpec.java | 7 + .../tasks/testing/AbstractTestDescriptor.java | 8 + .../tasks/testing/DecoratingTestDescriptor.java | 12 + .../tasks/testing/TestDescriptorInternal.java | 7 + .../testing/detection/DefaultTestExecuter.java | 10 +- .../tasks/testing/processors/TestMainAction.java | 22 +- .../testing/results/UnknownTestDescriptor.java | 9 +- .../groovy/org/gradle/api/plugins/BasePlugin.java | 4 +- .../org/gradle/api/plugins/JavaBasePlugin.java | 13 +- .../groovy/org/gradle/api/tasks/GroovyRuntime.java | 15 +- .../plugins/DistributionPluginTest.groovy | 15 +- .../internal/java/DefaultJavaSourceSetTest.groovy | 7 +- .../tasks/DefaultGroovySourceSetTest.groovy | 7 +- .../detection/DefaultTestExecuterTest.groovy | 3 + .../junit/result/TestOutputStoreSpec.groovy | 29 +- .../testing/logging/SimpleTestDescriptor.groovy | 1 + .../testing/processors/TestMainActionTest.groovy | 10 +- .../gradle/api/plugins/JavaBasePluginTest.groovy | 11 +- .../org/gradle/api/plugins/JavaPluginTest.groovy | 17 +- .../api/publish/plugins/PublishingPlugin.java | 4 +- .../http/AlwaysRedirectRedirectStrategy.java | 67 ++ .../resource/transport/http/HttpClientHelper.java | 18 +- .../http/AlwaysRedirectRedirectStrategyTest.groovy | 62 ++ .../MavenPublishS3ErrorsIntegrationTest.groovy | 1 + .../internal/resource/UriResourceTest.groovy | 5 +- ...ForkingOlderScalaCompilerIntegrationTest.groovy | 2 + .../AntForkingScalaCompilerIntegrationTest.groovy | 4 +- ...ProcessOlderScalaCompilerIntegrationTest.groovy | 2 + ...AntInProcessScalaCompilerIntegrationTest.groovy | 2 + .../ZincScalaCompilerIntegrationTest.groovy | 4 +- .../groovy/org/gradle/api/tasks/ScalaRuntime.java | 8 +- .../tasks/DefaultScalaSourceSetTest.groovy | 10 +- .../gradle/api/tasks/scala/ScalaCompileTest.java | 7 +- .../plugins/sonar/SonarSmokeIntegrationTest.groovy | 2 + .../runner/SonarRunnerSmokeIntegrationTest.groovy | 2 + .../gradle/sonar/runner/SonarRunnerExtension.java | 8 +- .../sonar/runner/plugins/SonarRunnerPlugin.java | 24 +- .../org/gradle/sonar/runner/tasks/SonarRunner.java | 12 +- .../test/cunit/CUnitIntegrationTest.groovy | 99 +- .../cunit/ComponentReportIntegrationTest.groovy | 12 +- .../ComponentReportIntegrationTest.groovy | 10 +- .../googletest/GoogleTestIntegrationTest.groovy | 49 +- .../internal/DefaultCUnitTestSuiteBinary.java | 17 - .../cunit/internal/DefaultCUnitTestSuiteSpec.java | 3 +- .../test/cunit/plugins/CUnitPlugin.java | 141 ++- .../internal/DefaultGoogleTestTestSuiteBinary.java | 17 - .../internal/DefaultGoogleTestTestSuiteSpec.java | 4 +- .../test/googletest/plugins/GoogleTestPlugin.java | 142 ++- .../nativeplatform/test/cunit/CUnitTest.groovy | 25 +- .../test/googletest/GoogleTestTest.groovy | 23 +- .../runner/BuildClientSubscriptionsSetup.java | 39 + .../provider/runner/BuildModelActionRunner.java | 10 +- .../runner/ClientForwardingBuildListener.java | 68 ++ .../runner/ClientForwardingTaskListener.java | 89 ++ .../runner/ClientForwardingTestListener.java | 27 +- .../runner/ClientProvidedBuildActionRunner.java | 4 + .../ClientProvidedBuildActionRunnerTest.groovy | 13 +- .../SamplesToolingApiIntegrationTest.groovy | 4 +- .../tooling/ToolingApiIntegrationTest.groovy | 2 + .../tooling/ToolingApiRemoteIntegrationTest.groovy | 4 +- .../ContinuousBuildToolingApiSpecification.groovy | 183 ++++ .../integtests/tooling/fixture/ToolingApi.groovy | 17 +- .../ToolingApiCompatibilitySuiteRunner.groovy | 4 + .../tooling/fixture/ToolingApiSpecification.groovy | 10 +- .../tooling/fixture/ToolingApiVersions.java | 31 + .../m8/ToolingApiLoggingCrossVersionSpec.groovy | 12 +- ...ApiInitScriptCrossVersionIntegrationTest.groovy | 2 + .../tooling/r22/BuildActionCrossVersionSpec.groovy | 5 +- .../DaemonUsageSuggestionCrossVersionTest.groovy | 8 +- .../r24/TestProgressCrossVersionSpec.groovy | 672 +++++------- ...TestProgressDaemonErrorsCrossVersionSpec.groovy | 40 +- .../r25/BuildProgressCrossVersionSpec.groovy | 438 ++++++++ ...tinuousBuildCancellationCrossVersionSpec.groovy | 97 ++ .../r25/ContinuousBuildCrossVersionSpec.groovy | 71 ++ ...nuousBuildProgressEventsCrossVersionSpec.groovy | 56 + ...usUnsupportedJavaVersionCrossVersionSpec.groovy | 52 + ...pportedToolingApiVersionCrossVersionSpec.groovy | 67 ++ .../r25/GradleTaskGetGroupCrossVersionSpec.groovy | 103 ++ .../gradle/integtests/tooling/r25/NullAction.java | 26 + .../tooling/r25/ProgressCrossVersionSpec.groovy | 215 ++++ .../r25/TaskProgressCrossVersionSpec.groovy | 594 +++++++++++ .../r25/TestProgressCrossVersionSpec.groovy | 770 ++++++++++++++ ...TestProgressDaemonErrorsCrossVersionSpec.groovy | 73 ++ .../ToolingApiEclipseModelCrossVersionSpec.groovy | 128 +++ .../org/gradle/tooling/BuildActionExecuter.java | 36 +- .../java/org/gradle/tooling/BuildLauncher.java | 27 +- .../gradle/tooling/ListenerFailedException.java | 44 + .../org/gradle/tooling/LongRunningOperation.java | 24 +- .../main/java/org/gradle/tooling/ModelBuilder.java | 26 +- .../gradle/tooling/events/OperationDescriptor.java | 7 +- .../org/gradle/tooling/events/OperationType.java | 41 + .../gradle/tooling/events/ProgressListener.java | 58 ++ .../tooling/events/internal/BaseFinishEvent.java | 40 - .../tooling/events/internal/BaseStartEvent.java | 31 - .../events/internal/DefaultFinishEvent.java | 40 + .../internal/DefaultOperationDescriptor.java | 58 ++ .../internal/DefaultOperationFailureResult.java | 54 + .../internal/DefaultOperationSuccessResult.java | 44 + .../tooling/events/internal/DefaultStartEvent.java | 31 + .../tooling/events/task/TaskFailureResult.java | 29 + .../tooling/events/task/TaskFinishEvent.java | 44 + .../events/task/TaskOperationDescriptor.java | 32 + .../tooling/events/task/TaskOperationResult.java | 29 + .../tooling/events/task/TaskProgressEvent.java | 36 + .../tooling/events/task/TaskSkippedResult.java | 37 + .../gradle/tooling/events/task/TaskStartEvent.java | 29 + .../tooling/events/task/TaskSuccessResult.java | 35 + .../task/internal/DefaultTaskFailureResult.java | 34 + .../task/internal/DefaultTaskFinishEvent.java | 43 + .../internal/DefaultTaskOperationDescriptor.java | 40 + .../task/internal/DefaultTaskSkippedResult.java | 51 + .../task/internal/DefaultTaskStartEvent.java | 37 + .../task/internal/DefaultTaskSuccessResult.java | 39 + .../gradle/tooling/events/task/package-info.java | 20 + .../tooling/events/test/TestFailureResult.java | 12 - .../tooling/events/test/TestProgressListener.java | 46 - .../DefaultJvmTestOperationDescriptor.java | 64 ++ .../test/internal/DefaultTestFailureResult.java | 26 +- .../test/internal/DefaultTestFinishEvent.java | 4 +- .../internal/DefaultTestOperationDescriptor.java | 32 + .../test/internal/DefaultTestStartEvent.java | 4 +- .../test/internal/DefaultTestSuccessResult.java | 19 +- .../consumer/AbstractLongRunningOperation.java | 31 +- .../consumer/DefaultBuildActionExecuter.java | 4 +- .../internal/consumer/DefaultBuildLauncher.java | 4 +- .../consumer/DefaultCancellationTokenSource.java | 2 +- .../internal/consumer/DefaultModelBuilder.java | 4 +- .../internal/consumer/ResultHandlerAdapter.java | 8 +- .../parameters/BuildProgressListenerAdapter.java | 336 +++--- .../parameters/ConsumerOperationParameters.java | 38 +- .../FailsafeBuildProgressListenerAdapter.java | 55 + .../protocol/InternalBuildProgressListener.java | 17 + .../protocol/events/InternalFailureResult.java | 25 + .../events/InternalOperationDescriptor.java | 53 + .../InternalOperationFinishedProgressEvent.java | 31 + .../protocol/events/InternalOperationResult.java | 50 + .../InternalOperationStartedProgressEvent.java | 25 + .../protocol/events/InternalProgressEvent.java | 45 + .../protocol/events/InternalSuccessResult.java | 25 + .../protocol/events/InternalTaskDescriptor.java | 31 + .../protocol/events/InternalTaskFailureResult.java | 25 + .../protocol/events/InternalTaskResult.java | 25 + .../protocol/events/InternalTaskSkippedResult.java | 28 + .../protocol/events/InternalTaskSuccessResult.java | 31 + .../protocol/events/InternalTestDescriptor.java | 31 +- .../protocol/events/InternalTestFailureResult.java | 2 +- .../events/InternalTestFinishedProgressEvent.java | 2 +- .../protocol/events/InternalTestProgressEvent.java | 16 +- .../protocol/events/InternalTestResult.java | 28 +- .../events/InternalTestStartedProgressEvent.java | 4 +- .../protocol/events/InternalTestSuccessResult.java | 2 +- .../gradle/tooling/model/ExternalDependency.java | 8 + .../main/java/org/gradle/tooling/model/Task.java | 11 + .../tooling/model/build/BuildEnvironment.java | 3 +- .../tooling/model/build/JavaEnvironment.java | 11 +- .../model/eclipse/EclipseProjectDependency.java | 8 + ...CancellableConsumerConnectionAdapterTest.groovy | 4 +- ...essListenerAdapterForBuildOperationsTest.groovy | 357 +++++++ ...ressListenerAdapterForTaskOperationsTest.groovy | 366 +++++++ ...ressListenerAdapterForTestOperationsTest.groovy | 533 ++++++++++ .../BuildProgressListenerAdapterTest.groovy | 553 ++-------- .../tooling/fixture/TestOutputStream.groovy | 6 + subprojects/tooling-api/tooling-api.gradle | 2 +- .../org/gradle/integtests/OpenApiUiTest.groovy | 2 + .../wrapper/SystemPropertiesHandlerTest.groovy | 4 +- version.txt | 2 +- 1585 files changed, 51694 insertions(+), 23031 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
