This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository gradle.
commit d5e971eeeb35ca287029d0725b2364a0d1f3f263 Merge: fdde2fa ea886e0 Author: Emmanuel Bourg <[email protected]> Date: Thu May 12 09:47:04 2016 +0200 Merge tag 'upstream/2.12' Upstream version 2.12 buildSrc/build.gradle | 6 +- .../dsl/source/GenerateDefaultImportsTask.java | 42 +- .../generator/tasks/JvmProjectGeneratorTask.groovy | 17 +- .../generator/tasks/ProjectGeneratorTask.groovy | 1 - .../dsl/source/ExtractDslMetaDataTaskTest.groovy | 4 + gradle/buildReceipt.gradle | 4 +- gradle/classycle.gradle | 23 +- gradle/groovyProject.gradle | 3 +- gradle/idea.gradle | 4 +- gradle/integTest.gradle | 29 +- gradle/wrapper/gradle-wrapper.properties | 12 +- gradlew.bat | 2 +- .../org/gradle/api/plugins/antlr/AntlrPlugin.java | 10 +- .../api/plugins/antlr/internal/AntlrExecuter.java | 4 +- .../internal/AntlrSourceVirtualDirectoryImpl.java | 7 +- .../api/specs/AbstractCompositeSpecTest.java | 4 +- .../java/org/gradle/api/specs/CompositeSpec.java | 4 +- .../java/org/gradle/internal/Transformers.java | 32 + .../internal/classloader/FilteringClassLoader.java | 2 +- .../classloader/MultiParentClassLoader.java | 2 +- .../classloader/MutableURLClassLoader.java | 2 +- .../internal/classpath/DefaultClassPath.java | 2 +- .../org/gradle/internal/process}/ArgCollector.java | 4 +- .../org/gradle/internal/process}/ArgWriter.java | 42 +- .../gradle/internal/reflect/ClassInspector.java | 2 +- .../main/java/org/gradle/util/CollectionUtils.java | 4 + .../gradle/internal/process}/ArgWriterTest.groovy | 24 +- .../internal/ComparableGradleBuildExecuter.java | 4 +- .../tooling/ProjectOutcomesModelBuilder.java | 3 +- .../plugins/BuildInitPluginIntegrationTest.groovy | 24 +- .../plugins/ScalaLibraryInitIntegrationTest.groovy | 7 +- .../plugins/internal/TemplateOperationFactory.java | 3 + .../org/gradle/buildinit/tasks/InitBuild.groovy | 12 +- .../gradle/api/plugins/quality/PmdPlugin.groovy | 5 +- .../internal/findbugs/FindBugsExecuter.java | 3 +- ...kCommandLineConfigurationIntegrationSpec.groovy | 2 +- .../PropertiesLoaderIntegrationTest.groovy | 123 ++ .../internal/PathLimitationIntegTest.groovy | 5 +- .../internal/WorkerProcessIntegrationTest.java | 3 +- .../org/gradle/api/artifacts/Configuration.java | 2 +- .../artifacts/result/ResolvedComponentResult.java | 4 +- .../org/gradle/api/file/CopyProcessingSpec.java | 6 +- .../main/groovy/org/gradle/api/file/FileTree.java | 10 + .../api/internal/AsmBackedClassGenerator.java | 10 +- .../api/internal/ExtensibleDynamicObject.java | 4 +- .../artifacts/DefaultPublishArtifactSet.java | 18 +- .../org/gradle/api/internal/cache/BinaryStore.java | 6 +- .../gradle/api/internal/cache/CacheSupport.java | 2 +- .../DefaultTaskArtifactStateRepository.java | 20 +- ...sInternal.java => DiscoveredInputRecorder.java} | 11 +- .../changes/IncrementalTaskInputsInternal.java | 13 +- .../AbstractFileSnapshotTaskStateChanges.java | 92 ++ .../rules/DiscoveredInputFileChange.java | 27 - .../rules/DiscoveredInputFilesStateChangeRule.java | 89 -- ...eChanges.java => DiscoveredInputsListener.java} | 4 +- .../rules/DiscoveredInputsTaskStateChanges.java | 71 + .../internal/changedetection/rules/FileChange.java | 12 +- .../rules/InputFilesStateChangeRule.java | 72 - .../rules/InputFilesTaskStateChanges.java | 56 + .../rules/InputPropertiesStateChangeRule.java | 54 - .../rules/InputPropertiesTaskStateChanges.java | 56 + ...ngeRule.java => NoHistoryTaskStateChanges.java} | 25 +- .../rules/OutputFilesStateChangeRule.java | 100 -- .../rules/OutputFilesTaskStateChanges.java | 82 + ...angeRule.java => TaskTypeTaskStateChanges.java} | 34 +- .../changedetection/rules/TaskUpToDateState.java | 60 +- .../state/DefaultFileCollectionSnapshotter.java | 15 +- .../state/FileCollectionSnapshot.java | 12 +- .../changedetection/state/FilesSnapshotSet.java | 2 +- .../state/MinimalFileSetSnapshotter.java | 19 +- .../state/OutputFilesCollectionSnapshotter.java | 6 +- .../api/internal/file/AbstractFileCollection.java | 2 +- .../gradle/api/internal/file/AbstractFileTree.java | 14 +- .../file/DefaultFileCollectionFactory.java | 74 + .../api/internal/file/DefaultFileOperations.java | 13 +- .../api/internal/file/DefaultFileVisitDetails.java | 7 +- .../internal/file/DefaultSourceDirectorySet.java | 11 +- .../file/DefaultSourceDirectorySetFactory.java | 39 + .../api/internal/file/EmptyFileCollection.java | 45 - .../api/internal/file/FileCollectionFactory.java | 57 + .../internal/file/SourceDirectorySetFactory.java} | 13 +- .../api/internal/file/archive/TarFileTree.java | 18 +- .../api/internal/file/archive/ZipFileTree.java | 6 +- .../collections/DefaultConfigurableFileTree.java | 10 +- .../DefaultDirectoryFileTreeFactory.java} | 17 +- .../file/collections/DefaultDirectoryWalker.java | 12 +- .../collections/DefaultDirectoryWalkerFactory.java | 7 +- .../file/collections/DirectoryFileTree.java | 3 +- ...FileTree.java => DirectoryFileTreeFactory.java} | 12 +- .../internal/file/collections/DirectoryWalker.java | 3 +- .../file/collections/jdk7/Jdk7DirectoryWalker.java | 16 +- .../file/copy/DelegatingCopySpecInternal.java | 2 +- .../api/internal/project/AbstractPluginAware.java | 2 +- .../api/internal/project/AbstractProject.java | 11 + .../tasks/options/AbstractOptionElement.java | 8 +- .../tasks/options/InstanceOptionDescriptor.java | 7 +- .../gradle/api/internal/tasks/options/Option.java | 7 + .../internal/tasks/options/OptionDescriptor.java | 2 + .../api/internal/tasks/options/OptionElement.java | 2 + .../main/groovy/org/gradle/api/tasks/JavaExec.java | 9 +- .../gradle/configuration/DefaultImportsReader.java | 40 +- .../configuration/DefaultScriptPluginFactory.java | 5 + .../org/gradle/configuration/ImportsReader.java | 5 + .../DefaultCancellableOperationManager.java | 13 +- .../org/gradle/groovy/scripts/DefaultScript.java | 6 +- .../internal/DefaultScriptCompilationHandler.java | 56 +- .../scripts/internal/GradleResolveVisitor.java | 1593 ++++++++++++++++++++ .../DefaultGradlePropertiesLoader.java | 2 +- .../initialization/IGradlePropertiesLoader.java | 4 +- .../gradle/internal/filewatch/ChangeReporter.java | 13 +- .../DefaultFileSystemChangeWaiterFactory.java | 50 +- .../service/scopes/BuildScopeServices.java | 2 + .../service/scopes/BuildSessionScopeServices.java | 20 +- .../service/scopes/GlobalScopeServices.java | 19 +- .../service/scopes/ProjectScopeServices.java | 16 +- .../service/scopes/TaskExecutionServices.java | 9 +- .../EnumFromCharSequenceNotationParser.java | 9 +- .../org/gradle/logging/internal/ProgressEvent.java | 2 +- .../gradle/process/internal/DefaultExecAction.java | 4 +- .../process/internal/DefaultExecActionFactory.java | 17 +- .../internal/DefaultWorkerProcessFactory.java | 29 +- .../gradle/process/internal/ExecActionFactory.java | 1 + .../internal/ExecHandleFactory.java} | 10 +- .../process/internal/WorkerProcessBuilder.java | 5 +- ...nClassesInIsolatedClassLoaderWorkerFactory.java | 34 +- ...ionClassesInSystemClassLoaderWorkerFactory.java | 78 +- .../process/internal/child/WorkerFactory.java | 9 +- .../artifacts/DefaultPublishArtifactSetTest.groovy | 10 +- .../DefaultTaskArtifactStateRepositoryTest.groovy | 4 +- .../DiscoveredInputFilesStateChangeRuleTest.groovy | 72 - ...ovy => FileSnapshotTaskStateChangesTest.groovy} | 42 +- .../rules/OutputFilesStateChangeRuleTest.groovy | 82 - .../rules/TaskUpToDateStateTest.groovy | 15 +- .../DefaultFileCollectionSnapshotterTest.groovy | 4 +- .../state/MinimalFileSetSnapshotterTest.groovy | 13 +- .../coerce/StringToEnumTransformerTest.groovy | 2 +- .../file/DefaultFileCollectionFactoryTest.groovy | 89 ++ .../internal/file/DefaultFileOperationsTest.groovy | 4 +- .../file/DefaultSourceDirectorySetTest.groovy | 21 +- .../internal/file/archive/TarCopyActionTest.java | 3 +- .../api/internal/file/archive/TarFileTreeTest.java | 7 +- .../internal/file/archive/ZipCopyActionTest.groovy | 5 +- .../api/internal/file/archive/ZipFileTreeTest.java | 3 +- .../DefaultConfigurableFileTreeTest.groovy | 20 +- .../collections/DefaultDirectoryWalkerTest.java | 5 +- .../jdk7/Jdk7DirectoryWalkerTest.groovy | 33 + .../internal/tasks/DefaultTaskContainerTest.groovy | 2 +- .../options/InstanceOptionDescriptorSpec.groovy | 63 +- .../internal/tasks/options/OptionReaderTest.groovy | 23 +- .../util/internal/PatternSpecFactoryTest.groovy | 79 + .../DefaultScriptPluginFactoryTest.groovy | 4 +- .../CommandLineTaskConfigurerSpec.groovy | 2 +- .../gradle/groovy/scripts/DefaultScriptTest.groovy | 3 + .../internal/BuildScriptTransformerSpec.groovy | 1 + .../DefaultGradlePropertiesLoaderTest.java | 15 + .../DefaultFileSystemChangeWaiterTest.groovy | 65 +- .../service/scopes/BuildScopeServicesTest.groovy | 2 + .../scopes/BuildSessionScopeServicesTest.groovy | 4 + .../service/scopes/ProjectScopeServicesTest.groovy | 2 + .../scopes/TaskExecutionServicesTest.groovy | 4 + .../typeconversion/DefaultTypeConverterTest.groovy | 2 +- .../EnumFromCharSequenceNotationParserSpec.groovy | 26 +- .../process/internal/DefaultExecHandleSpec.groovy | 3 +- .../process/internal/ExecHandleBuilderTest.groovy | 3 +- .../org/gradle/api/internal/file/TestFiles.java | 33 +- .../UnsupportedConfigurationMutationTest.groovy | 5 +- .../AbstractHttpsRepoResolveIntegrationTest.groovy | 35 +- .../AbstractProxyResolveIntegrationTest.groovy | 193 ++- .../http/HttpProxyResolveIntegrationTest.groovy | 13 +- .../http/HttpsProxyResolveIntegrationTest.groovy | 33 +- .../ivy/IvyHttpsRepoResolveIntegrationTest.groovy | 11 +- .../MavenHttpsRepoResolveIntegrationTest.groovy | 11 +- .../DefaultDependencyManagementServices.java | 6 +- .../configurations/DefaultConfiguration.java | 13 +- .../DefaultConfigurationContainer.java | 14 +- .../configurations/RunnableMutationValidator.java | 2 +- .../parser/IvyXmlModuleDescriptorParser.java | 2 +- .../strategy/MavenVersionSelectorScheme.java | 2 +- .../ivyresolve/strategy/VersionParser.java | 2 +- .../artifact/DefaultResolvedArtifactResults.java | 14 +- .../artifacts/result/jvm/AbstractArtifact.java | 51 - .../model/DefaultIvyModulePublishMetaData.java | 2 +- .../component/model/DefaultDependencyMetaData.java | 4 +- .../resource/cached/ivy/AbstractCachedIndex.java | 2 +- .../DefaultConfigurationContainerSpec.groovy | 8 +- .../DefaultConfigurationContainerTest.groovy | 5 +- .../configurations/DefaultConfigurationSpec.groovy | 9 +- ...onfigurationComponentMetaDataBuilderTest.groovy | 5 +- .../DefaultArtifactResolutionQueryTest.groovy | 4 +- .../model/DefaultLocalComponentMetaDataTest.groovy | 3 +- .../model/ModelReportIntegrationTest.groovy | 12 +- .../DependencyReportTaskIntegrationTest.groovy | 9 +- .../diagnostics/HelpTaskIntegrationTest.groovy | 14 + .../listsCommonDynamicAvailableValues/build.gradle | 4 +- .../sortsOptionsBySpecifiedOrder/build.gradle | 22 + .../org/gradle/api/plugins/HelpTasksPlugin.java | 10 + .../gradle/api/plugins/ProjectReportsPlugin.java | 1 + .../plugins/internal/HelpTasksAutoApplyAction.java | 1 + .../api/reporting/components/ComponentReport.java | 6 +- .../internal/AbstractBinaryRenderer.java | 1 + .../components/internal/ComponentRenderer.java | 16 +- .../internal/ComponentReportRenderer.java | 40 +- .../components/internal/DiagnosticsServices.java | 5 + .../internal/TrackingReportRenderer.java | 43 + .../dependencies/HtmlDependencyReportTask.java | 2 + .../internal/DefaultDependencyReportContainer.java | 1 + .../internal/StrictDependencyResultSpec.java | 1 + .../gradle/api/reporting/model/ModelReport.java | 24 +- .../model/internal/ModelNodeRenderer.java | 45 +- .../diagnostics/AbstractDependencyReportTask.java | 4 +- .../api/tasks/diagnostics/PropertyReportTask.java | 2 + .../api/tasks/diagnostics/TaskReportTask.java | 2 + .../AggregateMultiProjectTaskReportModel.java | 6 + .../internal/DefaultGroupTaskReportModel.java | 2 + .../internal/SingleProjectTaskReportModel.java | 8 +- .../diagnostics/internal/TextReportRenderer.java | 6 + .../AsciiDependencyReportRenderer.java | 4 + .../internal/dsl/DependencyResultSpec.java | 1 + .../dsl/DependencyResultSpecNotationConverter.java | 3 +- .../internal/graph/SimpleNodeRenderer.java | 1 + .../nodes/AbstractRenderableDependencyResult.java | 3 + .../nodes/AbstractRenderableModuleResult.java | 5 + .../graph/nodes/DependencyReportHeader.java | 5 + .../nodes/InvertedRenderableModuleResult.java | 1 + .../graph/nodes/RenderableDependencyResult.java | 2 + .../graph/nodes/RenderableModuleResult.java | 3 +- .../RenderableUnresolvedDependencyResult.java | 5 + .../internal/graph/nodes/RequestedVersion.java | 2 + .../graph/nodes/ResolvedDependencyEdge.java | 6 + .../graph/nodes/UnresolvedDependencyEdge.java | 6 + .../internal/insight/DependencyResultSorter.java | 1 + .../internal/text/DefaultTextReportBuilder.java | 8 + .../gradle/configuration/TaskDetailPrinter.java | 53 +- .../internal/ComponentRendererTest.groovy | 8 +- .../internal/ComponentReportRendererTest.groovy | 3 +- .../reporting/model/ModelReportParserTest.groovy | 25 + .../AbstractComponentReportIntegrationTest.groovy | 3 +- .../api/reporting/model/ModelReportParser.groovy | 11 + .../org/gradle/DistributionIntegrationSpec.groovy | 2 +- subprojects/docs/docs.gradle | 7 +- ....gradle.api.tasks.scala.ScalaCompileOptions.xml | 2 +- .../dsl/org.gradle.buildinit.tasks.InitBuild.xml | 6 +- .../dsl/org.gradle.platform.base.BinarySpec.xml | 21 +- .../dsl/org.gradle.platform.base.ComponentSpec.xml | 22 - ...rg.gradle.platform.base.SourceComponentSpec.xml | 25 + ...g.gradle.platform.base.VariantComponentSpec.xml | 25 + ...org.gradle.plugins.ide.idea.model.IdeaModel.xml | 5 +- .../docs/src/docs/release/notes-template.md | 2 +- subprojects/docs/src/docs/release/notes.md | 299 ++-- .../docs/src/docs/userguide/buildInitPlugin.xml | 1 + .../src/docs/userguide/buildingJavaLibraries.xml | 13 +- .../userguide/img/javaPluginConfigurations.graphml | 205 ++- .../userguide/img/javaPluginConfigurations.png | Bin 20942 -> 27423 bytes .../docs/src/docs/userguide/installation.xml | 5 +- subprojects/docs/src/docs/userguide/javaPlugin.xml | 61 +- .../docs/src/docs/userguide/scalaPlugin.xml | 57 +- .../docs/src/docs/userguide/softwareModel.xml | 24 +- .../src/docs/userguide/softwareModelExtend.xml | 20 +- .../samples/customModel/componentType/build.gradle | 6 +- .../samples/customModel/internalViews/build.gradle | 6 +- .../documentation/DocumentationComponent.groovy | 4 +- .../documentation/DocumentationPlugin.groovy | 15 +- .../groovy/sample/markdown/MarkdownPlugin.groovy | 11 +- .../docs/src/samples/ivypublish/build.gradle | 2 +- .../targetplatforms/core/build.gradle | 2 +- .../javaLibraryPlugin/toolchains/build.gradle} | 31 +- .../modelRules/ruleSourcePluginEach/build.gradle | 47 + .../docs/src/samples/scala/force/build.gradle | 22 + .../docs/src/samples/scala/force/readme.xml | 3 + .../main/scala/org/gradle/sample/api/Person.scala | 0 .../scala/org/gradle/sample/impl/PersonImpl.scala | 0 .../org/gradle/sample/impl/PersonImplTest.scala | 14 + .../docs/src/samples/scala/fsc/build.gradle | 28 - subprojects/docs/src/samples/scala/fsc/readme.xml | 3 - .../docs/src/samples/scala/zinc/build.gradle | 6 - .../userguide/scala/ideaTargetVersion/build.gradle | 8 + .../javaLibraryTargetPlatforms-java6MainJar.out | 2 +- .../javaLibraryTargetPlatforms-server.out | 2 +- .../userguideOutput/javaLibraryTargetPlatforms.out | 2 +- .../softwareModelExtend-components.out | 4 +- .../softwareModelExtend-iv-model.out | 33 +- ...VisualStudioSingleProjectIntegrationTest.groovy | 4 +- .../ide/visualstudio/VisualStudioProject.java | 5 +- .../ide/visualstudio/VisualStudioSolution.java | 5 +- .../internal/DefaultVisualStudioExtension.java | 11 +- .../internal/DefaultVisualStudioProject.groovy | 14 +- .../internal/DefaultVisualStudioSolution.groovy | 14 +- .../internal/VisualStudioProjectRegistry.java | 16 +- .../internal/VisualStudioSolutionRegistry.java | 8 +- .../visualstudio/plugins/VisualStudioPlugin.java | 13 +- .../internal/RelativeFileNameTransformer.java | 1 + .../internal/DefaultVisualStudioProjectTest.groovy | 18 +- .../VisualStudioProjectRegistryTest.groovy | 4 +- .../internal/VisualStudioSolutionFileTest.groovy | 3 +- .../eclipse/EclipseClasspathIntegrationTest.groovy | 69 +- .../EclipseWtpWebProjectIntegrationTest.groovy | 4 +- .../plugins/ide/idea/IdeaIntegrationTest.groovy | 37 +- .../IdeaJavaLanguageSettingsIntegrationTest.groovy | 250 ++- .../ide/idea/IdeaModuleIntegrationTest.groovy | 35 +- .../plugins/ide/idea/IdeaProjectFixture.groovy | 8 +- .../build.gradle | 6 +- .../project1/build.gradle | 2 +- .../project2/build.gradle | 2 +- .../project3/build.gradle | 2 +- .../settings.gradle | 2 +- .../build.gradle | 0 .../project1/build.gradle | 0 .../project2/build.gradle | 0 .../project3}/build.gradle | 0 .../settings.gradle | 0 .../canCreateAndDeleteMetaData/build.gradle | 2 +- .../expectedFiles/root.ipr.xml | 3 +- .../expectedFiles/root.ipr.xml | 3 +- .../expectedFiles/root.ipr.xml | 3 +- .../expectedFiles/root/root.ipr.xml | 1 + .../plugins/ide/eclipse/EclipsePlugin.groovy | 2 +- .../plugins/ide/eclipse/EclipseWtpPlugin.groovy | 5 +- .../eclipse/model/internal/ClasspathFactory.groovy | 6 +- .../model/internal/ProjectDependencyBuilder.groovy | 41 - .../model/internal/ProjectDependencyBuilder.java | 54 + .../org/gradle/plugins/ide/idea/IdeaPlugin.groovy | 62 +- .../ide/idea/internal/IdeaScalaConfigurer.groovy | 63 +- .../gradle/plugins/ide/idea/model/IdeaModel.groovy | 5 + .../plugins/ide/idea/model/IdeaModule.groovy | 56 +- .../plugins/ide/idea/model/IdeaProject.groovy | 58 +- .../gradle/plugins/ide/idea/model/Module.groovy | 6 +- .../plugins/ide/idea/model/PathFactory.groovy | 22 +- .../gradle/plugins/ide/idea/model/Project.groovy | 46 +- .../plugins/ide/idea/model/ProjectLibrary.groovy | 30 + .../idea/model/internal/GeneratedIdeaScope.java | 3 +- .../model/internal/IdeaDependenciesProvider.java | 6 +- .../model/internal/ModuleDependencyBuilder.java | 6 +- .../ide/internal/IdeDependenciesExtractor.java | 4 +- .../ide/internal/tooling/EclipseModelBuilder.java | 42 +- .../ide/internal/tooling/IdeaModelBuilder.java | 9 +- .../resolver/DefaultIdeDependencyResolver.java | 8 +- .../ide/internal/resolver/model/IdeDependency.java | 8 +- .../model/IdeExtendedRepoFileDependency.java | 6 +- .../resolver/model/IdeLocalFileDependency.java | 4 +- .../resolver/model/IdeProjectDependency.java | 3 +- .../resolver/model/IdeRepoFileDependency.java | 3 +- .../model/UnresolvedIdeRepoFileDependency.java | 4 +- .../plugins/ide/eclipse/EclipsePluginTest.groovy | 6 +- .../ide/eclipse/EclipseWtpPluginTest.groovy | 10 +- .../internal/ProjectDependencyBuilderTest.groovy | 9 +- .../plugins/ide/idea/model/IdeaModuleTest.groovy | 83 +- .../plugins/ide/idea/model/ProjectTest.groovy | 47 +- .../internal/IdeaDependenciesProviderTest.groovy | 59 +- .../internal/ModuleDependencyBuilderTest.groovy | 8 +- .../tooling/eclipse/EclipseModelBuilderTest.groovy | 14 + .../tooling/idea/IdeaModelBuilderTest.groovy | 39 +- ...JavaCompileOnlyDependencyIntegrationTest.groovy | 189 +++ ...gacyAndComponentJvmPluginIntegrationTest.groovy | 4 +- .../MixedNativeAndJvmProjectIntegrationTest.groovy | 4 +- .../integtests/ProjectLayoutIntegrationTest.groovy | 12 +- .../internal-integ-testing.gradle | 5 +- .../AbstractHttpDependencyResolutionTest.groovy | 11 +- .../fixtures/AbstractMultiTestRunner.java | 2 +- .../integtests/fixtures/AvailableJavaHomes.java | 12 +- .../ForkScalaCompileInDaemonModeFixture.groovy | 60 - .../fixtures/KillProcessAvailability.groovy | 4 +- .../org/gradle/integtests/fixtures/Sample.java | 3 +- .../integtests/fixtures/ScriptExecuter.groovy | 5 + .../fixtures/ZincScalaCompileFixture.groovy | 48 + .../fixtures/daemon/AbstractDaemonFixture.groovy | 4 +- .../fixtures/executer/ForkingGradleExecuter.java | 3 +- .../executer/OutputScrapingGradleHandle.java | 2 +- .../fixtures/jvm/InstalledJvmLocator.java | 3 +- .../fixtures/jvm/OsXInstalledJvmLocator.java | 9 +- .../fixtures/server/http/TestProxyServer.groovy | 104 +- .../org/gradle/test/fixtures/file/TestFile.java | 11 +- .../gradle/testing/internal/util/RetryRule.groovy | 12 +- .../org/gradle/util/JUnit4GroovyMockery.java | 4 +- .../groovy/org/gradle/util/TestPrecondition.groovy | 14 +- .../testing/internal/util/RetryRuleTest.groovy | 13 + .../api/publish/ivy/IvyPublishJavaIntegTest.groovy | 1 + .../IvyJavaProjectPublishIntegrationTest.groovy | 4 +- .../internal/artifact/DefaultIvyArtifactSet.java | 21 +- .../publication/DefaultIvyPublication.java | 5 +- .../publisher/DependencyResolverIvyPublisher.java | 2 +- .../api/publish/ivy/plugins/IvyPublishPlugin.java | 7 +- .../publication/DefaultIvyPublicationTest.groovy | 5 +- .../api/plugins/jetty/AbstractJettyRunTask.java | 2 +- .../internal/tasks/compile/ApiGroovyCompiler.java | 1 + .../compile/DefaultGroovyJavaJointCompileSpec.java | 3 + .../GroovyCompileTransformingClassLoader.java | 3 + .../tasks/compile/GroovyCompilerFactory.java | 1 + .../tasks/compile/NormalizingGroovyCompiler.java | 12 +- .../gradle/api/tasks/compile/GroovyCompile.java | 1 + .../api/tasks/compile/GroovyCompileOptions.java | 1 + ...ustomComponentJarBinariesIntegrationTest.groovy | 8 +- ...braryDependencyResolutionIntegrationTest.groovy | 2 +- ...guageDependencyResolutionIntegrationTest.groovy | 2 +- .../MultipleBinaryTypesWithVariantsTest.groovy | 18 +- .../VariantAwareDependencyResolutionSpec.groovy | 18 +- .../api/internal/tasks/DefaultJavaToolChain.java | 10 +- .../tasks/compile/AntDependsStaleClassCleaner.java | 1 + .../tasks/compile/CleaningJavaCompiler.java | 1 + .../tasks/compile/CleaningJavaCompilerSupport.java | 1 + .../tasks/compile/CommandLineJavaCompiler.java | 1 + .../CommandLineJavaCompilerArgumentsGenerator.java | 26 +- .../tasks/compile/DefaultJavaCompileSpec.java | 3 + .../compile/DefaultJavaCompileSpecFactory.java | 3 + .../tasks/compile/DefaultJavaCompilerFactory.java | 2 + .../internal/tasks/compile/JavaCompileSpec.java | 1 + .../compile/JavaCompilerArgumentsBuilder.java | 12 +- .../compile/JavaHomeBasedJavaCompilerFactory.java | 4 + .../internal/tasks/compile/JdkJavaCompiler.java | 1 + .../tasks/compile/NormalizingJavaCompiler.java | 1 + .../IncrementalCompilationFinalizer.java | 3 +- .../incremental/IncrementalCompilerDecorator.java | 4 +- .../incremental/RecompilationNotNecessary.java | 1 + .../incremental/RecompilationSpecProvider.java | 1 + .../compile/incremental/SelectiveCompiler.java | 1 + .../analyzer/CachingClassDependenciesAnalyzer.java | 1 + .../analyzer/ClassAnalysisSerializer.java | 2 + .../incremental/analyzer/ClassFilesAnalyzer.java | 4 +- .../analyzer/DefaultClassDependenciesAnalyzer.java | 1 + .../cache/DefaultGeneralCompileCaches.java | 4 +- .../incremental/deps/ClassSetAnalysisData.java | 4 + .../incremental/deps/DefaultDependentsSet.java | 3 + .../compile/incremental/deps/DependencyToAll.java | 5 +- .../deps/LocalClassSetAnalysisStore.java | 4 +- .../incremental/jar/CachingJarSnapshotter.java | 3 +- .../incremental/jar/DefaultJarSnapshotCache.java | 5 +- .../jar/JarClasspathSnapshotDataSerializer.java | 2 + .../incremental/jar/JarClasspathSnapshotMaker.java | 4 +- .../incremental/jar/JarSnapshotDataSerializer.java | 4 +- .../gradle/api/tasks/compile/CompileOptions.java | 1 + .../org/gradle/api/tasks/compile/JavaCompile.java | 20 +- .../tasks/javadoc/internal/JavadocGenerator.java | 3 +- .../external/javadoc/CoreJavadocOptions.java | 55 + .../javadoc/StandardJavadocDocletOptions.java | 9 + .../internal/AbstractJavadocOptionFileOption.java | 3 + .../AbstractListJavadocOptionFileOption.java | 3 + .../internal/BooleanJavadocOptionFileOption.java | 1 + .../internal/EnumJavadocOptionFileOption.java | 1 + .../internal/FileJavadocOptionFileOption.java | 1 + .../internal/GroupsJavadocOptionFileOption.java | 1 + .../LinksOfflineJavadocOptionFileOption.java | 1 + .../MultilineStringsJavadocOptionFileOption.java | 1 + .../OptionLessStringsJavadocOptionFileOption.java | 3 + .../internal/PathJavadocOptionFileOption.java | 1 + .../internal/StringJavadocOptionFileOption.java | 1 + .../internal/StringsJavadocOptionFileOption.java | 1 + .../org/gradle/language/java/JavaSourceSet.java | 3 +- .../internal/DefaultJavaLanguageSourceSet.java | 4 - .../JavaLanguagePluginServiceRegistry.java | 5 + .../internal/JavaToolChainServiceRegistry.java | 5 + .../language/java/plugins/JavaLanguagePlugin.java | 96 +- .../language/java/tasks/PlatformJavaCompile.java | 1 + .../tasks/compile/CompileSpecToArguments.java | 4 +- .../compile/DefaultJvmLanguageCompileSpec.java | 14 + .../tasks/compile/ExecSpecBackedArgCollector.java | 4 +- .../compile/daemon/AbstractDaemonCompiler.java | 1 + .../tasks/compile/daemon/CompileResult.java | 1 + .../tasks/compile/daemon/CompilerDaemonClient.java | 3 + .../compile/daemon/CompilerDaemonManager.java | 4 +- .../tasks/compile/daemon/CompilerDaemonServer.java | 7 +- .../daemon/InProcessCompilerDaemonFactory.java | 2 + .../DefaultJvmResourceLanguageSourceSet.java | 2 +- .../language/jvm/internal/EmptyClasspath.java | 2 + .../jvm/internal/JvmPluginServiceRegistry.java | 5 + .../language/jvm/plugins/JvmResourcesPlugin.java | 22 +- ...eLanguageIncrementalBuildIntegrationTest.groovy | 39 +- ...ctNativePreCompiledHeaderIntegrationTest.groovy | 2 +- .../DuplicateBaseNamesIntegrationTest.groovy | 4 +- ...yLanguageIncrementalBuildIntegrationTest.groovy | 2 +- .../NativeLanguageSamplesIntegrationTest.groovy | 4 +- .../ObjectiveCUnsupportedIntegrationTest.groovy | 2 +- .../ObjectiveCppUnsupportedIntegrationTest.groovy | 2 +- ...ResourcesIncrementalBuildIntegrationTest.groovy | 4 +- .../rc/WindowsResourcesIntegrationTest.groovy | 4 +- ...ndowsResourcesUnsupportedIntegrationTest.groovy | 2 +- .../language/assembler/AssemblerSourceSet.java | 3 +- .../internal/DefaultAssemblerSourceSet.java | 27 - .../assembler/plugins/AssemblerLangPlugin.java | 20 +- .../assembler/plugins/AssemblerPlugin.java | 1 + .../plugins/internal/AssembleTaskConfig.java | 3 + .../language/c/internal/DefaultCSourceSet.java | 4 - .../org/gradle/language/c/plugins/CLangPlugin.java | 21 +- .../org/gradle/language/c/plugins/CPlugin.java | 1 + .../language/cpp/internal/DefaultCppSourceSet.java | 4 +- .../gradle/language/cpp/plugins/CppLangPlugin.java | 21 +- .../org/gradle/language/cpp/plugins/CppPlugin.java | 1 + .../AbstractHeaderExportingDependentSourceSet.java | 4 +- .../internal/AbstractHeaderExportingSourceSet.java | 13 +- .../internal/AbstractNativeCompileSpec.java | 45 +- .../nativeplatform/internal/CompileTaskConfig.java | 6 +- .../internal/NativeLanguageTransform.java | 4 +- .../internal/SourceCompileTaskConfig.java | 1 + .../internal/incremental/CompilationFileState.java | 14 +- .../incremental/CompilationStateSerializer.java | 28 +- .../DefaultCompilationStateCacheFactory.java | 4 + .../incremental/DefaultIncrementalCompilation.java | 16 +- .../incremental/DefaultSourceIncludesParser.java | 11 +- .../incremental/DefaultSourceIncludesResolver.java | 51 +- .../incremental/IncrementalCompilation.java | 5 +- .../incremental/IncrementalCompileProcessor.java | 37 +- .../incremental/IncrementalNativeCompiler.java | 29 +- .../internal/incremental/SourceIncludesParser.java | 4 +- .../incremental/SourceIncludesResolver.java | 15 +- .../incremental/sourceparser/CSourceParser.java | 4 +- ...Includes.java => DefaultIncludeDirectives.java} | 11 +- .../sourceparser/PreprocessingReader.java | 1 + .../sourceparser/RegexBackedCSourceParser.java | 7 +- .../internal/registry/NativeLanguageServices.java | 5 + .../tasks/AbstractNativeCompileTask.java | 3 +- .../tasks/AbstractNativePCHCompileTask.java | 2 +- .../tasks/AbstractNativeSourceCompileTask.java | 2 +- .../internal/DefaultObjectiveCSourceSet.java | 4 +- .../objectivec/plugins/ObjectiveCLangPlugin.java | 21 +- .../objectivec/plugins/ObjectiveCPlugin.java | 1 + .../internal/DefaultObjectiveCppSourceSet.java | 4 +- .../plugins/ObjectiveCppLangPlugin.java | 21 +- .../objectivecpp/plugins/ObjectiveCppPlugin.java | 1 + .../rc/internal/DefaultWindowsResourceSet.java | 2 +- .../rc/plugins/WindowsResourceScriptPlugin.java | 20 +- .../rc/plugins/WindowsResourcesPlugin.java | 1 + .../WindowsResourcesCompileTaskConfig.java | 3 + .../language/rc/tasks/WindowsResourceCompile.java | 3 +- .../gradle/language/c/tasks/CCompileTest.groovy | 4 +- .../cpp/internal/DefaultCppSourceSetTest.groovy | 8 +- .../CompilationStateSerializerTest.groovy | 20 +- .../DefaultSourceIncludesParserTest.groovy | 4 +- .../DefaultSourceIncludesResolverTest.groovy | 11 +- .../IncrementalCompileProcessorTest.groovy | 31 +- .../IncrementalNativeCompilerTest.groovy | 10 +- .../sourceparser/DefaultSourceIncludesTest.groovy | 2 +- .../scala/DefaultScalaJavaJointCompileSpec.java | 3 + .../tasks/scala/NormalizingScalaCompiler.java | 1 + .../internal/tasks/scala/ZincScalaCompiler.java | 11 + .../scala/internal/DefaultScalaJvmAssembly.java | 6 + .../internal/DefaultScalaLanguageSourceSet.java | 4 - .../scala/internal/DefaultScalaPlatform.java | 4 + .../toolchain/DefaultScalaToolProvider.java | 3 + .../toolchain/DownloadingScalaToolChain.java | 3 + .../toolchain/ScalaToolChainServiceRegistry.java | 5 + .../scala/plugins/ScalaLanguagePlugin.java | 21 +- .../language/scala/tasks/AbstractScalaCompile.java | 3 +- .../scala/tasks/BaseScalaCompileOptions.java | 11 +- ...ngesDuringBuildContinuousIntegrationTest.groovy | 22 +- ...nuousBuildChangeReportingIntegrationTest.groovy | 79 +- .../SimpleJavaContinuousIntegrationTest.groovy | 4 + .../SmokeContinuousIntegrationTest.groovy | 52 + .../jdk7/SymlinkContinuousIntegrationTest.groovy | 9 +- .../org/gradle/launcher/bootstrap/EntryPoint.java | 2 +- .../gradle/launcher/cli/BuildActionsFactory.java | 1 + .../daemon/client/DaemonClientServicesSupport.java | 2 +- .../daemon/client/DefaultDaemonStarter.java | 3 + .../daemon/configuration/DaemonParameters.java | 10 +- .../launcher/daemon/protocol/InputMessage.java | 2 +- .../gradle/launcher/daemon/protocol/Result.java | 2 +- .../org/gradle/launcher/daemon/server/Daemon.java | 8 +- .../daemon/server/DaemonServerConnector.java | 2 +- .../daemon/server/DaemonTcpServerConnector.java | 19 +- .../daemon/server/exec/BuildCommandOnly.java | 2 +- .../ClientSidePayloadClassLoaderFactory.java | 2 +- .../configuration/DaemonParametersTest.groovy | 14 + .../AbstractContinuousIntegrationTest.groovy | 53 +- .../maven/MavenPublishHttpsIntegTest.groovy | 1 - .../publish/maven/MavenPublishJavaIntegTest.groovy | 5 +- .../MavenJavaProjectPublishIntegrationTest.groovy | 42 +- .../internal/artifact/DefaultMavenArtifactSet.java | 21 +- .../publication/DefaultMavenPublication.java | 5 +- .../internal/publisher/AbstractMavenPublisher.java | 2 +- .../publish/maven/plugins/MavenPublishPlugin.java | 7 +- .../maven/tasks/AbstractPublishToMaven.java | 2 +- .../publication/DefaultMavenPublicationTest.groovy | 5 +- .../messaging/dispatch/ProxyDispatchAdapter.java | 4 +- .../gradle/model/ModelMapIntegrationTest.groovy | 159 +- ...SourceAppliedByRuleMethodIntegrationTest.groovy | 762 +++++----- .../managed/ManagedModelMapIntegrationTest.groovy | 2 +- .../ManagedScalarCollectionsIntegrationTest.groovy | 6 +- .../model/managed/ModelSetIntegrationTest.groovy | 4 +- .../src/main/java/org/gradle/model/Each.java} | 19 +- .../src/main/java/org/gradle/model/RuleSource.java | 2 - .../gradle/model/WriteOnlyModelViewException.java | 29 +- .../internal/core/ChainingModelProjection.java | 1 + .../core/ChildNodeInitializerStrategy.java | 3 +- .../internal/core/DefaultModelRegistration.java | 1 + .../model/internal/core/DefaultModelViewState.java | 16 +- .../core/DefaultNodeInitializerRegistry.java | 2 +- .../model/internal/core/InstanceModelView.java | 3 + .../internal/core/ModelMapModelProjection.java | 4 +- .../org/gradle/model/internal/core/ModelMaps.java | 2 +- .../org/gradle/model/internal/core/ModelPath.java | 2 + .../model/internal/core/ModelRegistrations.java | 2 +- .../model/internal/core/ModelViewFactory.java | 2 +- .../gradle/model/internal/core/ModelViewState.java | 4 +- .../model/internal/core/MutableModelNode.java | 6 +- .../model/internal/core/NodeBackedModelMap.java | 39 +- .../model/internal/core/NodeBackedModelSet.java | 3 +- .../internal/core/NodeInitializerContext.java | 20 +- .../core/SpecializedModelMapProjection.java | 2 +- .../TypeCompatibilityModelProjectionSupport.java | 2 + .../rule/describe/MethodModelRuleDescriptor.java | 1 + .../rule/describe/NestedModelRuleDescriptor.java | 1 + .../rule/describe/SimpleModelRuleDescriptor.java | 1 + ...AbstractAnnotationDrivenModelRuleExtractor.java | 17 +- .../inspect/AbstractExtractedModelRule.java} | 17 +- .../AbstractModelCreationRuleExtractor.java | 15 +- .../AbstractMutationModelRuleExtractor.java | 19 +- .../inspect/DefaultMethodRuleDefinition.java | 20 +- .../internal/inspect/DefaultModelRuleInvoker.java | 1 + ...efaultRuleSourceValidationProblemCollector.java | 3 + .../model/internal/inspect/ExtractedModelRule.java | 2 + .../inspect/FactoryBasedStructNodeInitializer.java | 8 +- .../inspect/ManagedChildNodeCreatorStrategy.java | 3 +- .../inspect/ManagedModelCreationRuleExtractor.java | 6 +- .../inspect/MethodModelRuleApplicationContext.java | 5 +- .../inspect/MethodModelRuleExtractors.java | 2 +- .../internal/inspect/MethodRuleDefinition.java | 2 + .../model/internal/inspect/ModelRuleExtractor.java | 7 +- .../internal/inspect/RuleApplicationScope.java | 71 + .../inspect/RuleDefinitionRuleExtractor.java | 21 +- .../model/internal/inspect/RuleExtractorUtils.java | 58 + .../internal/inspect/StructNodeInitializer.java | 2 +- .../UnmanagedModelCreationRuleExtractor.java | 7 +- .../binding/AbstractStructMethodBinding.java | 1 + .../internal/manage/binding/ManagedProperty.java | 5 + .../manage/projection/ManagedModelProjection.java | 30 +- .../manage/schema/AbstractStructSchema.java | 2 + .../manage/schema/ScalarCollectionSchema.java | 17 +- .../DefaultModelSchemaExtractionContext.java | 4 + .../extract/DefaultModelSchemaExtractor.java | 6 +- .../schema/extract/DefaultModelSchemaStore.java | 1 + .../manage/schema/extract/EnumStrategy.java | 1 + ...sedStructNodeInitializerExtractionStrategy.java | 52 +- .../schema/extract/JavaUtilCollectionStrategy.java | 1 + .../schema/extract/JdkValueTypeStrategy.java | 1 + .../schema/extract/ManagedImplStructStrategy.java | 1 + .../ModelMapNodeInitializerExtractionStrategy.java | 5 +- .../manage/schema/extract/ModelMapStrategy.java | 1 + .../ModelSetNodeInitializerExtractionStrategy.java | 4 +- .../manage/schema/extract/ModelSetStrategy.java | 1 + .../manage/schema/extract/PrimitiveStrategy.java | 1 + .../schema/extract/ScalarCollectionModelView.java | 109 ++ ...ollectionNodeInitializerExtractionStrategy.java | 206 +-- .../extract/SpecializedMapNodeInitializer.java | 2 +- .../StructSchemaExtractionStrategySupport.java | 1 + .../internal/registry/DefaultModelRegistry.java | 29 +- .../model/internal/registry/ModelElementNode.java | 13 +- .../gradle/model/internal/registry/ModelGraph.java | 2 +- .../model/internal/registry/ModelNodeInternal.java | 4 + .../registry/ModelPathSuggestionProvider.java | 2 + .../internal/registry/ModelReferenceNode.java | 14 +- .../model/internal/registry/ModelRegistry.java | 23 + .../internal/registry/ModelRegistryInternal.java | 6 +- .../registry/OneOfTypeBinderCreationListener.java | 1 + .../registry/PathBinderCreationListener.java | 1 + .../model/internal/registry/RuleContext.java | 4 +- .../BaseInstanceFactory.java | 211 +-- .../InstanceFactory.java | 39 +- .../InstanceBackedModelRegistrationTest.groovy | 2 +- .../internal/inspect/ModelRuleBindingTest.groovy | 2 +- .../internal/inspect/ModelRuleExtractorTest.groovy | 35 +- .../inspect/RuleDefinitionRuleExtractorTest.groovy | 82 +- .../registry/DefaultModelRegistryTest.groovy | 93 +- .../registry/EachBeanViaDirectRule.groovy} | 17 +- .../registry/EachBeanViaRuleSource.groovy} | 18 +- .../model/internal/registry/RegistrySpec.groovy | 2 +- .../model/internal/registry/ScopedRuleTest.groovy | 5 + .../BaseInstanceFactoryTest.groovy | 133 +- .../internal/fixture/ModelRegistryHelper.java | 4 +- .../fixture/ModelRegistryHelperExtension.java | 5 +- .../ClosureCreationInterceptingVerifier.java | 1 + .../console/FallbackConsoleMetaData.java | 3 + .../console/NativePlatformConsoleDetector.java | 1 + .../console/NativePlatformConsoleMetaData.java | 3 + .../console/NoOpConsoleDetector.java | 1 + .../console/UnixConsoleMetaData.java | 3 + .../console/WindowsConsoleDetector.java | 1 + .../filesystem/jdk7/Jdk7FileCanonicalizer.java | 1 + .../jdk7/PosixJdk7FilePermissionHandler.java | 2 + .../filesystem/services/EmptyChmod.java | 1 + .../services/FallbackFileCanonicalizer.java | 1 + .../filesystem/services/FallbackStat.java | 1 + .../filesystem/services/GenericFileSystem.java | 5 + .../services/NativePlatformBackedChmod.java | 1 + .../services/NativePlatformBackedStat.java | 1 + .../services/NativePlatformBackedSymlink.java | 2 + .../services/UnsupportedFilePermissions.java | 2 + .../filesystem/services/UnsupportedSymlink.java | 2 + .../filesystem/services/WindowsSymlink.java | 2 + .../jna/UnsupportedEnvironment.java | 10 + .../AbstractProcessEnvironment.java | 8 + .../NativePlatformBackedProcessEnvironment.java | 2 + .../nativeintegration/services/NativeServices.java | 1 + .../internal/plugins/osgi/DefaultOsgiManifest.java | 2 +- .../api/plugins/osgi/OsgiPluginConvention.java | 2 +- subprojects/performance/performance.gradle | 55 +- .../BuildReceiptPluginPerformanceTest.groovy | 7 +- .../performance/FirstBuildPerformanceTest.groovy | 2 +- ...roovy => JavaCleanDaemonPerformanceTest.groovy} | 54 +- ... JavaConfigurationDaemonPerformanceTest.groovy} | 7 +- ...ovy => JavaConfigurationPerformanceTest.groovy} | 11 +- .../JavaFullAssembleDaemonPerformanceTest.groovy | 86 ++ ...y => JavaFullBuildDaemonPerformanceTest.groovy} | 22 +- ....groovy => JavaFullBuildPerformanceTest.groovy} | 13 +- ...avaPartialAssembleDaemonPerformanceTest.groovy} | 50 +- .../JavaSoftwareModelBuildPerformanceTest.groovy | 80 +- ...ChangesFullAssembleDaemonPerformanceTest.groovy | 53 + ...pToDateFullAssembleDaemonPerformanceTest.groovy | 81 + ...=> JavaUpToDateFullBuildPerformanceTest.groovy} | 13 +- .../performance/NativeBuildPerformanceTest.groovy | 7 +- .../OldJavaPluginBigProjectPerformanceTest.groovy | 52 - .../OldVsNewJavaPluginPerformanceTest.groovy | 73 - .../RealWorldNativePluginPerformanceTest.groovy | 4 +- .../templates/java-sw-model-project/build.gradle | 2 +- .../CrossVersionPerformanceTestRunnerTest.groovy | 62 +- .../AbstractCrossVersionPerformanceTest.groovy | 3 +- .../CrossVersionPerformanceTestRunner.groovy | 51 +- .../results/BaseCrossBuildResultsStore.java | 2 +- .../results/CrossVersionResultsStore.java | 2 +- .../AbstractComponentModelIntegrationTest.groovy | 17 +- .../language/base/BaseModelIntegrationTest.groovy | 26 +- .../BinariesLifecycleTaskIntegrationTest.groovy | 6 +- .../base/ComponentBinariesIntegrationTest.groovy | 4 +- .../ComponentBinarySourcesIntegrationTest.groovy | 8 +- .../base/ComponentModelIntegrationTest.groovy | 80 +- .../ComponentModelReportIntegrationTest.groovy | 142 +- .../base/ComponentSourcesIntegrationTest.groovy | 2 +- .../base/CustomBinaryIntegrationTest.groovy | 50 +- ...CustomBinaryInternalViewsIntegrationTest.groovy | 38 +- .../base/CustomBinaryTasksIntegrationTest.groovy | 12 +- .../CustomComponentBinariesIntegrationTest.groovy | 35 +- .../base/CustomComponentIntegrationTest.groovy | 187 ++- ...tomComponentInternalViewsIntegrationTest.groovy | 18 +- .../CustomComponentPluginIntegrationTest.groovy | 30 +- .../CustomComponentSourceSetIntegrationTest.groovy | 50 +- .../base/CustomManagedBinaryIntegrationTest.groovy | 8 +- ...precatedAnnotationErrorsIntegrationTest.groovy} | 43 +- .../base/FunctionalSourceSetIntegrationTest.groovy | 11 +- .../base/InternalViewsSampleIntegrationTest.groovy | 26 +- .../base/LanguageSourceSetIntegrationTest.groovy | 42 +- .../base/LanguageTypeIntegrationTest.groovy | 32 +- .../base/LanguageTypeSampleIntegrationTest.groovy | 4 +- .../VariantAspectExtractionIntegrationTest.groovy | 16 +- ...delElement.java => BuildableComponentSpec.java} | 19 +- ...nt.java => AbstractBuildableComponentSpec.java} | 37 +- .../LibraryResolutionErrorMessageBuilder.java | 28 +- .../resolve/LocalLibraryDependencyResolver.java | 24 +- .../gradle/language/base/LanguageSourceSet.java | 3 +- .../base/internal}/AbstractLanguageSourceSet.java | 54 +- .../base/internal/LanguageSourceSetFactory.java | 91 -- .../base/internal/SourceTransformTaskConfig.java | 1 - .../model/BinarySourceTransformations.java | 2 +- .../base/internal/model/ComponentRules.java | 124 -- .../DefaultLibraryLocalComponentMetaData.java | 4 +- .../language/base/internal/plugins/CleanRule.java | 2 + .../base/internal/registry/LanguageTransform.java | 6 +- .../registry/NamedLanguageRegistration.java | 41 - .../base/plugins/ComponentModelBasePlugin.java | 126 +- .../language/base/plugins/LanguageBasePlugin.java | 42 +- .../language/base/plugins/LifecycleBasePlugin.java | 1 + .../base/sources/BaseLanguageSourceSet.java | 113 +- .../org/gradle/platform/base/ApplicationSpec.java | 2 +- .../java/org/gradle/platform/base/BinarySpec.java | 19 +- .../java/org/gradle/platform/base/BinaryTasks.java | 4 +- .../java/org/gradle/platform/base/BinaryType.java | 21 +- .../gradle/platform/base/BinaryTypeBuilder.java | 26 - .../gradle/platform/base/ComponentBinaries.java | 6 +- .../org/gradle/platform/base/ComponentSpec.java | 22 +- .../platform/base/ComponentSpecContainer.java | 1 - .../org/gradle/platform/base/ComponentType.java | 2 +- .../gradle/platform/base/ComponentTypeBuilder.java | 27 - ...ecIdentifier.java => GeneralComponentSpec.java} | 9 +- .../org/gradle/platform/base/LanguageType.java | 19 +- .../gradle/platform/base/LibraryBinarySpec.java | 2 +- .../java/org/gradle/platform/base/LibrarySpec.java | 2 +- .../platform/base/PlatformAwareComponentSpec.java | 2 +- ...geTypeBuilder.java => SourceComponentSpec.java} | 16 +- .../java/org/gradle/platform/base/TypeBuilder.java | 2 +- .../platform/base/VariantComponentSpec.java} | 10 +- .../platform/base/binary/BaseBinarySpec.java | 87 +- .../base/binary/internal/BaseBinaryRules.java | 48 - .../base/binary/internal/BinarySpecFactory.java | 64 - .../platform/base/component/BaseComponentSpec.java | 98 +- .../component/internal/AbstractComponentSpec.java | 60 + .../component/internal/ComponentSpecFactory.java | 80 +- .../component/internal/DefaultComponentSpec.java | 76 + .../platform/base/internal/BinarySpecInternal.java | 7 +- .../base/internal/ComponentSpecIdentifier.java | 63 + .../base/internal/ComponentSpecInternal.java | 13 +- .../base/internal/DefaultBinaryNamingScheme.java | 7 +- .../internal/DefaultBinaryTasksCollection.java | 1 + .../internal/DefaultComponentSpecIdentifier.java | 55 +- .../HasIntermediateOutputsComponentSpec.java} | 22 +- .../PlatformAwareComponentSpecInternal.java | 2 +- .../base/internal/builder/TypeBuilderInternal.java | 2 +- ...nnotationDrivenComponentModelRuleExtractor.java | 21 +- .../registry/BinaryTasksModelRuleExtractor.java | 9 +- .../registry/BinaryTypeModelRuleExtractor.java | 75 - .../ComponentBinariesModelRuleExtractor.java | 19 +- .../ComponentModelBaseServiceRegistry.java | 13 +- .../registry/ComponentTypeModelRuleExtractor.java | 177 ++- ...actTypeBuilder.java => DefaultTypeBuilder.java} | 10 +- .../registry/DeprecatedAnnotationsInspector.java | 52 + .../registry/LanguageTypeModelRuleExtractor.java | 92 -- .../internal/registry/TypeModelRuleExtractor.java | 192 --- .../internal/toolchain/ToolChainAvailability.java | 4 + .../platform/base/plugins/BinaryBasePlugin.java | 91 +- .../platform/base/plugins/ComponentBasePlugin.java | 84 ++ .../language/base/internal/BareInternalView.java} | 9 +- .../ComponentTypeModelRuleExtractorTest.groovy | 94 +- .../language/base/internal/NotComponentSpec.java} | 9 +- .../language/base/internal/SomeOtherBuilder.java} | 9 +- .../LanguageTypeModelRuleExtractorTest.groovy | 107 +- .../plugins/ComponentModelBasePluginTest.groovy | 36 +- .../base/plugins/LanguageBasePluginTest.groovy | 7 +- .../base/sources/BaseLanguageSourceSetTest.groovy | 34 +- .../platform/base/binary/BaseBinarySpecTest.groovy | 14 +- .../base/component/BaseComponentSpecTest.groovy | 13 +- ...st.groovy => BuildableComponentSpecTest.groovy} | 12 +- .../DefaultComponentSpecIdentifierTest.groovy | 67 + ...AbstractAnnotationModelRuleExtractorTest.groovy | 14 +- .../BinaryTypeModelRuleExtractorTest.groovy | 105 +- .../ComponentBinariesModelRuleExtractorTest.groovy | 23 +- .../base/plugins/BinaryBasePluginTest.groovy | 7 +- .../base/plugins/ComponentBasePluginTest.groovy} | 26 +- .../sources/BaseLanguageSourceSetFixtures.groovy | 3 +- .../platform/base/binary/BaseBinaryFixtures.groovy | 7 +- .../base/component/BaseComponentFixtures.groovy | 8 +- .../plugin/AbstractLanguagePluginSpec.groovy | 30 +- ...ustomJarBinarySpecSubtypeIntegrationTest.groovy | 10 +- .../jvm/JdkDeclarationIntegrationTest.groovy | 158 ++ ...latformJvmComponentReportIntegrationTest.groovy | 8 +- .../java/archives/internal/DefaultAttributes.java | 12 + .../java/archives/internal/DefaultManifest.java | 11 +- .../internal/DefaultManifestMergeDetails.java | 9 +- .../internal/DefaultManifestMergeSpec.java | 9 +- .../org/gradle/jvm/internal/DefaultClasspath.java | 2 + .../gradle/jvm/internal/DefaultJarBinarySpec.java | 13 +- .../org/gradle/jvm/internal/DefaultJarFile.java | 10 +- .../gradle/jvm/internal/DefaultJvmAssembly.java | 13 +- .../gradle/jvm/internal/DefaultJvmBinarySpec.java | 7 +- .../gradle/jvm/internal/DefaultJvmLibrarySpec.java | 5 +- .../jvm/internal/DependencyResolvingClasspath.java | 10 +- .../org/gradle/jvm/internal/JarBinaryRules.java | 53 - .../main/java/org/gradle/jvm/internal/JarFile.java | 4 +- .../java/org/gradle/jvm/internal/JvmAssembly.java | 4 +- .../gradle/jvm/internal/JvmBinarySpecInternal.java | 1 + .../jvm/internal/services/PlatformJvmServices.java | 11 + .../jvm/platform/internal/DefaultJavaPlatform.java | 4 + .../org/gradle/jvm/plugins/JvmComponentPlugin.java | 184 ++- .../main/java/org/gradle/jvm/tasks/api/ApiJar.java | 3 - .../jvm/tasks/api/internal/ApiMemberSelector.java | 2 +- .../api/internal/SortingAnnotationVisitor.java | 2 +- .../java/org/gradle/jvm/toolchain/LocalJava.java} | 20 +- .../internal/DefaultJavaToolChainRegistry.java | 1 + .../jvm/toolchain/internal/InstalledJdk.java} | 10 +- .../toolchain/internal/InstalledJdkInternal.java | 46 + .../jvm/toolchain/internal/InstalledJre.java} | 11 +- .../toolchain/internal/JavaInstallationProbe.java | 321 ++++ .../toolchain/internal/LocalJavaInstallation.java} | 27 +- .../JvmLocalLibraryDependencyResolverTest.groovy | 9 +- .../internal/plugins/CreateJvmBinariesTest.groovy | 2 +- .../internal/JavaInstallationProbeTest.groovy | 193 +++ .../BinaryBuildTypesIntegrationTest.groovy | 4 +- .../BinaryFlavorsIntegrationTest.groovy | 2 +- .../NativeBinariesIntegrationTest.groovy | 5 +- .../NativePlatformSamplesIntegrationTest.groovy | 6 +- ...formNativeComponentReportIntegrationTest.groovy | 4 +- .../PrebuiltLibrariesIntegrationTest.groovy | 5 +- .../BinaryNativePlatformIntegrationTest.groovy | 6 +- .../InstallExecutableIntegrationTest.groovy | 4 +- .../GeneratedSourcesIntegrationTest.groovy | 7 +- .../SourceSetDependenciesIntegrationTest.groovy | 8 +- ...ToolChainCrossCompilationIntegrationTest.groovy | 4 +- ...GccToolChainCustomisationIntegrationTest.groovy | 4 +- .../GccToolChainDiscoveryIntegrationTest.groovy | 4 +- .../MultipleNativeToolChainIntegrationTest.groovy | 8 +- ...sualCppToolChainDiscoveryIntegrationTest.groovy | 2 +- ...{SourceIncludes.java => IncludeDirectives.java} | 2 +- .../nativeplatform/TargetedNativeComponent.java | 2 +- .../internal/AbstractBinaryToolSpec.java | 11 + .../internal/AbstractNativeBinarySpec.java | 45 + .../internal/AbstractNativeComponentSpec.java | 10 +- .../internal/AbstractNativeLibraryBinarySpec.java | 59 +- .../AbstractTargetedNativeComponentSpec.java | 8 +- .../nativeplatform/internal/DefaultBuildType.java | 2 + .../nativeplatform/internal/DefaultFlavor.java | 2 + .../nativeplatform/internal/DefaultLinkerSpec.java | 8 + .../DefaultNativeExecutableBinarySpec.java | 3 + .../internal/DefaultNativeExecutableSpec.java | 6 +- .../internal/DefaultNativeLibrarySpec.java | 10 +- .../internal/DefaultPreprocessingTool.java | 3 + .../internal/DefaultSharedLibraryBinarySpec.java | 23 +- .../internal/DefaultStaticLibraryArchiverSpec.java | 4 + .../internal/DefaultStaticLibraryBinarySpec.java | 18 +- .../nativeplatform/internal/DefaultTool.java | 2 + .../internal/NativeBinarySpecInternal.java | 4 + .../internal/NativePlatformResolver.java | 1 + .../internal/ProjectNativeLibraryRequirement.java | 3 + .../configure/DefaultNativeComponentExtension.java | 4 + .../internal/configure/NativeBinaries.java | 13 +- .../internal/configure/NativeBinaryRules.java | 2 +- .../internal/configure/NativeComponentRules.java | 78 +- .../prebuilt/AbstractPrebuiltLibraryBinary.java | 36 +- .../prebuilt/DefaultPrebuiltLibraries.java | 13 +- .../internal/prebuilt/DefaultPrebuiltLibrary.java | 10 +- .../DefaultPrebuiltSharedLibraryBinary.java | 18 +- .../DefaultPrebuiltStaticLibraryBinary.java | 17 +- .../prebuilt/PrebuiltLibraryBinaryLocator.java | 1 + .../prebuilt/PrebuiltLibraryInitializer.java | 28 +- .../ApiRequirementNativeDependencyResolver.java | 23 +- .../resolve/ChainedLibraryBinaryLocator.java | 1 + .../resolve/DefaultNativeDependencySet.java | 3 + .../InputHandlingNativeDependencyResolver.java | 1 + .../resolve/LibraryNativeDependencyResolver.java | 1 + .../resolve/NativeDependencyResolverServices.java | 7 +- .../resolve/ProjectLibraryBinaryLocator.java | 1 + ...RequirementParsingNativeDependencyResolver.java | 1 + .../resolve/SourceSetNativeDependencyResolver.java | 54 +- .../internal/services/NativeBinaryServices.java | 5 + .../platform/internal/DefaultArchitecture.java | 6 + .../platform/internal/DefaultNativePlatform.java | 6 + .../platform/internal/DefaultOperatingSystem.java | 9 + .../platform/internal/NativePlatformInternal.java | 2 + .../platform/internal/NativePlatforms.java | 2 - .../plugins/NativeComponentModelPlugin.java | 145 +- .../plugins/NativeComponentPlugin.java | 1 + .../toolchain/GccCompatibleToolChain.java | 6 +- .../gradle/nativeplatform/toolchain/VisualCpp.java | 2 +- .../internal/AbstractPlatformToolProvider.java | 8 + .../internal/CommandLineToolInvocationWorker.java | 1 + .../internal/DefaultCommandLineToolInvocation.java | 5 + .../DefaultCommandLineToolInvocationWorker.java | 2 + .../DefaultMutableCommandLineToolContext.java | 9 + .../internal/DefaultNativeToolChainRegistry.java | 11 +- .../toolchain/internal/ExtendableToolChain.java | 3 + .../toolchain/internal/MacroArgsConverter.java | 1 + .../toolchain/internal/NativeCompileSpec.java | 13 +- .../toolchain/internal/NativeCompiler.java | 7 +- .../internal/NativeToolChainInternal.java | 3 +- .../toolchain/internal/OptionsFileArgsWriter.java | 28 +- .../toolchain/internal/OutputCleaningCompiler.java | 1 + .../toolchain/internal/PreCompiledHeader.java | 9 +- .../internal/UnavailablePlatformToolProvider.java | 6 + .../gcc/AbstractGccCompatibleToolChain.java | 11 + .../internal/gcc/ArStaticLibraryArchiver.java | 2 + .../toolchain/internal/gcc/Assembler.java | 1 + .../toolchain/internal/gcc/CCompiler.java | 1 + .../toolchain/internal/gcc/CPCHCompiler.java | 1 + .../toolchain/internal/gcc/CppCompiler.java | 1 + .../toolchain/internal/gcc/CppPCHCompiler.java | 1 + .../internal/gcc/DefaultGccPlatformToolChain.java | 11 +- .../internal/gcc/GccCompilerArgsTransformer.java | 1 + .../toolchain/internal/gcc/GccLinker.java | 4 +- .../internal/gcc/GccOptionsFileArgsWriter.java | 6 +- .../toolchain/internal/gcc/ObjectiveCCompiler.java | 1 + .../internal/gcc/ObjectiveCPCHCompiler.java | 1 + .../internal/gcc/ObjectiveCppCompiler.java | 1 + .../internal/gcc/ObjectiveCppPCHCompiler.java | 1 + .../version/CompilerMetaDataProviderFactory.java | 15 +- .../internal/gcc/version/GccVersionDeterminer.java | 11 + ...dioLocator.java => ArchitectureDescriptor.java} | 22 +- .../toolchain/internal/msvcpp/CCompiler.java | 1 + .../toolchain/internal/msvcpp/CppCompiler.java | 1 + .../msvcpp/DefaultVisualCppPlatformToolChain.java | 7 + .../msvcpp/DefaultVisualStudioLocator.java | 369 +++-- .../internal/msvcpp/DefaultWindowsSdkLocator.java | 7 + .../toolchain/internal/msvcpp/EscapeUserArgs.java | 1 + .../msvcpp/LibExeStaticLibraryArchiver.java | 2 + .../toolchain/internal/msvcpp/LinkExeLinker.java | 2 + .../msvcpp/VisualCppCompilerArgsTransformer.java | 1 + .../internal/msvcpp/VisualCppInstall.java | 45 +- .../msvcpp/VisualCppOptionsFileArgsWriter.java | 10 +- .../msvcpp/VisualCppPlatformToolProvider.java | 3 +- .../internal/msvcpp/VisualCppToolChain.java | 12 +- .../internal/msvcpp/VisualStudioInstall.java | 1 + .../internal/msvcpp/VisualStudioLocator.java | 7 +- .../internal/msvcpp/WindowsResourceCompiler.java | 2 + .../toolchain/internal/msvcpp/WindowsSdk.java | 1 + .../internal/plugins/StandardToolChainsPlugin.java | 1 + .../tools/DefaultCommandLineToolConfiguration.java | 2 + .../DefaultGccCommandLineToolConfiguration.java | 2 + .../toolchain/internal/tools/ToolSearchPath.java | 6 + .../toolchain/plugins/ClangCompilerPlugin.java | 1 + .../toolchain/plugins/GccCompilerPlugin.java | 1 + .../plugins/MicrosoftVisualCppPlugin.java | 1 + .../internal/DefaultNativeComponentTest.groovy | 3 - .../DefaultSharedLibraryBinarySpecTest.groovy | 5 +- .../DefaultStaticLibraryBinarySpecTest.groovy | 4 +- .../internal/NativeBinarySpecTest.groovy | 7 +- .../internal/TestNativeBinariesFactory.java | 7 +- .../configure/NativeComponentRulesTest.groovy | 11 +- .../DefaultPrebuiltSharedLibraryBinaryTest.groovy | 16 +- .../DefaultPrebuiltStaticLibraryBinaryTest.groovy | 13 +- .../msvcpp/DefaultVisualStudioLocatorTest.groovy | 154 +- .../internal/msvcpp/VisualCppToolChainTest.groovy | 4 +- .../fixtures/AvailableToolChains.java | 106 +- .../fixtures/RequiresInstalledToolChain.groovy | 2 +- .../fixtures/ToolChainRequirement.java | 16 +- .../fixtures/VisualStudioVersion.java} | 31 +- .../fixtures/binaryinfo/DumpbinBinaryInfo.groovy | 2 +- ...ltiProjectContinuousBuildIntegrationTest.groovy | 85 +- ...stractCoffeeScriptCompileIntegrationTest.groovy | 2 +- .../AbstractRoutesCompileIntegrationTest.groovy | 49 +- .../CoffeeScriptCompileIntegrationTest.groovy | 16 +- .../Play23RoutesCompileIntegrationTest.groovy | 8 +- .../Play24RoutesCompileIntegrationTest.groovy | 8 +- .../coffeescript/CoffeeScriptSourceSet.java | 3 +- .../internal/DefaultCoffeeScriptSourceSet.java | 30 - .../internal/DefaultJavaScriptSourceSet.java | 4 +- .../gradle/language/routes/RoutesSourceSet.java | 3 +- .../routes/internal/DefaultRoutesSourceSet.java | 30 - .../twirl/internal/DefaultTwirlSourceSet.java | 4 +- .../src/main/java/org/gradle/play/JvmClasses.java | 4 +- .../org/gradle/play/PlayApplicationBinarySpec.java | 3 +- .../main/java/org/gradle/play/PublicAssets.java | 4 +- .../play/internal/CleaningPlayToolCompiler.java | 1 + .../internal/DefaultPlayApplicationBinarySpec.java | 64 +- .../DefaultPlayPlatformAwareComponentSpec.java | 9 + .../PlayApplicationBinarySpecInternal.java | 8 +- .../play/internal/PlayPlatformNotationParser.java | 1 + .../gradle/play/internal/PlaySourceSetRules.java | 79 - .../distribution/DefaultPlayDistribution.java | 1 + .../internal/routes/DefaultRoutesCompileSpec.java | 6 + .../DefaultVersionedRoutesCompilerAdapter.java | 2 + .../play/internal/routes/RoutesCompiler.java | 1 + .../internal/routes/RoutesCompilerAdapterV22X.java | 2 + .../internal/routes/RoutesCompilerAdapterV23X.java | 1 + .../internal/routes/RoutesCompilerAdapterV24X.java | 1 + .../play/internal/run/DefaultPlayRunSpec.java | 8 + .../run/DefaultVersionedPlayRunAdapter.java | 3 + .../gradle/play/internal/run/PlayWorkerClient.java | 1 + .../gradle/play/internal/run/PlayWorkerServer.java | 2 + .../internal/toolchain/DefaultPlayToolChain.java | 5 +- .../toolchain/DefaultPlayToolProvider.java | 3 + .../internal/toolchain/PlayToolChainInternal.java | 3 +- .../toolchain/PlayToolChainServiceRegistry.java | 5 + .../internal/twirl/DefaultTwirlCompileSpec.java | 4 + .../gradle/play/internal/twirl/TwirlCompiler.java | 1 + .../internal/twirl/TwirlCompilerAdapterV10X.java | 4 + .../internal/twirl/TwirlCompilerAdapterV22X.java | 3 + .../gradle/play/plugins/PlayApplicationPlugin.java | 117 +- .../play/plugins/PlayCoffeeScriptPlugin.java | 64 +- .../play/plugins/PlayDistributionPlugin.java | 5 +- .../gradle/play/plugins/PlayJavaScriptPlugin.java | 39 +- .../java/org/gradle/play/plugins/PlayPlugin.java | 1 + .../org/gradle/play/plugins/PlayRoutesPlugin.java | 31 +- .../org/gradle/play/plugins/PlayTestPlugin.java | 4 +- .../org/gradle/play/plugins/PlayTwirlPlugin.java | 33 +- .../DefaultCoffeeScriptSourceSetTest.groovy | 32 - .../internal/DefaultJavaScriptSourceSetTest.groovy | 7 +- .../PluginClasspathManifestIntegrationTest.groovy | 132 ++ .../internal/tasks/PluginClasspathManifest.java | 87 ++ .../ApplicationPluginIntegrationTest.groovy | 23 + .../JavaLibraryDistributionIntegrationTest.groovy | 31 + .../groovy/GroovyBasePluginIntegrationTest.groovy | 2 +- ...oovySecurityManagerIssuesIntegrationTest.groovy | 83 + .../JavaProjectModelBridgingIntegrationTest.groovy | 10 +- .../shared/JavaClass.java | 2 +- .../api/internal/java/DefaultJavaSourceSet.java | 11 +- .../api/internal/java/DefaultJvmResourceSet.java | 11 +- .../jvm/DefaultClassDirectoryBinarySpec.java | 43 +- .../api/internal/tasks/DefaultGroovySourceSet.java | 9 +- .../api/internal/tasks/DefaultSourceSet.java | 22 +- .../internal/tasks/DefaultSourceSetContainer.java | 7 +- .../org/gradle/api/plugins/GroovyBasePlugin.java | 10 +- .../org/gradle/api/plugins/JavaBasePlugin.java | 34 +- .../groovy/org/gradle/api/plugins/JavaPlugin.java | 8 +- .../gradle/api/plugins/JavaPluginConvention.groovy | 5 +- .../groovy/org/gradle/api/tasks/GroovyRuntime.java | 2 +- .../groovy/org/gradle/api/tasks/SourceSet.java | 19 + .../internal/java/DefaultJavaSourceSetTest.groovy | 7 +- .../internal/java/DefaultJvmResourceSetTest.groovy | 7 +- .../jvm/DefaultClassDirectoryBinarySpecTest.groovy | 15 +- .../tasks/DefaultGroovySourceSetTest.groovy | 10 +- .../tasks/DefaultSourceSetContainerTest.java | 2 +- .../api/internal/tasks/DefaultSourceSetTest.groovy | 27 +- .../gradle/api/plugins/JavaBasePluginTest.groovy | 30 +- .../org/gradle/api/plugins/JavaPluginTest.groovy | 26 +- .../org/gradle/api/plugins/WarPluginTest.groovy | 10 +- .../reporting/internal/TaskReportContainer.java | 2 +- .../transport/http/ntlm/NTLMCredentials.java | 2 +- .../maven/MavenS3ProxiedRepoIntegrationTest.groovy | 2 +- .../integtests/ScalaProjectIntegrationTest.java | 4 +- .../SamplesMixedJavaAndScalaIntegrationTest.groovy | 4 +- ...plesScalaCustomizedLayoutIntegrationTest.groovy | 6 +- .../SamplesScalaQuickstartIntegrationTest.groovy | 4 +- .../samples/SamplesScalaZincIntegrationTest.groovy | 2 +- .../scala/ScalaBasePluginIntegrationTest.groovy | 4 +- ...AntInProcessScalaCompilerIntegrationTest.groovy | 11 +- .../BasicScalaCompilerIntegrationTest.groovy | 6 + .../IncrementalScalaCompileIntegrationTest.groovy | 12 +- .../ZincScalaCompilerIntegrationTest.groovy | 32 +- ...ScalaCompilerMultiVersionIntegrationTest.groovy | 5 +- .../JreJavaHomeScalaIntegrationTest.groovy | 12 +- .../scala/test/ScalaTestIntegrationTest.groovy | 4 +- .../build.gradle | 4 +- .../src/main/scala/House.scala | 1 + .../src/main/scala/Other.scala | 1 + .../src/main/scala/Person.scala | 1 + .../build.gradle | 7 - .../compilesJavaCodeIncrementally/build.gradle | 6 - .../compilesScalaCodeIncrementally/build.gradle | 6 - .../api/internal/tasks/DefaultScalaSourceSet.java | 9 +- .../api/plugins/scala/ScalaBasePlugin.groovy | 11 +- .../api/tasks/scala/ScalaCompileOptions.java | 39 +- .../gradle/api/tasks/scala/ScalaDocOptions.java | 10 +- .../tasks/DefaultScalaSourceSetTest.groovy | 9 +- .../api/tasks/scala/BaseScalaOptionTest.groovy | 101 ++ .../api/tasks/scala/ScalaCompileOptionsTest.groovy | 235 ++- .../gradle/api/tasks/scala/ScalaCompileTest.java | 43 +- .../api/tasks/scala/ScalaDocOptionsTest.groovy | 105 +- .../groovy/org/gradle/plugins/signing/Sign.groovy | 26 +- .../gradle/api/plugins/sonar/SonarPlugin.groovy | 5 +- .../org/gradle/sonar/runner/tasks/SonarRunner.java | 8 +- .../runner/internal/ToolingApiGradleExecutor.java | 4 +- .../tasks/testing/AbstractTestDescriptor.java | 4 + .../tasks/testing/DecoratingTestDescriptor.java | 5 + .../tasks/testing/DefaultTestClassRunInfo.java | 1 + .../tasks/testing/DefaultTestDescriptor.java | 2 + .../tasks/testing/DefaultTestOutputEvent.java | 2 + .../tasks/testing/DefaultTestSuiteDescriptor.java | 1 + .../tasks/testing/NoMatchingTestsReporter.java | 4 + .../tasks/testing/SuiteTestClassProcessor.java | 3 + .../internal/tasks/testing/TestClassProcessor.java | 1 + .../tasks/testing/filter/DefaultTestFilter.java | 4 + .../tasks/testing/filter/TestSelectionMatcher.java | 8 +- .../logging/ClassMethodNameStackTraceSpec.java | 1 + .../tasks/testing/logging/DefaultTestLogging.java | 22 + .../logging/DefaultTestLoggingContainer.java | 41 + .../testing/logging/FullExceptionFormatter.java | 1 + .../testing/logging/GroovyStackTraceSpec.java | 1 + .../testing/logging/ShortExceptionFormatter.java | 1 + .../tasks/testing/logging/TestCountLogger.java | 4 + .../tasks/testing/logging/TestEventLogger.java | 5 + .../testing/logging/TruncatedStackTraceSpec.java | 1 + .../CaptureTestOutputTestResultProcessor.java | 4 + .../DefaultStandardOutputRedirector.java | 7 + .../processors/MaxNParallelTestClassProcessor.java | 3 + .../RestartEveryNTestClassProcessor.java | 3 + .../tasks/testing/processors/TestMainAction.java | 1 + .../testing/processors/TestOutputRedirector.java | 1 + .../results/AttachParentTestResultProcessor.java | 4 + .../tasks/testing/results/DefaultTestResult.java | 9 + .../results/StateTrackingTestResultProcessor.java | 6 +- .../testing/results/UnknownTestDescriptor.java | 5 + .../testing/worker/ForkingTestClassProcessor.java | 3 + .../tasks/testing/worker/TestEventSerializer.java | 24 +- .../internal/tasks/testing/worker/TestWorker.java | 4 + .../platform/base/test/TestSuiteBinarySpec.java | 8 +- .../platform/base/test/TestSuiteContainer.java | 5 +- .../gradle/platform/base/test/TestSuiteSpec.java | 9 +- .../test => testing/base}/TestSuiteBinarySpec.java | 3 +- .../test => testing/base}/TestSuiteContainer.java | 2 +- .../base/test => testing/base}/TestSuiteSpec.java | 17 +- .../testing/base/internal/BaseTestSuiteSpec.java | 7 +- .../org/gradle/testing/base/package-info.java} | 10 +- .../base/plugins/TestingModelBasePlugin.java | 22 +- .../base/plugins/TestingModelBasePluginTest.groovy | 4 +- ...itStandaloneTestExecutionIntegrationTest.groovy | 24 + ...tTestSuiteComponentReportIntegrationTest.groovy | 3 + ...roovy => JUnit3FilteringIntegrationTest.groovy} | 4 +- .../junit/JUnitFilteringIntegrationTest.groovy | 122 +- .../testng/TestNGFilteringIntegrationTest.groovy | 89 +- .../tasks/testing/DefaultJUnitXmlReport.java | 2 + .../tasks/testing/DefaultTestTaskReports.java | 2 + .../tasks/testing/TestClassLoaderFactory.java | 1 + .../detection/AbstractTestFrameworkDetector.java | 4 + .../testing/detection/DefaultTestClassScanner.java | 2 + .../testing/detection/DefaultTestExecuter.java | 1 + .../junit/AllExceptIgnoredTestRunnerBuilder.java | 2 + .../tasks/testing/junit/JUnitDetector.java | 2 + .../testing/junit/JUnitTestClassDetecter.java | 7 + .../testing/junit/JUnitTestClassExecuter.java | 30 +- .../testing/junit/JUnitTestClassProcessor.java | 3 + .../tasks/testing/junit/JUnitTestFramework.java | 5 + .../testing/junit/JUnitTestMethodDetecter.java | 1 + .../junit/TestClassExecutionEventGenerator.java | 6 + .../testing/junit/report/CompositeTestResults.java | 2 + .../testing/junit/report/DefaultTestReport.java | 1 + .../testing/junit/report/PackageTestResults.java | 1 + .../tasks/testing/junit/report/TestResult.java | 1 + .../junit/result/AggregateTestResultsProvider.java | 9 +- .../BinaryResultBackedTestResultsProvider.java | 9 +- .../junit/result/InMemoryTestResultsProvider.java | 7 + .../testing/junit/result/TestOutputStore.java | 2 + .../junit/result/TestReportDataCollector.java | 7 +- .../tasks/testing/testng/TestNGDetector.java | 2 + .../testing/testng/TestNGTestClassDetecter.java | 7 + .../testing/testng/TestNGTestClassProcessor.java | 10 +- .../tasks/testing/testng/TestNGTestFramework.java | 5 + .../testing/testng/TestNGTestMethodDetecter.java | 1 + .../testng/TestNGTestResultProcessorAdapter.java | 15 +- .../java/org/gradle/api/tasks/testing/Test.java | 51 + .../gradle/jvm/plugins/JUnitTestSuitePlugin.java | 53 +- .../gradle/jvm/plugins/JvmTestSuiteBasePlugin.java | 149 ++ .../gradle/jvm/test/JvmTestSuiteBinarySpec.java | 3 +- .../java/org/gradle/jvm/test/JvmTestSuiteSpec.java | 3 +- .../internal/DefaultJUnitTestSuiteBinarySpec.java | 77 +- .../test/internal/DefaultJUnitTestSuiteSpec.java | 8 +- .../jvm/test/internal/JUnitTestSuiteRules.java | 63 - .../test/internal/JvmTestSuiteBinaryRenderer.java | 13 +- .../internal/JvmTestSuiteBinarySpecInternal.java | 10 +- .../jvm/test/internal/JvmTestSuiteRules.java | 102 +- .../test/internal/services/JvmTestingServices.java | 1 + .../junit/JUnitTestClassProcessorData.groovy | 66 +- .../junit/JUnitTestClassProcessorTest.groovy | 161 +- .../test/cunit/CUnitIntegrationTest.groovy | 62 +- .../googletest/GoogleTestIntegrationTest.groovy | 62 +- .../GoogleTestSamplesIntegrationTest.groovy | 12 +- ...tingNativeComponentReportIntegrationTest.groovy | 4 +- .../TestSuiteDefinitionIntegrationSpec.groovy | 11 +- .../plugins/TestSuiteModelIntegrationSpec.groovy | 13 +- .../test/NativeTestSuiteBinarySpec.java | 2 +- .../nativeplatform/test/NativeTestSuiteSpec.java | 3 +- .../cunit/internal/DefaultCUnitTestSuiteSpec.java | 11 +- .../test/cunit/plugins/CUnitConventionPlugin.java | 3 +- .../test/cunit/plugins/CUnitPlugin.java | 62 +- .../internal/DefaultGoogleTestTestSuiteSpec.java | 11 +- .../plugins/GoogleTestConventionPlugin.java | 3 +- .../test/googletest/plugins/GoogleTestPlugin.java | 34 +- .../internal/DefaultNativeTestSuiteBinarySpec.java | 8 + .../internal/NativeTestSuiteBinariesRules.java | 49 - .../test/internal/NativeTestSuites.java | 7 +- .../internal/services/NativeTestingServices.java | 1 + .../test/plugins/NativeBinariesTestPlugin.java | 50 +- .../nativeplatform/test/cunit/CUnitTest.groovy | 2 +- .../test/googletest/GoogleTestTest.groovy | 2 +- .../plugins/NativeBinariesTestPluginTest.groovy | 27 +- .../ProgressListenerToProgressLoggerAdapter.java | 52 + ...gressListenerToProgressLoggerAdapterTest.groovy | 127 ++ subprojects/tooling-api/buildship.gradle | 141 ++ .../fixture/AbstractToolingApiSpecification.groovy | 94 ++ .../tooling/fixture/ProgressEvents.groovy | 19 +- .../ToolingApiCompatibilitySuiteRunner.groovy | 3 +- .../tooling/fixture/ToolingApiSpecification.groovy | 80 +- .../ToolingApiEclipseModelCrossVersionSpec.groovy | 30 +- ...piEclipseLinkedResourcesCrossVersionSpec.groovy | 4 +- ...ngApiEclipseMinimalModelCrossVersionSpec.groovy | 4 +- ...EclipseModelWithFlatRepoCrossVersionSpec.groovy | 4 +- ...ToolingApiBuildExecutionCrossVersionSpec.groovy | 2 +- ...ildableEclipseModelFixesCrossVersionSpec.groovy | 2 +- .../ToolingApiEclipseModelCrossVersionSpec.groovy | 2 +- ...orsProjectCustomizationsCrossVersionSpec.groovy | 12 +- .../ToolingApiEclipseModelCrossVersionSpec.groovy | 2 +- .../DependencyMetaDataCrossVersionSpec.groovy | 4 +- .../r18/BuildScriptModelCrossVersionSpec.groovy | 2 +- .../ToolingApiEclipseModelCrossVersionSpec.groovy | 14 +- .../ToolingApiEclipseModelCrossVersionSpec.groovy | 18 +- .../ToolingApiIdeaModelCrossVersionSpec.groovy | 1 + .../ToolingApiIdeaModelCrossVersionSpec.groovy | 70 + ...oolingModelSerializationCrossVersionSpec.groovy | 65 + ...tinuousBuildCancellationCrossVersionSpec.groovy | 64 +- .../ToolingApiEclipseModelCrossVersionSpec.groovy | 5 +- .../r26/TestLauncherCrossVersionSpec.groovy | 5 + ...piEclipseLinkedResourcesCrossVersionSpec.groovy | 4 +- .../ToolingApiEclipseModelCrossVersionSpec.groovy | 4 +- .../ToolingApiEclipseModelCrossVersionSpec.groovy | 21 +- .../internal/consumer/BlockingResultHandler.java | 2 +- .../internal/consumer/ResultHandlerAdapter.java | 5 +- .../converters/IdeaProjectCompatibilityMapper.java | 6 +- .../converters/TaskPropertyHandlerFactory.java | 6 +- .../model/eclipse/EclipseJavaSourceSettings.java | 2 +- subprojects/tooling-api/tooling-api.gradle | 6 +- .../gradle/foundation/CommandLineAssistant.java | 2 +- .../ipc/gradle/AbstractGradleServerProtocol.java | 4 +- .../integtests/WrapperHttpIntegrationTest.groovy | 12 +- version.txt | 2 +- 1264 files changed, 16826 insertions(+), 8856 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
