This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository gradle.
commit 7076c3f63ef6ac3128d7129c1a6b5a99a246544c Merge: a1374ca 0dc6a43 Author: Emmanuel Bourg <[email protected]> Date: Tue May 3 00:06:13 2016 +0200 Merge tag 'upstream/2.11' Upstream version 2.11 build.gradle | 32 +- .../gradle/build/docs/SampleLayoutHandler.groovy | 141 +- .../docs/model/SimpleClassMetaDataRepository.java | 13 +- .../MonolithicNativeProjectGeneratorTask.groovy | 16 + .../tasks/NativeProjectGeneratorTask.groovy | 5 + .../generator/tasks/ProjectGeneratorTask.groovy | 56 +- .../model/SimpleClassMetaDataRepositoryTest.groovy | 17 +- config/checkstyle/checkstyle.xml | 10 +- config/checkstyle/suppressions.xml | 4 + gradle/buildSplits.gradle | 2 +- gradle/customM2Check.gradle | 34 + gradle/dependencies.gradle | 7 +- gradle/idea.gradle | 53 +- gradle/integTest.gradle | 51 +- gradle/java9.gradle | 5 +- gradle/testFixtures.gradle | 5 - gradle/wrapper/gradle-wrapper.properties | 13 +- settings.gradle | 2 + .../antlr/AbstractAntlrIntegrationTest.groovy | 3 +- .../IncrementalAntlrTaskIntegrationTest.groovy | 14 + .../main/groovy/org/gradle/api/specs/AndSpec.java | 3 +- .../main/groovy/org/gradle/api/specs/Specs.java | 141 +- .../groovy/org/gradle/api/specs/SpecsTest.groovy | 147 ++ .../SystemPropertiesIntegrationTest.groovy | 41 + .../src/main/java/org/gradle/api/JavaVersion.java | 2 +- .../java/org/gradle/api/specs/CompositeSpec.java | 25 +- .../main/java/org/gradle/api/specs/NotSpec.java | 4 + .../src/main/java/org/gradle/api/specs/OrSpec.java | 7 +- .../main/java/org/gradle/internal/FileUtils.java | 10 + .../java/org/gradle/internal/SystemProperties.java | 35 +- .../internal/exceptions/DiagnosticsVisitor.java | 7 +- .../exceptions/FormattingDiagnosticsVisitor.java | 14 +- .../ValueCollectingDiagnosticsVisitor.java | 46 + .../gradle/internal/file/PathToFileResolver.java | 30 + .../internal/file/RelativeFilePathResolver.java | 3 + .../reflect/MethodSignatureEquivalence.java | 48 - .../java/org/gradle/internal/reflect/Methods.java | 76 + .../reflect/UnsupportedPropertyValueException.java | 29 + .../internal/service/DefaultServiceRegistry.java | 10 +- .../typeconversion/TypeConversionException.java | 4 + .../internal/typeconversion/TypeConverter.java | 4 +- .../UnsupportedNotationException.java | 3 +- .../main/java/org/gradle/util/CollectionUtils.java | 27 + .../ValueCollectingDiagnosticsVisitorTest.groovy | 33 + .../reflect/MethodSignatureEquivalenceTest.groovy | 47 - .../org/gradle/internal/reflect/MethodsTest.groovy | 66 + .../service/DefaultServiceRegistryTest.groovy | 152 +- .../gradle/CompareGradleBuilds.java | 10 +- .../internal/DefaultGradleBuildInvocationSpec.java | 6 +- .../buildcomparison/gradle/package-info.java | 3 +- subprojects/build-init/build-init.gradle | 1 + .../plugins/BuildInitPluginIntegrationTest.groovy | 34 + .../plugins/JavaLibraryInitIntegrationTest.groovy | 62 +- .../plugins/MavenConversionIntegrationTest.groovy | 18 +- .../plugins/ScalaLibraryInitIntegrationTest.groovy | 6 +- .../BasicTemplateBasedProjectInitDescriptor.java | 40 +- .../plugins/internal/BuildInitTestFramework.java | 55 + .../GroovyLibraryProjectInitDescriptor.java | 38 +- .../internal/JavaLibraryProjectInitDescriptor.java | 70 +- .../LanguageLibraryProjectInitDescriptor.java | 23 +- .../internal/PomProjectInitDescriptor.groovy | 16 +- .../plugins/internal/ProjectInitDescriptor.groovy | 6 +- .../ProjectLayoutSetupRegistryFactory.groovy | 11 +- .../ScalaLibraryProjectInitDescriptor.java | 42 +- .../SimpleGlobalFilesBuildSettingsDescriptor.java | 34 +- .../TemplateBasedProjectInitDescriptor.java | 34 - .../plugins/internal/TemplateOperationFactory.java | 6 +- .../plugins/internal/maven/Maven2Gradle.groovy | 10 +- .../org/gradle/buildinit/plugins/package-info.java | 3 +- .../org/gradle/buildinit/tasks/InitBuild.groovy | 31 +- .../groovylibrary/LibraryTest.groovy.template | 2 +- .../javalibrary/LibraryTestNG.java.template | 15 + .../javalibrary/spock-build.gradle.template | 34 + .../javalibrary/testng-build.gradle.template | 29 + .../internal/BuildInitTestFrameworkTest.groovy | 58 + ...LanguageLibraryProjectInitDescriptorSpec.groovy | 31 +- .../TemplateBasedProjectInitDescriptorSpec.groovy | 44 - .../gradle/buildinit/tasks/InitBuildSpec.groovy | 69 +- .../org/gradle/api/plugins/quality/Pmd.groovy | 10 +- .../gradle/api/plugins/quality/PmdPlugin.groovy | 5 +- .../api/plugins/quality/PmdPluginTest.groovy | 14 +- ...kCommandLineConfigurationIntegrationSpec.groovy | 2 +- .../api/tasks/TaskRemovalIntegrationTest.groovy | 2 +- .../RuleTaskCreationIntegrationTest.groovy | 2 +- .../api/PolymorphicDomainObjectContainer.java | 1 - .../gradle/api/artifacts/cache/package-info.java | 3 +- .../component/LibraryComponentSelector.java | 3 + .../api/artifacts/component/package-info.java | 3 +- .../org/gradle/api/artifacts/ivy/package-info.java | 3 +- .../gradle/api/artifacts/result/package-info.java | 3 +- .../org/gradle/api/component/package-info.java | 4 +- .../org/gradle/api/credentials/package-info.java | 4 +- .../groovy/org/gradle/api/file/FileCollection.java | 6 +- .../org/gradle/api/file/FileTreeElement.java | 10 +- .../groovy/org/gradle/api/file/FileVisitor.java | 4 +- .../internal/cache/HeapProportionalCacheSizer.java | 58 + .../api/internal/cache/HeapProportionalSizer.java | 55 - .../DefaultTaskArtifactStateRepository.java | 7 +- .../rules/DiscoveredInputFilesStateChangeRule.java | 3 +- .../changedetection/rules/TaskUpToDateState.java | 10 +- .../state/CachingFileSnapshotter.java | 2 +- .../state/DefaultFileCollectionSnapshotter.java | 93 +- .../state/DefaultFileSnapshotterSerializer.java | 2 +- .../state/FileCollectionSnapshot.java | 2 + .../changedetection/state/FileSnapshotter.java | 5 + .../state/FileTreeElementSnapshotter.java | 23 - .../state/InMemoryTaskArtifactCache.java | 8 +- .../state/MinimalFileSetSnapshotter.java | 53 + .../state/OutputFilesCollectionSnapshotter.java | 4 + .../internal/coerce/StringToEnumTransformer.java | 9 +- .../collections/CollectionEventRegister.java | 2 +- .../api/internal/collections/CollectionFilter.java | 2 +- .../api/internal/file/AbstractFileResolver.java | 20 +- .../api/internal/file/AbstractFileResource.java | 7 +- .../gradle/api/internal/file/AbstractFileTree.java | 12 +- .../api/internal/file/AbstractFileTreeElement.java | 4 +- .../api/internal/file/BaseDirFileResolver.java | 6 +- .../api/internal/file/CachingFileVisitDetails.java | 63 - .../api/internal/file/CompositeFileCollection.java | 2 +- .../api/internal/file/CompositeFileTree.java | 5 + .../api/internal/file/DefaultFileLookup.java | 6 +- .../api/internal/file/DefaultFileOperations.java | 10 +- .../api/internal/file/DefaultFileVisitDetails.java | 40 +- .../internal/file/DefaultSourceDirectorySet.java | 9 +- .../api/internal/file/EmptyFileCollection.java | 45 + .../org/gradle/api/internal/file/FileResolver.java | 14 +- .../gradle/api/internal/file/FileSystemSubset.java | 11 + .../gradle/api/internal/file/FileTreeInternal.java | 2 + .../file/FileVisitDetailsWithAttributes.java | 52 - .../api/internal/file/IdentityFileResolver.java | 9 +- .../api/internal/file/ImmutablePatternSet.java | 3 +- .../internal/file/MaybeCompressedFileResource.java | 12 +- .../file/UnknownBackingFileReadableResource.java | 59 + .../api/internal/file/archive/TarFileTree.java | 54 +- .../api/internal/file/archive/ZipFileTree.java | 20 +- .../file/archive/compression/AbstractArchiver.java | 61 + .../file/archive/compression/Bzip2Archiver.java | 35 +- .../compression/CompressedReadableResource.java | 3 +- .../file/archive/compression/GzipArchiver.java | 34 +- ...pendenciesOnlyFileCollectionResolveContext.java | 4 +- .../DefaultConfigurableFileCollection.java | 8 +- .../collections/DefaultConfigurableFileTree.java | 6 +- .../file/collections/DefaultDirectoryWalker.java | 9 +- .../DefaultFileCollectionResolveContext.java | 34 +- .../file/collections/DirectoryFileTree.java | 32 +- .../internal/file/collections/EmptyFileTree.java | 3 + .../collections/FileCollectionResolveContext.java | 4 +- .../internal/file/collections/FileTreeAdapter.java | 4 + .../file/collections/FileTreeWithBackingFile.java | 23 - .../file/collections/FilteredFileTree.java | 2 - .../api/internal/file/collections/MapFileTree.java | 86 +- .../internal/file/collections/MinimalFileTree.java | 2 + .../collections/SingleIncludePatternFileTree.java | 10 +- .../file/collections/SingletonFileTree.java | 8 +- .../file/collections/jdk7/Jdk7DirectoryWalker.java | 4 +- .../api/internal/file/copy/DefaultCopySpec.java | 10 +- .../internal/file/copy/DefaultFileCopyDetails.java | 6 +- .../file/copy/DestinationRootCopySpec.java | 6 +- .../api/internal/file/copy/FileCopyAction.java | 6 +- .../pattern/HasPrefixAndSuffixPatternStep.java | 32 + .../file/pattern/HasPrefixPatternStep.java | 36 + .../file/pattern/HasSuffixPatternStep.java | 36 + .../api/internal/file/pattern/PatternStep.java | 2 +- .../internal/file/pattern/PatternStepFactory.java | 80 +- .../file/pattern/WildcardPrefixPatternStep.java | 36 - .../api/internal/plugins/DefaultPluginManager.java | 20 +- .../plugins/RuleBasedPluginApplicator.java | 13 +- .../api/internal/project/AbstractProject.java | 33 +- .../internal/resources/DefaultResourceHandler.java | 6 +- .../api/internal/tasks/DefaultTaskContainer.java | 6 +- .../tasks/DefaultTaskContainerFactory.java | 10 +- .../tasks/options/AbstractOptionElement.java | 19 +- .../internal/tasks/options/FieldOptionElement.java | 6 +- .../tasks/options/InstanceOptionDescriptor.java | 7 +- .../tasks/options/MethodOptionElement.java | 6 +- .../internal/tasks/options/OptionDescriptor.java | 3 +- .../api/internal/tasks/options/OptionElement.java | 3 +- .../tasks/options/OptionNotationParserFactory.java | 53 +- .../org/gradle/api/plugins/PluginManager.java | 5 - .../org/gradle/api/resources/ReadableResource.java | 3 + .../internal/ReadableResourceInternal.java | 25 + .../groovy/org/gradle/api/tasks/SourceTask.java | 13 +- .../gradle/api/tasks/incremental/package-info.java | 3 +- .../org/gradle/api/tasks/util/PatternSet.java | 37 +- .../util/internal/CachingPatternSpecFactory.java | 8 +- .../api/tasks/util/internal/PatternSets.java | 53 + .../tasks/util/internal/PatternSpecFactory.java | 20 +- .../cache/internal/CacheRepositoryServices.java | 39 + .../configuration/DefaultScriptPluginFactory.java | 10 +- ...ludedTaskFilteringBuildConfigurationAction.java | 2 +- .../org/gradle/execution/TaskNameResolver.java | 49 +- .../groovy/org/gradle/groovy/scripts/Script.java | 11 + .../internal/DefaultScriptCompilationHandler.java | 17 +- .../initialization/DefaultProjectDescriptor.java | 6 +- .../initialization/DirectoryInitScriptFinder.java | 4 +- .../gradle/internal/filewatch/ChangeReporter.java | 83 ++ .../DefaultFileSystemChangeWaiterFactory.java | 57 +- .../filewatch/DefaultFileWatcherFactory.java | 17 +- .../internal/filewatch/FileSystemChangeWaiter.java | 6 +- .../filewatch/FileWatcherEventListener.java | 21 + .../filewatch/jdk7/WatchPointsRegistry.java | 153 ++ .../jdk7/WatchServiceFileWatcherBacking.java | 33 +- .../filewatch/jdk7/WatchServicePoller.java | 4 +- .../filewatch/jdk7/WatchServiceRegistrar.java | 183 ++- .../internal/resource/local/PathKeyFileStore.java | 4 +- .../service/scopes/BuildSessionScopeServices.java | 15 +- .../service/scopes/GlobalScopeServices.java | 46 +- .../service/scopes/ProjectScopeServices.java | 14 +- .../service/scopes/SettingsScopeServices.java | 3 +- .../service/scopes/TaskExecutionServices.java | 13 +- .../CharSequenceNotationConverter.java | 4 +- .../typeconversion/CompositeNotationParser.java | 49 - .../typeconversion/DefaultTypeConverter.java | 402 +++-- .../EnumFromCharSequenceNotationParser.java | 22 +- .../NotationConverterToNotationParserAdapter.java | 2 +- .../internal/typeconversion/NotationParser.java | 6 +- .../typeconversion/NotationParserBuilder.java | 4 +- .../typeconversion/ValueAwareNotationParser.java | 23 - .../internal/LoggingCommandLineConverter.java | 14 +- .../collection/internal/BridgedCollections.java | 9 +- .../persist/AlwaysNewModelRegistryStore.java | 36 - .../model/internal/persist/ModelRegistryStore.java | 26 - .../persist/ReusingModelRegistryStore.java | 58 - .../groovy/org/gradle/plugin/use/package-info.java | 3 +- .../internal/AbstractExecHandleBuilder.java | 4 +- .../internal/DefaultProcessForkOptions.java | 10 +- .../gradle/process/internal/ExecHandleBuilder.java | 4 +- .../org/gradle/process/internal/JvmOptions.java | 4 +- .../tooling/provider/model/package-info.java | 1 + .../api/internal/AsmBackedClassGeneratorTest.java | 8 +- .../DefaultTaskArtifactStateRepositoryTest.groovy | 8 +- .../DiscoveredInputFilesStateChangeRuleTest.groovy | 2 +- .../rules/TaskUpToDateStateTest.groovy | 10 +- .../DefaultFileCollectionSnapshotterTest.groovy | 5 +- .../DefaultFileSnapshotterSerializerTest.groovy | 2 +- .../state/MinimalFileSetSnapshotterTest.groovy | 78 + .../internal/file/BaseDirFileResolverSpec.groovy | 2 +- .../internal/file/BaseDirFileResolverTest.groovy | 7 +- .../internal/file/DefaultFileOperationsTest.groovy | 15 +- .../file/DefaultSourceDirectorySetTest.groovy | 8 +- .../DefaultConfigurableFileTreeTest.groovy | 18 +- .../collections/DefaultDirectoryWalkerTest.java | 6 + .../DefaultFileCollectionResolveContextTest.groovy | 3 +- .../internal/file/collections/MapFileTreeTest.java | 54 + .../jdk7/Jdk7DirectoryWalkerTest.groovy | 10 +- .../file/copy/DefaultCopySpecResolutionTest.groovy | 9 +- .../internal/file/copy/DefaultCopySpecTest.groovy | 3 +- .../HasPrefixAndSuffixPatternStepTest.groovy | 54 + .../file/pattern/HasPrefixPatternStepTest.groovy | 53 + .../file/pattern/HasSuffixPatternStepTest.groovy | 49 + .../file/pattern/PatternStepFactoryTest.groovy | 90 +- .../pattern/WildcardPrefixPatternStepTest.groovy | 47 - .../tasks/RealizableTaskCollectionTest.groovy | 6 +- .../options/InstanceOptionDescriptorSpec.groovy | 8 +- .../internal/tasks/options/OptionReaderTest.groovy | 13 +- .../internal/CachingPatternSpecFactoryTest.groovy | 22 +- ...askFilteringBuildConfigurationActionTest.groovy | 2 +- .../gradle/execution/TaskNameResolverTest.groovy | 295 ++-- .../CommandLineTaskConfigurerSpec.groovy | 3 +- .../DefaultScriptCompilationHandlerTest.groovy | 17 + .../internal/filewatch/ChangeReporterTest.groovy | 137 ++ .../DefaultFileSystemChangeWaiterTest.groovy | 41 +- .../filewatch/DefaultFileWatcherFactoryTest.groovy | 178 ++- .../filewatch/jdk7/WatchPointsRegistryTest.groovy | 266 ++++ .../jdk7/WatchServiceRegistrarTest.groovy | 107 ++ .../service/scopes/ProjectScopeServicesTest.groovy | 5 - .../scopes/TaskExecutionServicesTest.groovy | 2 + .../typeconversion/DefaultTypeConverterTest.groovy | 264 +++- .../EnumFromCharSequenceNotationParserSpec.groovy | 7 +- .../org/gradle/testfixtures/CustomPlugin.groovy | 27 + .../gradle/testfixtures/CustomRuleSource.groovy | 29 + .../org/gradle/testfixtures/CustomTask.groovy | 30 + .../gradle/testfixtures/ProjectBuilderTest.groovy | 25 - .../gradle/api/file/FileCollectionMatchers.java | 3 +- .../org/gradle/api/internal/file/TestFiles.java | 13 +- ...etadataRulesErrorHandlingIntegrationTest.groovy | 3 +- .../MavenM2CacheReuseIntegrationTest.groovy | 14 +- ...coverFromBrokenResolutionIntegrationTest.groovy | 10 +- .../AbstractHttpsRepoResolveIntegrationTest.groovy | 6 +- .../AbstractProxyResolveIntegrationTest.groovy | 166 +++ ...ationDependencyResolutionIntegrationTest.groovy | 7 + .../http/HttpProxyResolveIntegrationTest.groovy | 139 +- .../http/HttpsProxyResolveIntegrationTest.groovy | 53 + ...nentSelectionRulesErrorHandlingIntegTest.groovy | 3 +- ...IvyComponentMetadataRulesIntegrationTest.groovy | 3 +- ...venCustomPackagingResolveIntegrationTest.groovy | 3 +- .../MavenLocalRepoResolveIntegrationTest.groovy | 39 +- ...nModuleArtifactResolutionIntegrationTest.groovy | 29 +- .../internal/artifacts/ivyservice/NamespaceId.java | 2 - .../ComponentSelectionRulesProcessor.java | 2 +- .../result/ComponentSelectorSerializer.java | 10 +- .../model/DefaultLibraryBinaryIdentifier.java | 1 - .../model/DefaultLibraryComponentSelector.java | 27 +- .../internal/component/local/model/UsageKind.java | 30 + .../java/org/gradle/internal/rules/RuleAction.java | 3 - .../rules/RuleActionValidationException.java | 5 - .../internal/rules/RuleSourceBackedRuleAction.java | 28 +- .../DefaultResolutionResultBuilderSpec.groovy | 6 +- .../DefaultLibraryComponentSelectorTest.groovy | 29 +- .../rules/RuleSourceBackedRuleActionTest.groovy | 26 +- ...iagnosticsComponentReportIntegrationTest.groovy | 17 +- .../model/ModelReportIntegrationTest.groovy | 246 +++- .../api/reporting/components/ComponentReport.java | 3 +- .../internal/AbstractBinaryRenderer.java | 3 +- .../gradle/api/reporting/model/ModelReport.java | 7 +- .../model/internal/ModelNodeRenderer.java | 9 +- .../gradle/configuration/TaskDetailPrinter.java | 4 +- .../internal/TypeAwareBinaryRendererTest.groovy | 64 + .../AbstractComponentReportIntegrationTest.groovy | 5 + ...ractNativeComponentReportIntegrationTest.groovy | 4 + .../gradle/AllDistributionIntegrationSpec.groovy | 2 +- .../gradle/BinDistributionIntegrationSpec.groovy | 2 +- subprojects/docs/docs.gradle | 6 +- subprojects/docs/src/docs/css/base.css | 5 +- subprojects/docs/src/docs/dsl/dsl.xml | 12 + ...language.coffeescript.CoffeeScriptSourceSet.xml | 38 + ...dle.language.javascript.JavaScriptSourceSet.xml | 38 + .../org.gradle.language.routes.RoutesSourceSet.xml | 38 + .../org.gradle.language.twirl.TwirlSourceSet.xml | 41 + .../dsl/org.gradle.play.tasks.TwirlCompile.xml | 3 + subprojects/docs/src/docs/release/notes.md | 488 +++--- .../userguide/artifactDependenciesTutorial.xml | 2 +- .../docs/src/docs/userguide/buildInitPlugin.xml | 10 +- .../src/docs/userguide/buildingJavaLibraries.xml | 76 +- .../docs/src/docs/userguide/continuousBuild.xml | 23 +- subprojects/docs/src/docs/userguide/javaPlugin.xml | 28 + subprojects/docs/src/docs/userguide/playPlugin.xml | 28 +- subprojects/docs/src/docs/userguide/ruleSource.xml | 28 + .../src/docs/userguide/softwareModelExtend.xml | 259 ++++ subprojects/docs/src/docs/userguide/testKit.xml | 56 +- subprojects/docs/src/docs/userguide/userguide.xml | 2 + .../samples/customModel/internalViews/build.gradle | 57 + .../samples/customModel/languageType/build.gradle | 12 +- .../DefaultDocumentationBinary.groovy | 21 - .../documentation/DocumentationBinary.groovy | 9 +- .../documentation/DocumentationComponent.groovy | 4 +- .../documentation/DocumentationPlugin.groovy | 63 +- .../documentation/DocumentationSourceSet.groovy | 29 - .../sample/documentation/TextSourceSet.groovy | 25 + .../markdown/DefaultMarkdownSourceSet.groovy | 24 - .../sample/markdown/MarkdownHtmlCompile.groovy | 16 +- .../groovy/sample/markdown/MarkdownPlugin.groovy | 36 +- .../sample/markdown/MarkdownSourceSet.groovy | 20 +- .../languageType/src/docs/reference/README.txt | 1 + .../languageType/src/docs/userguide/chapter1.md | 2 +- .../collections/java/org/gradle/Collections.java | 5 + .../src/commons/java/org/gradle/Application.java | 7 + .../build.gradle | 39 + .../src/main/java/org/gradle/SmartApp.java | 23 + .../main/resources/org/gradle/resource.properties | 1 + .../src/test/java/org/gradle/SmartAppTest.java | 29 + .../testing-junit-standalone/build.gradle | 46 + .../src/test/java/org/gradle/MyTest.java | 12 + .../src/test/resources/org/gradle/resource.xml | 3 + .../modelRules/basicRuleSourcePlugin/build.gradle | 4 +- .../src/samples/native-binaries/cunit/build.gradle | 7 +- .../native-binaries/google-test/build.gradle | 7 +- .../testing/testng/groupbyinstances/build.gradle | 21 + .../test/java/org/gradle/testng/TestFactory.java | 61 + .../testing/testng/preserveorder/build.gradle | 21 + .../src/test/java/org/gradle/testng/Test1.java | 44 + .../src/test/java/org/gradle/testng/Test2.java | 50 + .../userguide/files/inputFiles/build.gradle | 2 +- .../basicRuleSourcePlugin-model-task.out | 9 +- .../buildingJavaLibraries-compile-avoid.out | 3 +- .../buildingJavaLibraries-compile-brokenclient.out | 1 + .../buildingJavaLibraries-compile-first.out | 3 +- .../userguideOutput/javaLibraryComponentReport.out | 32 + .../javaLibraryMultiComponents-clientJar.out | 8 + .../javaLibraryMultiComponents-serverJar.out | 13 + ... => javaLibraryMultiComponents-verifierJar.out} | 0 ...avaQuickstart.out => javaLibraryQuickstart.out} | 0 ...=> javaLibraryTargetPlatforms-java6MainJar.out} | 0 .../javaLibraryTargetPlatforms-server.out | 22 + ...latforms.out => javaLibraryTargetPlatforms.out} | 0 .../userguideOutput/junit-component-under-test.out | 6 + .../samples/userguideOutput/junit-standalone.out | 5 + .../userguideOutput/nativeComponentReport.out | 12 +- .../userguideOutput/newJavaComponentReport.out | 32 - .../newJavaMultiComponents-clientJar.out | 9 - .../newJavaMultiComponents-serverJar.out | 14 - .../newJavaTargetPlatforms-server.out | 24 - .../userguideOutput/playComponentReport.out | 6 +- .../softwareModelExtend-components.out | 19 + .../softwareModelExtend-iv-model.out | 143 ++ .../internal/DefaultDeploymentDescriptor.groovy | 11 +- subprojects/ide-native/ide-native.gradle | 1 + .../internal/DefaultVisualStudioProject.groovy | 10 +- .../internal/DefaultVisualStudioSolution.groovy | 13 +- .../org/gradle/ide/visualstudio/package-info.java | 1 + .../eclipse/AbstractEclipseIntegrationSpec.groovy | 12 - .../eclipse/EclipseClasspathIntegrationTest.groovy | 89 +- .../ide/eclipse/EclipseIntegrationTest.groovy | 20 + .../ide/eclipse/EclipseWtpComponentFixture.groovy | 10 - .../eclipse/EclipseWtpModelIntegrationTest.groovy | 709 ++++----- .../plugins/ide/idea/IdeaIntegrationTest.groovy | 22 + .../IdeaJavaLanguageSettingsIntegrationTest.groovy | 181 +++ .../plugins/ide/idea/IdeaModuleFixture.groovy | 7 + .../ide/idea/IdeaModuleIntegrationTest.groovy | 49 + .../ide/idea/IdeaMultiModuleIntegrationTest.groovy | 8 +- .../plugins/ide/idea/IdeaProjectFixture.groovy | 41 + .../ide/idea/IdeaProjectIntegrationTest.groovy | 39 - .../expectedFiles/apiClasspath.xml | 2 +- .../expectedFiles/commonClasspath.xml | 2 +- .../expectedFiles/groovyprojectClasspath.xml | 2 +- .../expectedFiles/javabaseprojectClasspath.xml | 2 +- .../expectedFiles/webAppJava6Classpath.xml | 2 +- .../expectedFiles/webAppWithVarsClasspath.xml | 2 +- .../expectedFiles/webserviceClasspath.xml | 2 +- .../canCreateAndDeleteMetaData/master/build.gradle | 1 + .../canCreateAndDeleteMetaData/build.gradle | 2 + .../plugins/ide/eclipse/EclipsePlugin.groovy | 28 +- .../plugins/ide/eclipse/model/Classpath.groovy | 6 +- .../ide/eclipse/model/EclipseClasspath.groovy | 6 +- .../plugins/ide/eclipse/model/EclipseJdt.groovy | 12 +- .../eclipse/model/internal/ClasspathFactory.groovy | 5 + .../org/gradle/plugins/ide/idea/IdeaPlugin.groovy | 83 +- .../ide/idea/model/IdeaLanguageLevel.groovy | 20 +- .../plugins/ide/idea/model/IdeaModule.groovy | 72 +- .../plugins/ide/idea/model/IdeaProject.groovy | 63 +- .../gradle/plugins/ide/idea/model/Module.groovy | 76 +- .../model/internal/IdeaDependenciesProvider.java | 40 +- .../ide/internal/IdeDependenciesExtractor.java | 3 +- .../ide/internal/tooling/EclipseModelBuilder.java | 13 +- .../ide/internal/tooling/IdeaModelBuilder.java | 70 +- .../eclipse/DefaultEclipseJavaSourceSettings.java | 55 + .../tooling/eclipse/DefaultEclipseProject.java | 7 +- .../idea/DefaultIdeaJavaLanguageSettings.java | 55 + .../tooling/idea/DefaultIdeaLanguageLevel.java | 2 +- .../internal/tooling/idea/DefaultIdeaModule.java | 11 + .../internal/tooling/idea/DefaultIdeaProject.java | 12 +- .../internal/tooling/java/DefaultInstalledJdk.java | 47 + .../tooling/java/DefaultJavaSourceSettings.java | 33 - .../resolver/DefaultIdeDependencyResolver.java | 31 +- .../resolver/UnresolvedDependenciesLogger.java | 34 + .../model/UnresolvedIdeRepoFileDependency.java | 15 +- .../plugins/ide/eclipse/EclipsePluginTest.groovy | 8 +- .../plugins/ide/eclipse/model/ClasspathTest.groovy | 10 +- .../gradle/plugins/ide/idea/IdeaPluginTest.groovy | 25 +- .../plugins/ide/idea/model/IdeaModuleTest.groovy | 145 ++ .../plugins/ide/idea/model/IdeaProjectTest.groovy | 61 + .../plugins/ide/idea/model/ModuleTest.groovy | 9 +- .../tooling/eclipse/EclipseModelBuilderTest.groovy | 76 +- .../tooling/idea/IdeaModelBuilderTest.groovy | 282 ++++ ...latedAntBuilderMemoryLeakIntegrationTest.groovy | 1 + .../SamplesCustomPluginIntegrationTest.groovy | 1 + .../SamplesJavaApiAndImplIntegrationTest.groovy | 3 +- .../samples/UserGuideSamplesIntegrationTest.groovy | 2 +- .../samples/UserGuideSamplesRunner.groovy | 7 +- .../internal-integ-testing.gradle | 1 + .../AbstractDependencyResolutionTest.groovy | 8 - .../fixtures/AbstractIntegrationSpec.groovy | 4 + .../fixtures/AbstractIntegrationTest.java | 11 + .../fixtures/MultiVersionSpecRunner.groovy | 2 +- .../fixtures/executer/InProcessGradleExecuter.java | 6 +- .../executer/OutputScrapingExecutionFailure.java | 4 +- .../versions/ReleasedVersionDistributions.java | 13 + .../gradle/test/fixtures/ivy/IvyDescriptor.groovy | 11 + .../fixtures/ivy/IvyDescriptorDependency.groovy | 1 + .../ivy/IvyDescriptorDependencyExclusion.groovy | 22 + .../test/fixtures/maven/M2Installation.groovy | 71 +- .../test/fixtures/server/http/HttpServer.groovy | 18 +- .../fixtures/server/http/NtlmAuthenticator.groovy | 107 ++ .../fixtures/server/http/TestProxyServer.groovy | 64 +- .../ReleasedVersionDistributionsTest.groovy | 16 + .../fixtures/DefaultTestExecutionResult.groovy | 8 +- .../test/fixtures/archive/TarTestFixture.groovy | 5 +- .../test/fixtures/archive/ZipTestFixture.groovy | 11 +- .../org/gradle/test/fixtures/file/TestFile.java | 8 + .../gradle/testing/internal/util/RetryFailure.java | 28 + .../gradle/testing/internal/util/RetryRule.groovy | 70 + .../testing/internal/util/ExpectedFailure.java | 29 + .../testing/internal/util/ExpectedFailureRule.java | 52 + .../testing/internal/util/RetryRuleTest.groovy | 108 ++ subprojects/ivy/ivy.gradle | 1 + .../api/publish/ivy/IvyPublishHttpIntegTest.groovy | 8 +- .../publish/ivy/IvyPublishHttpsIntegTest.groovy | 7 +- .../api/publish/ivy/IvyPublishJavaIntegTest.groovy | 33 + .../ivy/IvyPublishMultiProjectIntegTest.groovy | 58 + .../ivy/IvyHttpPublishIntegrationTest.groovy | 9 +- .../internal/dependency/DefaultIvyDependency.java | 11 + .../internal/dependency/IvyDependencyInternal.java | 3 + .../publication/DefaultIvyPublication.java | 9 +- .../publisher/IvyDescriptorFileGenerator.java | 11 + .../org/gradle/api/publish/ivy/package-info.java | 4 +- .../api/publish/ivy/plugins/package-info.java | 4 +- .../publish/ivy/tasks/GenerateIvyDescriptor.java | 4 +- .../gradle/api/publish/ivy/tasks/package-info.java | 4 +- .../src/main/java/org/gradle/ivy/package-info.java | 4 +- .../publication/DefaultIvyPublicationTest.groovy | 13 +- .../IvyDescriptorFileGeneratorTest.groovy | 40 +- .../ivy/plugins/IvyPublishPluginTest.groovy | 16 +- .../gradle/testing/jacoco/tasks/package-info.java | 3 +- .../internal/tasks/compile/ApiGroovyCompiler.java | 4 +- .../tasks/compile/NormalizingGroovyCompiler.java | 4 +- ...aCompilationAgainstApiJarIntegrationTest.groovy | 215 ++- ...lationAgainstDependenciesIntegrationTest.groovy | 3 + .../java/JavaJvmAssemblyIntegrationTest.groovy | 164 +++ ...braryDependencyResolutionIntegrationTest.groovy | 33 +- ...guageDependencyResolutionIntegrationTest.groovy | 28 +- ...ernalDependencyResolutionIntegrationTest.groovy | 2 + .../MultipleBinaryTypesWithVariantsTest.groovy | 6 - .../VariantAwareDependencyResolutionSpec.groovy | 6 - .../tasks/compile/NormalizingJavaCompiler.java | 4 +- .../IncrementalCompilationInitializer.java | 6 +- .../incremental/RecompilationSpecProvider.java | 8 +- .../incremental/analyzer/ClassFilesAnalyzer.java | 4 +- .../incremental/jar/ClasspathJarFinder.java | 4 +- .../org/gradle/language/java/package-info.java | 4 +- .../language/java/plugins/JavaLanguagePlugin.java | 145 +- .../gradle/language/java/plugins/package-info.java | 4 +- .../gradle/language/java/tasks/package-info.java | 4 +- .../java/org/gradle/language/jvm/package-info.java | 4 +- .../language/jvm/plugins/JvmResourcesPlugin.java | 17 +- .../gradle/language/jvm/plugins/package-info.java | 4 +- .../language/jvm/tasks/ProcessResources.java | 4 +- .../gradle/language/jvm/tasks/package-info.java | 4 +- ...anguageIncrementalCompileIntegrationTest.groovy | 2 - .../assembler/plugins/AssemblerLangPlugin.java | 3 +- .../language/assembler/plugins/package-info.java | 1 + .../org/gradle/language/c/plugins/CLangPlugin.java | 2 + .../gradle/language/c/plugins/package-info.java | 1 + .../gradle/language/cpp/plugins/CppLangPlugin.java | 2 + .../gradle/language/cpp/plugins/package-info.java | 1 + .../incremental/CompilationStateSerializer.java | 2 +- .../incremental/DefaultIncrementalCompilation.java | 9 +- .../incremental/DefaultSourceIncludesResolver.java | 13 +- .../incremental/IncrementalCompilation.java | 3 + .../incremental/IncrementalCompileProcessor.java | 24 +- .../incremental/IncrementalNativeCompiler.java | 46 +- .../internal/incremental/ResolvedInclude.java | 26 +- .../incremental/SourceIncludesResolver.java | 2 +- .../tasks/AbstractNativePCHCompileTask.java | 3 + .../nativeplatform/tasks/package-info.java | 1 + .../objectivec/plugins/ObjectiveCLangPlugin.java | 2 + .../language/objectivec/plugins/package-info.java | 1 + .../plugins/ObjectiveCppLangPlugin.java | 2 + .../objectivecpp/plugins/package-info.java | 1 + .../gradle/language/rc/plugins/package-info.java | 1 + .../AbstractNativeComponentPluginTest.groovy | 32 +- .../assembler/plugins/AssemblerPluginTest.groovy | 31 +- .../gradle/language/c/plugins/CPluginTest.groovy | 5 +- .../cpp/internal/DefaultCppSourceSetTest.groovy | 6 +- .../language/cpp/plugins/CppPluginTest.groovy | 6 +- .../DefaultSourceIncludesResolverTest.groovy | 44 +- .../IncrementalCompileProcessorTest.groovy | 10 +- .../IncrementalNativeCompilerTest.groovy | 54 +- .../ScalaCompileParallelIntegrationTest.groovy | 303 ++++ .../scala/ScalaLanguageIntegrationTest.groovy | 12 +- .../internal/tasks/scala/ZincScalaCompiler.java | 77 +- .../scala/internal/DefaultScalaJvmAssembly.java | 32 + .../language/scala/internal/ScalaJvmAssembly.java | 24 + .../toolchain/DefaultScalaToolProvider.java | 14 +- .../toolchain/DownloadingScalaToolChain.java | 13 +- .../toolchain/NotFoundScalaToolProvider.java | 2 +- .../toolchain/ScalaToolChainServiceRegistry.java | 6 +- .../org/gradle/language/scala/package-info.java | 3 +- .../scala/plugins/ScalaLanguagePlugin.java | 75 +- .../language/scala/plugins/package-info.java | 4 +- .../language/scala/tasks/AbstractScalaCompile.java | 2 + .../language/scala/tasks/PlatformScalaCompile.java | 2 + .../gradle/language/scala/tasks/package-info.java | 4 +- .../language/scala/toolchain/ScalaToolChain.java | 2 + .../language/scala/toolchain/package-info.java | 4 +- .../toolchain/DefaultScalaToolProviderTest.groovy | 6 +- .../toolchain/DownloadingScalaToolChainTest.groovy | 6 +- ...ngesDuringBuildContinuousIntegrationTest.groovy | 157 +- ...nuousBuildChangeReportingIntegrationTest.groovy | 212 +++ .../jdk7/SymlinkContinuousIntegrationTest.groovy | 22 +- .../cli/converter/LayoutToPropertiesConverter.java | 13 +- .../daemon/registry/EmbeddedDaemonRegistry.java | 4 +- .../exec/ContinuousBuildActionExecuter.java | 66 +- .../exec/ContinuousBuildActionExecuterTest.groovy | 25 +- .../AbstractContinuousIntegrationTest.groovy | 32 +- .../maven/MavenPublishBasicIntegTest.groovy | 12 +- .../maven/MavenPublishCoordinatesIntegTest.groovy | 14 +- .../publish/maven/MavenPublishHttpIntegTest.groovy | 6 +- .../maven/MavenPublishHttpsIntegTest.groovy | 6 +- .../maven/MavenPublishIssuesIntegTest.groovy | 12 +- .../SamplesMavenPublishIntegrationTest.groovy | 7 +- .../MavenEarProjectPublishIntegrationTest.groovy | 1 + .../MavenJavaProjectPublishIntegrationTest.groovy | 3 + .../MavenMultiProjectPublishIntegrationTest.groovy | 4 + ...nNonUniqueSnapshotPublishIntegrationTest.groovy | 4 +- ...MavenPomGenerationPublishIntegrationTest.groovy | 4 + .../maven/MavenPublishIntegrationTest.groovy | 16 +- .../MavenSettingsPublishIntegrationTest.groovy | 4 +- .../MavenVersionRangePublishIntegrationTest.groovy | 4 + .../MavenWarProjectPublishIntegrationTest.groovy | 2 + ...SamplesMavenPomGenerationIntegrationTest.groovy | 11 +- .../SamplesMavenQuickstartIntegrationTest.groovy | 8 +- .../maven/internal/pom/DefaultMavenPom.java | 13 +- .../org/gradle/api/publish/maven/package-info.java | 4 +- .../api/publish/maven/plugins/package-info.java | 4 +- .../api/publish/maven/tasks/package-info.java | 4 +- .../main/java/org/gradle/maven/package-info.java | 4 +- .../remote/internal/inet/SocketConnection.java | 58 +- subprojects/model-core/model-core.gradle | 16 +- .../gradle/model/ModelMapIntegrationTest.groovy | 127 ++ .../gradle/model/ModelReuseIntegrationTest.groovy | 170 --- .../ModelRuleBindingFailureIntegrationTest.groovy | 1 - .../ModelRuleValidationIntegrationTest.groovy | 10 +- .../model/PluginRuleSourceIntegrationTest.groovy | 403 ----- ...rceAppliedAsProjectPluginIntegrationTest.groovy | 445 ++++++ ...SourceAppliedByRuleMethodIntegrationTest.groovy | 589 ++++++++ ...eAppliedToModelMapElementIntegrationTest.groovy | 158 ++ .../gradle/model/RuleSourceIntegrationTest.groovy | 37 + .../model/ScopedRuleSourceIntegrationTest.groovy | 157 -- ...nterfaceBackedManagedTypeIntegrationTest.groovy | 49 +- .../InvalidManagedModelRuleIntegrationTest.groovy | 24 +- ...GroovyScalarConfigurationIntegrationTest.groovy | 120 +- .../managed/ManagedModelMapIntegrationTest.groovy | 86 +- .../ManagedScalarCollectionsIntegrationTest.groovy | 65 +- .../model/managed/ManagedSetIntegrationTest.groovy | 546 ------- ...peWithUnmanagedPropertiesIntegrationTest.groovy | 9 +- .../model/managed/ModelSetIntegrationTest.groovy | 72 +- ...ScalarTypesInManagedModelIntegrationTest.groovy | 5 +- ...managedCollectionPropertyIntegrationTest.groovy | 4 +- .../InvalidModelRuleDeclarationException.java | 5 - .../src/main/java/org/gradle/model/ModelMap.java | 166 ++- .../src/main/java/org/gradle/model/ModelSet.java | 5 +- .../src/main/java/org/gradle/model/RuleInput.java | 33 + .../src/main/java/org/gradle/model/RuleSource.java | 6 + .../src/main/java/org/gradle/model/RuleTarget.java | 33 + .../src/main/java/org/gradle/model/Rules.java | 33 + .../gradle/model/collection/CollectionBuilder.java | 238 --- .../org/gradle/model/collection/ManagedSet.java | 62 - .../ChildNodeInitializerStrategyAccessor.java | 24 - .../ChildNodeInitializerStrategyAccessors.java | 42 - .../internal/ModelMapModelProjection.java | 189 --- .../org/gradle/model/collection/package-info.java | 20 - .../model/internal/core/AbstractModelAction.java | 7 +- .../internal/core/AbstractModelActionWithView.java | 11 +- .../model/internal/core/BaseInstanceFactory.java | 54 +- .../internal/core/ChainingModelProjection.java | 59 +- .../core/ChildNodeInitializerStrategyAccessor.java | 21 + .../ChildNodeInitializerStrategyAccessors.java | 40 + .../internal/core/DefaultModelRegistration.java | 48 +- .../core/DefaultNodeInitializerRegistry.java | 69 +- .../core/DependencyOnlyExtractedModelRule.java | 38 - .../model/internal/core/EmptyModelProjection.java | 17 +- .../internal/core/EmptyReferenceProjection.java | 40 + .../model/internal/core/ExtractedModelAction.java | 49 - .../internal/core/ExtractedModelRegistration.java | 45 - .../model/internal/core/ExtractedModelRule.java | 27 - .../internal/core/FactoryBasedNodeInitializer.java | 187 --- .../org/gradle/model/internal/core/Hidden.java | 31 + .../gradle/model/internal/core/ModelAdapter.java | 4 +- .../internal/core/ModelMapModelProjection.java | 165 +++ .../org/gradle/model/internal/core/ModelMaps.java | 33 +- .../org/gradle/model/internal/core/ModelNode.java | 2 - .../org/gradle/model/internal/core/ModelNodes.java | 49 + .../gradle/model/internal/core/ModelPredicate.java | 20 +- .../gradle/model/internal/core/ModelPromise.java | 8 +- .../model/internal/core/ModelRegistration.java | 15 +- .../model/internal/core/ModelRegistrations.java | 103 +- .../org/gradle/model/internal/core/ModelSpec.java | 30 + .../core/ModelTypeInitializationException.java | 66 +- .../model/internal/core/MutableModelNode.java | 67 +- .../model/internal/core/NodeBackedModelMap.java | 353 +++-- .../model/internal/core/NodeBackedModelSet.java | 15 +- .../internal/core/NodeInitializerContext.java | 80 +- .../internal/core/NodeInitializerRegistry.java | 4 +- .../gradle/model/internal/core/NodePredicate.java | 117 ++ .../org/gradle/model/internal/core/Service.java | 53 - .../core/SpecializedModelMapProjection.java | 25 +- .../TypeCompatibilityModelProjectionSupport.java | 53 +- .../model/internal/core/TypedModelProjection.java | 6 +- .../internal/core/UnmanagedModelProjection.java | 32 +- .../rule/describe/AbstractModelRuleDescriptor.java | 17 +- .../core/rule/describe/ModelRuleDescriptor.java | 8 +- .../rule/describe/NestedModelRuleDescriptor.java | 14 +- .../rule/describe/SimpleModelRuleDescriptor.java | 4 + .../rule/describe/StandardDescriptorFactory.java | 38 - ...AbstractAnnotationDrivenModelRuleExtractor.java | 16 +- .../inspect/AbstractManagedModelInitializer.java | 147 -- .../internal/inspect/AbstractMethodRuleAction.java | 56 + .../AbstractModelCreationRuleExtractor.java | 68 +- .../AbstractMutationModelRuleExtractor.java | 47 +- ...bstractUnmanagedModelCreationRuleExtractor.java | 94 -- .../DefaultMethodModelRuleExtractionContext.java | 76 + .../inspect/DefaultMethodRuleDefinition.java | 35 +- .../internal/inspect/DefaultModelRuleInvoker.java | 29 +- ...efaultRuleSourceValidationProblemCollector.java | 66 + .../model/internal/inspect/ExtractedModelRule.java | 27 + .../internal/inspect/ExtractedRuleSource.java | 45 + .../inspect/FactoryBasedStructNodeInitializer.java | 39 + .../FormattingValidationProblemCollector.java | 96 ++ .../inspect/ManagedChildNodeCreatorStrategy.java | 5 +- .../inspect/ManagedModelCreationRuleExtractor.java | 114 +- .../internal/inspect/ManagedModelInitializer.java | 74 - .../internal/inspect/MethodBackedModelAction.java | 29 +- .../inspect/MethodModelRuleApplicationContext.java | 35 + .../inspect/MethodModelRuleExtractionContext.java | 21 + .../internal/inspect/MethodModelRuleExtractor.java | 11 +- .../inspect/MethodModelRuleExtractors.java | 4 +- .../model/internal/inspect/MethodRuleAction.java | 31 + .../internal/inspect/MethodRuleDefinition.java | 5 +- .../model/internal/inspect/ModelRuleExtractor.java | 533 +++++-- .../ReadonlyImmutableManagedPropertyException.java | 2 - .../inspect/RuleDefinitionRuleExtractor.java | 119 ++ .../inspect/RuleMethodBackedMutationAction.java | 39 - .../RuleSourceValidationProblemCollector.java | 27 + .../inspect/ServiceModelCreationRuleExtractor.java | 33 - .../internal/inspect/StructNodeInitializer.java | 193 +++ .../UnmanagedModelCreationRuleExtractor.java | 90 +- .../UnmanagedPropertyMissingSetterException.java | 9 +- .../inspect/ValidationProblemCollector.java | 45 + .../manage/binding/AbstractDelegationBinding.java | 39 + .../binding/AbstractStructMethodBinding.java | 45 + .../manage/binding/BridgeMethodBinding.java | 29 + .../manage/binding/DefaultStructBindings.java | 117 ++ .../manage/binding/DefaultStructBindingsStore.java | 561 +++++++ .../manage/binding/DelegateMethodBinding.java | 29 + .../manage/binding/DirectMethodBinding.java | 39 + .../binding/InvalidManagedTypeException.java | 29 + .../internal/manage/binding/ManagedProperty.java | 71 + .../binding/ManagedPropertyMethodBinding.java | 51 + .../binding/StructBindingExtractionContext.java | 97 ++ .../StructBindingValidationProblemCollector.java | 35 + .../internal/manage/binding/StructBindings.java | 99 ++ .../manage/binding/StructBindingsStore.java | 25 + .../manage/binding/StructMethodBinding.java | 34 + .../binding/StructMethodImplementationBinding.java | 23 + .../manage/instance/GeneratedViewState.java | 39 + .../manage/instance/ManagedProxyFactory.java | 76 +- .../manage/instance/ModelElementState.java | 12 +- .../manage/projection/ManagedModelProjection.java | 55 +- .../manage/schema/AbstractStructSchema.java | 26 +- .../manage/schema/ManagedImplStructSchema.java | 10 +- .../internal/manage/schema/ModelProperty.java | 79 +- .../internal/manage/schema/ModelSchemaStore.java | 2 + .../internal/manage/schema/RuleSourceSchema.java | 35 + .../model/internal/manage/schema/StructSchema.java | 8 + .../manage/schema/UnmanagedImplStructSchema.java | 11 +- .../manage/schema/cache/ModelSchemaCache.java | 66 +- ...CollectionNodeInitializerExtractionSupport.java | 7 +- .../manage/schema/extract/CollectionStrategy.java | 36 - .../schema/extract/ConstructableTypesRegistry.java | 25 - .../extract/DefaultConstructableTypesRegistry.java | 44 - .../DefaultModelSchemaExtractionContext.java | 53 +- .../extract/DefaultModelSchemaExtractor.java | 116 ++ .../schema/extract/DefaultModelSchemaStore.java | 28 +- ...toryBasedNodeInitializerExtractionStrategy.java | 52 - ...sedStructNodeInitializerExtractionStrategy.java | 73 + .../InvalidManagedModelElementTypeException.java | 47 +- .../schema/extract/JavaUtilCollectionStrategy.java | 68 + .../schema/extract/JdkValueTypeStrategy.java | 9 +- ...mplStructNodeInitializerExtractionStrategy.java | 21 +- .../schema/extract/ManagedImplStructStrategy.java | 331 +---- .../schema/extract/ManagedProxyClassGenerator.java | 443 +++--- ...anagedSetNodeInitializerExtractionStrategy.java | 116 -- .../manage/schema/extract/ManagedSetStrategy.java | 30 - .../internal/manage/schema/extract/MethodType.java | 87 -- .../ModelMapNodeInitializerExtractionStrategy.java | 7 +- .../manage/schema/extract/ModelMapStrategy.java | 17 +- .../extract/ModelPropertyExtractionContext.java | 62 +- .../extract/ModelPropertyExtractionResult.java | 20 +- .../extract/ModelSchemaExtractionContext.java | 10 +- .../extract/ModelSchemaExtractionStrategy.java | 7 + .../schema/extract/ModelSchemaExtractor.java | 104 +- .../manage/schema/extract/ModelSchemaUtils.java | 19 +- .../ModelSetNodeInitializerExtractionStrategy.java | 2 +- .../manage/schema/extract/ModelSetStrategy.java | 49 +- .../extract/NodeInitializerExtractionStrategy.java | 3 +- .../manage/schema/extract/PrimitiveStrategy.java | 4 +- .../manage/schema/extract/PrimitiveTypes.java | 49 + .../extract/PropertyAccessorExtractionContext.java | 12 +- .../schema/extract/PropertyAccessorType.java | 142 ++ .../RuleSourceSchemaExtractionStrategy.java | 42 + ...ollectionNodeInitializerExtractionStrategy.java | 32 +- .../schema/extract/ScalarCollectionStrategy.java | 60 - .../manage/schema/extract/ScalarTypes.java | 25 +- .../manage/schema/extract/SetStrategy.java | 58 - .../extract/SpecializedMapNodeInitializer.java | 65 + ...alizedMapNodeInitializerExtractionStrategy.java | 49 +- .../schema/extract/SpecializedMapStrategy.java | 5 +- .../StructSchemaExtractionStrategySupport.java | 178 +-- .../extract/UnmanagedCollectionStrategy.java | 46 - .../extract/UnmanagedImplStructStrategy.java | 54 +- .../UnmanagedModelElementTypeException.java | 23 - .../method/WeaklyTypeReferencingMethod.java | 28 +- .../model/internal/registry/BindingPredicate.java | 18 +- .../internal/registry/DefaultModelRegistry.java | 747 +++------- .../model/internal/registry/ModelBinding.java | 5 - .../model/internal/registry/ModelElementNode.java | 254 ++++ .../gradle/model/internal/registry/ModelGraph.java | 50 +- .../model/internal/registry/ModelListener.java | 7 +- .../model/internal/registry/ModelNodeInternal.java | 161 +- .../internal/registry/ModelReferenceNode.java | 77 +- .../model/internal/registry/ModelRegistry.java | 24 +- .../internal/registry/ModelRegistryInternal.java | 36 + .../registry/PathBinderCreationListener.java | 6 +- .../model/internal/registry/RuleBindings.java | 217 ++- .../model/internal/registry/RuleContext.java | 17 - .../model/internal/registry/SingleNodeBinding.java | 20 - .../report/IncompatibleTypeReferenceReporter.java | 12 +- .../model/internal/type/ClassTypeWrapper.java | 30 +- .../internal/type/GenericArrayTypeWrapper.java | 24 +- .../org/gradle/model/internal/type/ModelType.java | 149 +- .../org/gradle/model/internal/type/ModelTypes.java | 73 +- .../internal/type/ParameterizedTypeWrapper.java | 123 +- .../internal/type/TypeVariableTypeWrapper.java | 126 +- .../gradle/model/internal/type/TypeWrapper.java | 11 +- .../model/internal/type/WildcardTypeWrapper.java | 36 +- .../model/internal/type/WildcardWrapper.java | 26 + .../main/java/org/gradle/model/package-info.java | 3 +- .../gradle/model/ManagedModelMapTypesTest.groovy | 74 +- .../org/gradle/model/ManagedNamedTest.groovy | 29 +- .../model/ManagedNodeBackedModelMapTest.groovy | 973 +----------- .../org/gradle/model/NodeBackedModelMapSpec.groovy | 1219 +++++++++++++++ .../model/UnmanagedNodeBackedModelMapTest.groovy | 835 +---------- .../internal/core/BaseInstanceFactoryTest.groovy | 36 +- .../InstanceBackedModelRegistrationTest.groovy | 6 +- .../model/internal/core/ModelTypeJavaTest.java | 8 + .../model/internal/core/ModelTypeTest.groovy | 388 ++++- .../core/UnmanagedModelProjectionTest.groovy | 11 +- .../describe/StandardDescriptorFactoryTest.groovy | 38 - .../inspect/AbstractJavaPropertyRules.java | 46 + ...herManagedWithPropertyOfInvalidManagedType.java | 3 +- .../ClassModelRuleSourceValidationTest.groovy | 31 +- ...FormattingValidationProblemCollectorTest.groovy | 109 ++ .../internal/inspect/ManagedAnnotatedClass.java | 23 - .../inspect/ManagedModelInitializerTest.groovy | 74 +- .../ManagedWithPropertyOfInvalidManagedType.java | 3 +- .../ManagedWithReferenceOfInvalidManagedType.java | 5 +- .../internal/inspect/ModelRuleBindingTest.groovy | 17 +- .../internal/inspect/ModelRuleExtractorTest.groovy | 467 ++++-- .../inspect/MutationRuleExecutionOrderTest.groovy | 18 +- .../gradle/model/internal/inspect/OuterClass.java | 3 - .../inspect/RuleDefinitionRuleExtractorTest.groovy | 54 + .../model/internal/inspect/WithGroovyMeta.groovy | 41 + .../binding/DefaultStructBindingsStoreTest.groovy | 694 +++++++++ .../manage/instance/ManagedProxyTest.groovy | 49 - .../AbstractCollectionModelProjectionTest.groovy | 20 +- .../projection/ModelSetModelProjectionTest.groovy | 4 +- .../schema/extract/CustomTestAnnotation.groovy | 25 + .../schema/extract/CustomTestAnnotation2.groovy | 23 + .../extract/DefaultModelSchemaExtractorTest.groovy | 1055 +++++++++++++ .../extract/DefaultModelSchemaStoreTest.groovy | 35 +- .../extract/JavaUtilCollectionStrategyTest.groovy | 64 + .../extract/ManagedImplStructStrategyTest.groovy | 4 +- .../extract/ManagedProxyClassGeneratorTest.groovy | 252 +++- .../schema/extract/ModelMapStrategyTest.groovy | 4 +- .../schema/extract/ModelSchemaExtractorTest.groovy | 1552 -------------------- .../schema/extract/ModelSetStrategyTest.groovy | 4 +- .../schema/extract/PrimitiveTypesTest.groovy | 75 + .../schema/extract/PropertyAccessorTypeTest.groovy | 126 ++ .../RuleSourceSchemaExtractionStrategyTest.groovy | 60 + .../extract/ScalarCollectionStrategyTest.groovy | 53 - .../extract/ScalarTypesInManagedModelTest.groovy | 4 +- .../extract/SpecializedModelMapStrategyTest.groovy | 4 +- ...TypeWithManagedSuperTypeExtractionStrategy.java | 28 - .../extract/UnmanagedCollectionStrategyTest.groovy | 42 - .../extract/UnmanagedImplStructStrategyTest.groovy | 4 +- .../model/internal/registry/BeanRules.groovy | 28 + .../registry/DefaultModelRegistryTest.groovy | 259 ++-- .../model/internal/registry/ModelGraphTest.groovy | 204 +-- .../registry/ModelNodeReplacementTest.groovy | 61 - .../registry/ModelRegistryEphemeralNodeTest.groovy | 209 --- .../model/internal/registry/RegistrySpec.groovy | 57 +- .../internal/registry/RuleBindingsTest.groovy | 329 ++++- .../model/internal/registry/ScopedRuleTest.groovy | 45 +- .../model/internal/type/ModelTypesTest.groovy | 35 + .../model/internal/fixture/ModelActionBuilder.java | 16 +- .../internal/fixture/ModelRegistrationBuilder.java | 182 --- .../internal/fixture/ModelRegistryHelper.java | 4 +- .../fixture/ModelRegistryHelperExtension.java | 230 ++- .../internal/fixture/ProjectRegistrySpec.groovy | 56 +- .../fixture/TestManagedProxyFactory.groovy | 23 - .../fixture/TestNodeInitializerRegistry.java | 39 - .../internal/NonTransformedModelDslBacking.java | 6 +- .../dsl/internal/TransformedModelDslBacking.java | 10 +- .../nativeintegration/services/NativeServices.java | 4 +- subprojects/performance/performance.gradle | 224 ++- .../BuildReceiptPluginPerformanceTest.groovy | 99 ++ .../ConfigurationPerformanceTest.groovy | 49 - .../performance/DaemonPerformanceTest.groovy | 2 +- .../DependencyReportPerformanceTest.groovy | 2 +- .../IdeIntegrationPerformanceTest.groovy | 4 +- ...aBuildConfigurationDaemonPerformanceTest.groovy | 82 ++ .../JavaBuildConfigurationPerformanceTest.groovy | 71 + .../JavaSoftwareModelBuildPerformanceTest.groovy | 46 +- ...wareModelCompileAvoidancePerformanceTest.groovy | 14 +- ...oftwareModelConfigurationPerformanceTest.groovy | 54 - .../JavaSoftwareModelSourceFileUpdater.groovy | 69 +- .../MonolithicNativePluginPerformanceTest.groovy | 158 -- .../performance/NativeBuildPerformanceTest.groovy | 8 +- .../NativeScenarioPerformanceTest.groovy | 18 - .../OldJavaPluginBigProjectPerformanceTest.groovy | 6 +- .../OldVsNewJavaPluginPerformanceTest.groovy | 31 +- .../ProjectDependenciesPerformanceTest.groovy | 2 +- .../RealWorldNativePluginPerformanceTest.groovy | 146 ++ .../performance/SourceUpdateCardinality.java | 51 + .../TestExecutionPerformanceTest.groovy | 2 +- .../performance/VariantsPerformanceTest.groovy | 47 +- .../templates/java-sw-model-project/build.gradle | 7 +- .../src/templates/native-monolithic/common.gradle | 5 - .../templates/native-monolithic/components.gradle | 12 +- .../src/templates/root-project/build.gradle | 16 + .../gradle/performance/ResultSpecification.groovy | 6 +- .../CrossVersionPerformanceResultsTest.groovy | 287 ---- ...CrossVersionPerformanceTestExecutionTest.groovy | 287 ++++ .../CrossVersionPerformanceTestRunnerTest.groovy | 22 +- .../results/CrossBuildResultsStoreTest.groovy | 321 +++- .../results/CrossVersionResultsStoreTest.groovy | 112 +- .../results/TestPageGeneratorTest.groovy | 47 + .../AbstractCrossBuildPerformanceTest.groovy | 7 +- .../AbstractCrossVersionPerformanceTest.groovy | 17 +- .../categories/BasicPerformanceTest.java | 2 +- .../BuildReceiptPluginPerformanceTest.java | 23 + .../gradle/performance/categories/Experiment.java | 2 +- .../categories/GradleCorePerformanceTest.java | 21 + .../categories/JavaPerformanceTest.java | 2 +- .../categories/NativePerformanceTest.java | 2 +- .../performance/fixture/BaselineVersion.groovy | 4 - .../performance/fixture/BuildDisplayInfo.groovy | 6 +- .../fixture/BuildExperimentListener.java | 2 - .../fixture/BuildExperimentListenerAdapter.java | 5 - .../performance/fixture/BuildExperimentRunner.java | 53 +- .../performance/fixture/BuildExperimentSpec.groovy | 7 +- .../BuildReceiptPerformanceTestRunner.groovy | 53 + .../fixture/CrossBuildPerformanceResults.groovy | 14 +- .../fixture/CrossBuildPerformanceTestRunner.groovy | 2 +- .../fixture/CrossVersionPerformanceResults.groovy | 21 +- .../CrossVersionPerformanceTestRunner.groovy | 60 +- .../fixture/GradleInvocationSpec.groovy | 16 +- .../fixture/MeasuredOperationList.groovy | 4 +- .../performance/fixture/PerformanceTestResult.java | 30 +- .../performance/fixture/PerformanceTestSpec.java | 12 +- .../fixture/TextFileDataReporter.groovy | 35 - .../performance/results/AllResultsStore.java | 4 +- .../results/BaseCrossBuildResultsStore.java | 270 ++++ .../results/BuildReceiptsResultsStore.java | 27 + .../performance/results/CompositeResultsStore.java | 4 +- .../results/CrossBuildPerformanceTestHistory.java | 199 +++ .../results/CrossBuildResultsStore.java | 242 +-- .../results/CrossBuildTestExecutionHistory.java | 128 -- .../CrossVersionPerformanceTestHistory.java | 227 +++ .../results/CrossVersionResultsStore.java | 85 +- .../results/CrossVersionTestExecutionHistory.java | 150 -- .../performance/results/HtmlPageGenerator.java | 49 +- .../performance/results/IndexPageGenerator.java | 69 +- .../performance/results/PerformanceResults.java | 39 - .../results/PerformanceTestExecution.java | 74 + .../results/PerformanceTestHistory.java | 54 + .../performance/results/ReportGenerator.java | 3 +- .../gradle/performance/results/ResultsStore.java | 4 +- .../performance/results/ScenarioDefinition.java | 55 + .../performance/results/TestDataGenerator.java | 18 +- .../performance/results/TestExecutionHistory.java | 37 - .../performance/results/TestPageGenerator.java | 351 +++-- .../resources/org/gradle/reporting/style.css | 49 +- subprojects/platform-base/platform-base.gradle | 8 +- .../AbstractComponentModelIntegrationTest.groovy | 14 +- .../base/AssembleTaskIntegrationTest.groovy | 149 -- .../BinariesLifecycleTaskIntegrationTest.groovy | 181 +++ .../base/ComponentBinariesIntegrationTest.groovy | 44 +- .../base/ComponentModelIntegrationTest.groovy | 26 +- .../ComponentModelReportIntegrationTest.groovy | 364 +++++ .../base/CustomBinaryIntegrationTest.groovy | 53 +- .../base/CustomBinaryTasksIntegrationTest.groovy | 217 ++- .../CustomComponentBinariesIntegrationTest.groovy | 105 +- .../base/CustomComponentIntegrationTest.groovy | 61 +- .../CustomComponentPluginIntegrationTest.groovy | 4 +- .../CustomComponentSourceSetIntegrationTest.groovy | 259 +++- .../base/FunctionalSourceSetIntegrationTest.groovy | 181 ++- .../base/InternalViewsSampleIntegrationTest.groovy | 68 + .../base/LanguageSourceSetIntegrationTest.groovy | 96 +- .../base/LanguageTypeIntegrationTest.groovy | 12 +- .../base/LanguageTypeSampleIntegrationTest.groovy | 14 +- .../VariantAspectExtractionIntegrationTest.groovy | 32 +- .../LifecycleBasePluginIntegrationTest.groovy | 32 - ...efaultLibraryResolutionErrorMessageBuilder.java | 6 +- .../LibraryResolutionErrorMessageBuilder.java | 24 +- .../resolve/LocalLibraryDependencyResolver.java | 126 +- .../resolve/LocalLibraryMetaDataAdapter.java | 2 +- .../api/internal/resolve/VariantsMatcher.java | 3 +- .../gradle/language/base/DependentSourceSet.java | 2 + .../base/internal/JointCompileTaskConfig.java | 26 + .../base/internal/LanguageSourceSetFactory.java | 37 +- .../base/internal/LanguageSourceSetInternal.java | 5 - .../model/BinarySourceTransformations.java | 135 ++ .../base/internal/model/ComponentBinaryRules.java | 48 - .../base/internal/model/ComponentRules.java | 75 +- .../internal/model/ComponentSpecInitializer.java | 54 - .../DefaultLibraryLocalComponentMetaData.java | 89 +- .../internal/model/DefaultVariantsMetaData.java | 11 +- .../internal/registry/DefaultLanguageRegistry.java | 48 - .../internal/registry/LanguageRegistration.java | 12 +- .../base/internal/registry/LanguageRegistry.java | 26 - .../registry/NamedLanguageRegistration.java | 18 +- .../resolve/DependentSourceSetResolveContext.java | 68 - .../resolve/LocalComponentResolveContext.java | 74 + .../org/gradle/language/base/package-info.java | 4 +- .../base/plugins/ComponentModelBasePlugin.java | 153 +- .../language/base/plugins/LanguageBasePlugin.java | 182 +-- .../gradle/language/base/plugins/package-info.java | 4 +- .../base/sources/BaseLanguageSourceSet.java | 9 +- .../gradle/language/base/sources/package-info.java | 4 +- .../org/gradle/platform/base/BinaryContainer.java | 1 - .../java/org/gradle/platform/base/BinaryTasks.java | 11 +- .../platform/base/BinaryTasksCollection.java | 6 +- .../java/org/gradle/platform/base/BinaryType.java | 2 +- .../org/gradle/platform/base/ComponentSpec.java | 2 +- .../org/gradle/platform/base/ComponentType.java | 4 +- .../gradle/platform/base/ComponentTypeBuilder.java | 3 + .../platform/base/InvalidModelException.java | 2 + .../org/gradle/platform/base/LanguageType.java | 2 +- .../platform/base/LibraryBinaryDependencySpec.java | 48 + .../platform/base/ModelInstantiationException.java | 2 + .../gradle/platform/base/ToolChainRegistry.java | 3 + .../java/org/gradle/platform/base/TypeBuilder.java | 16 +- .../platform/base/binary/BaseBinarySpec.java | 72 +- .../base/binary/internal/BaseBinaryRules.java | 48 + .../gradle/platform/base/binary/package-info.java | 4 +- .../platform/base/component/BaseComponentSpec.java | 4 +- .../platform/base/component/package-info.java | 4 +- .../platform/base/internal/BinarySpecInternal.java | 8 + .../internal/BinaryTasksCollectionWrapper.java | 8 +- .../DefaultLibraryBinaryDependencySpec.java | 93 ++ .../PlatformAwareComponentSpecInternal.java | 2 - .../internal/VariantAspectExtractionStrategy.java | 18 +- .../builder/LanguageTypeBuilderInternal.java | 24 - .../base/internal/builder/TypeBuilderFactory.java | 23 - ...nnotationDrivenComponentModelRuleExtractor.java | 66 +- .../internal/registry/AbstractTypeBuilder.java | 4 +- .../registry/BinaryTasksModelRuleExtractor.java | 131 +- .../registry/BinaryTypeModelRuleExtractor.java | 62 +- .../ComponentBinariesModelRuleExtractor.java | 101 +- .../registry/ComponentTypeModelRuleExtractor.java | 57 +- .../registry/LanguageTypeModelRuleExtractor.java | 83 +- .../base/internal/registry/ModelMapBasedRule.java | 38 +- .../internal/registry/TypeModelRuleExtractor.java | 133 +- .../org/gradle/platform/base/package-info.java | 4 +- .../platform/base/plugins/BinaryBasePlugin.java | 126 ++ .../gradle/platform/base/plugins/package-info.java | 21 + .../platform/base/test/TestSuiteBinarySpec.java | 31 - .../platform/base/test/TestSuiteContainer.java | 27 - .../gradle/platform/base/test/TestSuiteSpec.java | 31 - .../gradle/platform/base/test/package-info.java | 23 - .../org.gradle.binary-base.properties | 1 + .../org.gradle.component-base.properties | 1 + .../internal/resolve/VariantsMatcherTest.groovy | 8 +- .../ComponentTypeModelRuleExtractorTest.groovy | 74 +- .../model/DefaultVariantsMetaDataTest.groovy | 6 +- .../model/VariantsMetaDataHelperTest.groovy | 11 +- .../LanguageTypeModelRuleExtractorTest.groovy | 83 +- .../DependentSourceSetResolveContextTest.groovy | 69 - .../LocalComponentResolveContextTest.groovy | 50 + .../plugins/ComponentModelBasePluginTest.groovy | 96 ++ .../base/plugins/LanguageBasePluginTest.groovy | 70 +- .../base/sources/BaseLanguageSourceSetTest.groovy | 4 +- .../platform/base/binary/BaseBinarySpecTest.groovy | 36 +- .../base/component/BaseComponentSpecTest.groovy | 32 +- ...AbstractAnnotationModelRuleExtractorTest.groovy | 80 +- .../BinaryTasksModelRuleExtractorTest.groovy | 68 +- .../BinaryTypeModelRuleExtractorTest.groovy | 86 +- .../ComponentBinariesModelRuleExtractorTest.groovy | 48 +- .../base/plugins/BinaryBasePluginTest.groovy | 126 ++ .../sources/BaseLanguageSourceSetFixtures.groovy | 35 +- .../platform/base/PlatformBaseSpecification.groovy | 80 + .../platform/base/binary/BaseBinaryFixtures.groovy | 26 +- .../base/component/BaseComponentFixtures.groovy | 31 +- .../fixtures/BaseInstanceFixtureSupport.groovy | 58 + .../plugin/AbstractLanguagePluginSpec.groovy | 6 +- ...ustomJarBinarySpecSubtypeIntegrationTest.groovy | 5 +- .../gradle/jvm/ModelReuseIntegrationTest.groovy | 61 - ...latformJvmComponentReportIntegrationTest.groovy | 30 +- .../resolve/JvmLocalLibraryMetaDataAdapter.java | 129 +- .../java/archives/internal/DefaultManifest.java | 12 +- .../internal/DefaultManifestMergeSpec.java | 8 +- .../main/java/org/gradle/jvm/JarBinarySpec.java | 27 +- .../main/java/org/gradle/jvm/JvmBinarySpec.java | 6 - .../main/java/org/gradle/jvm/JvmBinaryTasks.java | 32 - .../main/java/org/gradle/jvm/JvmComponentSpec.java | 2 + .../src/main/java/org/gradle/jvm/JvmResources.java | 1 - .../jvm/internal/AbstractJvmBinaryRenderer.java | 4 +- .../gradle/jvm/internal/DefaultJarBinarySpec.java | 92 +- .../gradle/jvm/internal/DefaultJvmAssembly.java | 61 + .../gradle/jvm/internal/DefaultJvmBinarySpec.java | 99 ++ .../gradle/jvm/internal/DefaultJvmBinaryTasks.java | 33 - .../gradle/jvm/internal/DefaultJvmLibrarySpec.java | 15 +- .../jvm/internal/DependencyResolvingClasspath.java | 65 +- .../org/gradle/jvm/internal/JarBinaryRules.java | 15 +- .../gradle/jvm/internal/JarBinarySpecInternal.java | 15 +- .../java/org/gradle/jvm/internal/JvmAssembly.java | 56 + .../gradle/jvm/internal/JvmBinarySpecInternal.java | 24 + .../SourceSetDependencyResolvingClasspath.java | 45 + .../org/gradle/jvm/internal/WithDependencies.java | 32 + .../org/gradle/jvm/internal/WithJvmAssembly.java | 27 + .../jvm/internal/services/PlatformJvmServices.java | 19 +- .../src/main/java/org/gradle/jvm/package-info.java | 4 +- .../jvm/platform/internal/DefaultJavaPlatform.java | 2 - .../org/gradle/jvm/plugins/JvmComponentPlugin.java | 68 +- .../java/org/gradle/jvm/plugins/package-info.java | 4 +- .../main/java/org/gradle/jvm/tasks/api/ApiJar.java | 221 +-- .../jvm/tasks/api/internal/ApiClassExtractor.java | 81 +- .../jvm/tasks/api/internal/ApiMemberSelector.java | 15 +- .../java/org/gradle/jvm/tasks/package-info.java | 4 +- .../org/gradle/jvm/toolchain/package-info.java | 1 + .../JvmLocalLibraryDependencyResolverTest.groovy | 25 +- .../jvm/internal/DefaultJarBinarySpecTest.groovy | 4 +- .../jvm/internal/DefaultJvmBinaryTasksTest.groovy | 64 - .../jvm/internal/DefaultJvmLibrarySpecTest.groovy | 4 +- .../internal/plugins/CreateJvmBinariesTest.groovy | 8 +- .../ApiClassExtractorAnnotationsTest.groovy | 1 - .../internal/ApiClassExtractorTestSupport.groovy | 9 +- subprojects/platform-native/platform-native.gradle | 28 +- .../ModelReuseIntegrationTest.groovy | 87 -- ...formNativeComponentReportIntegrationTest.groovy | 59 +- .../TestSuiteDefinitionIntegrationSpec.groovy | 218 --- .../TestSuiteModelIntegrationSpec.groovy | 347 ----- .../InstallExecutableIntegrationTest.groovy | 92 ++ .../language/nativeplatform/package-info.java | 1 + .../nativeplatform/NativeLibraryBinarySpec.java | 4 +- .../internal/DefaultStaticLibraryBinarySpec.java | 2 +- .../internal/NativeBinaryRenderer.java | 31 + .../nativeplatform/internal/NativeComponents.java | 99 ++ .../internal/configure/NativeBinaries.java | 1 + .../internal/services/NativeBinaryServices.java | 8 +- .../org/gradle/nativeplatform/package-info.java | 1 + .../nativeplatform/platform/package-info.java | 1 + .../plugins/NativeComponentModelPlugin.java | 137 +- .../nativeplatform/plugins/package-info.java | 1 + .../nativeplatform/tasks/InstallExecutable.groovy | 15 +- .../tasks/PrefixHeaderFileGenerateTask.java | 2 + .../gradle/nativeplatform/tasks/package-info.java | 1 + .../test/NativeTestSuiteBinarySpec.java | 83 -- .../nativeplatform/test/NativeTestSuiteSpec.java | 33 - .../internal/DefaultNativeTestSuiteBinarySpec.java | 102 -- .../gradle/nativeplatform/test/package-info.java | 20 - .../test/plugins/NativeBinariesTestPlugin.java | 107 -- .../test/tasks/RunTestExecutable.groovy | 72 - .../toolchain/internal/ExtendableToolChain.java | 6 +- .../nativeplatform/toolchain/package-info.java | 1 + .../toolchain/plugins/package-info.java | 1 + .../internal/DefaultNativeComponentTest.groovy | 4 +- .../DefaultNativeExecutableBinarySpecTest.groovy | 7 +- .../DefaultNativeExecutableSpecTest.groovy | 3 +- .../internal/DefaultNativeLibrarySpecTest.groovy | 3 +- .../DefaultSharedLibraryBinarySpecTest.groovy | 8 +- .../DefaultStaticLibraryBinarySpecTest.groovy | 8 +- .../internal/NativeBinarySpecTest.groovy | 9 +- .../internal/TestNativeBinariesFactory.java | 15 +- .../DefaultNativeTestSuiteBinarySpecTest.groovy | 68 - ...bstractInstalledToolChainIntegrationSpec.groovy | 4 +- .../fixtures/NativeInstallationFixture.groovy | 6 +- ...dPlayAndJvmLibraryProjectIntegrationTest.groovy | 13 +- ...dPlayAndLegacyJavaProjectIntegrationTest.groovy | 35 + .../PlayBinaryApplicationIntegrationTest.groovy | 23 +- ...ayDistributionApplicationIntegrationTest.groovy | 45 +- ...ayMultiProjectApplicationIntegrationTest.groovy | 11 +- ...ayPlatformComponentReportIntegrationTest.groovy | 6 +- .../integtest/PlayPlatformIntegrationTest.groovy | 6 +- .../PlayTestApplicationIntegrationTest.groovy | 8 +- .../PlayBinaryAdvancedAppIntegrationTest.groovy | 8 +- ...ayDistributionAdvancedAppIntegrationTest.groovy | 19 +- ...aScriptCompilerContinuousIntegrationTest.groovy | 2 +- ...ltiProjectContinuousBuildIntegrationTest.groovy | 24 +- .../PlayMultiProjectReloadIntegrationTest.groovy | 16 +- ...yRoutesCompilerContinuousIntegrationTest.groovy | 2 +- ...ayTwirlCompilerContinuousIntegrationTest.groovy | 2 +- .../UserGuidePlaySamplesIntegrationTest.groovy | 10 +- .../PlayApplicationPluginIntegrationTest.groovy | 16 +- .../PlayDistributionPluginIntegrationTest.groovy | 107 +- ...stractCoffeeScriptCompileIntegrationTest.groovy | 34 +- .../AbstractJavaScriptMinifyIntegrationTest.groovy | 33 +- .../AbstractRoutesCompileIntegrationTest.groovy | 55 +- .../CoffeeScriptCompileIntegrationTest.groovy | 79 +- ...offeeScriptImplementationIntegrationTest.groovy | 19 +- .../tasks/DistributionZipIntegrationTest.groovy | 2 +- .../tasks/JavaScriptMinifyIntegrationTest.groovy | 70 +- .../Play24RoutesCompileIntegrationTest.groovy | 2 +- .../play/tasks/TwirlCompileIntegrationTest.groovy | 163 +- .../play/tasks/TwirlVersionIntegrationTest.groovy | 18 +- .../org/gradle/language/twirl/TwirlImports.java | 27 + .../org/gradle/language/twirl/TwirlSourceSet.java | 9 + .../twirl/internal/DefaultTwirlSourceSet.java | 13 + .../org/gradle/language/twirl/package-info.java | 3 +- .../org/gradle/play/PlayApplicationBinarySpec.java | 8 +- .../java/org/gradle/play/PlayApplicationSpec.java | 3 +- .../org/gradle/play/distribution/package-info.java | 3 +- .../internal/DefaultPlayApplicationBinarySpec.java | 83 +- .../DefaultPlayPlatformAwareComponentSpec.java | 4 +- .../gradle/play/internal/JavaScriptSourceCode.java | 22 + .../PlayApplicationBinarySpecInternal.java | 11 +- .../org/gradle/play/internal/ScalaSourceCode.java | 22 + .../spec/PlayApplicationBinaryRenderer.java | 16 + .../internal/twirl/DefaultTwirlCompileSpec.java | 11 +- .../play/internal/twirl/TwirlCompileSpec.java | 3 +- .../gradle/play/internal/twirl/TwirlCompiler.java | 2 +- .../internal/twirl/TwirlCompilerAdapterV10X.java | 8 +- .../internal/twirl/TwirlCompilerAdapterV22X.java | 19 +- .../twirl/VersionedTwirlCompilerAdapter.java | 3 +- .../main/java/org/gradle/play/package-info.java | 1 + .../org/gradle/play/platform/PlayPlatform.java | 6 +- .../gradle/play/plugins/PlayApplicationPlugin.java | 181 +-- .../play/plugins/PlayCoffeeScriptPlugin.java | 177 ++- .../play/plugins/PlayDistributionPlugin.java | 161 +- .../gradle/play/plugins/PlayJavaScriptPlugin.java | 135 +- .../play/plugins/PlayPluginConfigurations.java | 4 +- .../org/gradle/play/plugins/PlayRoutesPlugin.java | 127 ++ .../org/gradle/play/plugins/PlayTestPlugin.java | 5 +- .../org/gradle/play/plugins/PlayTwirlPlugin.java | 153 ++ .../java/org/gradle/play/plugins/package-info.java | 5 +- .../org/gradle/play/tasks/JavaScriptMinify.java | 1 - .../java/org/gradle/play/tasks/RoutesCompile.java | 1 - .../java/org/gradle/play/tasks/TwirlCompile.java | 30 +- .../java/org/gradle/play/tasks/package-info.java | 3 +- .../scala/internal/reflect/package-info.java | 23 - .../DefaultCoffeeScriptSourceSetTest.groovy | 4 +- .../internal/DefaultJavaScriptSourceSetTest.groovy | 4 +- .../play/plugins/PlayCoffeeScriptPluginTest.groovy | 39 +- ...istributionPluginRenameArtifactFilesTest.groovy | 144 ++ .../play/plugins/PlayDistributionPluginTest.groovy | 24 +- .../play/plugins/PlayJavaScriptPluginTest.groovy | 39 +- ...actPlayCompilerContinuousIntegrationTest.groovy | 2 +- .../gradle/play/integtest/fixtures/PlayApp.groovy | 2 +- ...ayMultiVersionApplicationIntegrationTest.groovy | 5 + .../play/integtest/fixtures/Repositories.groovy | 2 +- .../integtest/fixtures/app/AdvancedPlayApp.groovy | 5 + .../fixtures/app/WithFailingTestsApp.groovy | 2 +- .../app/controllers/jva/PureJava.java | 4 +- .../app/controllers/scala/MixedJava.java | 30 - .../app/controllers/scla/MixedJava.java | 30 + .../fixtures/app/advancedplayapp/build.gradle | 14 + .../fixtures/app/advancedplayapp/conf/scala.routes | 4 +- .../advancedplayapp/templates/jva/index.scala.html | 11 + ...ginResolutionServiceCommsIntegrationTest.groovy | 6 +- .../internal/PluginUsePluginServiceRegistry.java | 13 +- .../use/resolve/internal/PluginResolver.java | 2 - .../HttpPluginResolutionServiceClient.java | 29 +- .../HttpPluginResolutionServiceClientTest.groovy | 6 +- subprojects/plugins/plugins.gradle | 11 +- .../api/plugins/BasePluginIntegrationTest.groovy | 12 + .../DistributionPluginIntegrationTest.groovy | 1 + .../BasicGroovyCompilerIntegrationSpec.groovy | 25 + .../PluginsComponentReportIntegrationTest.groovy | 20 +- .../gradle/testing/fixture/TestNGCoverage.groovy | 36 - ...JUnitLoggingOutputCaptureIntegrationTest.groovy | 295 ---- .../TestNGStaticLoggingIntegrationTest.groovy | 147 -- .../testng/TestNGSuiteIntegrationTest.groovy | 74 - .../org/gradle/api/distribution/package-info.java | 3 +- .../internal/jvm/ClassDirectoryBinaryRenderer.java | 35 - .../jvm/DefaultClassDirectoryBinarySpec.java | 20 +- .../gradle/api/internal/jvm/JvmBinaryRenderer.java | 35 + .../gradle/api/internal/tasks/CompileServices.java | 4 +- .../tasks/testing/SuiteTestClassProcessor.java | 67 - .../detection/AbstractTestFrameworkDetector.java | 183 --- .../testing/detection/DefaultTestExecuter.java | 81 - .../testing/detection/JarFilePackageLister.java | 68 - .../tasks/testing/junit/JULRedirector.java | 42 - .../internal/tasks/testing/testng/TestNGSpec.java | 110 -- .../testing/testng/TestNGTestClassProcessor.java | 162 -- .../tasks/testing/testng/TestNGTestFramework.java | 126 -- .../groovy/org/gradle/api/plugins/BasePlugin.java | 4 +- .../org/gradle/api/plugins/JavaBasePlugin.java | 13 +- .../groovy/org/gradle/api/tasks/testing/Test.java | 1160 --------------- .../api/tasks/testing/junit/JUnitOptions.groovy | 51 - .../api/tasks/testing/testng/TestNGOptions.groovy | 264 ---- .../jvm/application/scripts/package-info.java | 1 + .../api/internal/plugins/windowsStartScript.txt | 2 +- .../tasks/DefaultGroovySourceSetTest.groovy | 4 +- .../tasks/DefaultSourceSetContainerTest.java | 5 +- .../api/internal/tasks/DefaultSourceSetTest.groovy | 9 +- .../junit/JUnitTestClassProcessorData.groovy | 293 ---- .../junit/JUnitTestClassProcessorTest.groovy | 297 ---- .../org/gradle/api/tasks/testing/TestTest.java | 3 +- .../tasks/testing/testng/TestNGOptionsTest.groovy | 4 + .../testing/BuildableTestResultsProvider.groovy | 163 -- .../org/gradle/api/publish/package-info.java | 4 +- .../gradle/api/publish/plugins/package-info.java | 4 +- .../reporting/internal/TaskReportContainer.java | 2 +- .../gradle/authentication/http/package-info.java | 4 +- .../transport/http/DefaultHttpSettings.java | 15 +- .../transport/http/DefaultSslContextFactory.java | 181 +++ .../transport/http/HttpClientConfigurer.java | 101 +- .../resource/transport/http/HttpClientHelper.java | 48 +- .../transport/http/HttpConnectorFactory.java | 8 +- .../http/HttpResourcesPluginServiceRegistry.java | 8 +- .../transport/http/HttpResponseResource.java | 8 +- .../resource/transport/http/HttpSettings.java | 4 + .../resource/transport/http/SslContextFactory.java | 23 + .../transport/http/ntlm/NTLMSchemeFactory.java | 14 +- .../transport/http/HttpClientConfigurerTest.groovy | 48 +- .../transport/http/HttpClientHelperTest.groovy | 21 +- .../maven/MavenS3RepoResolveIntegrationTest.groovy | 12 +- .../MavenS3SnapshotRepoIntegrationTest.groovy | 6 +- .../org/gradle/authentication/package-info.java | 4 +- .../SamplesMixedJavaAndScalaIntegrationTest.groovy | 5 +- .../scala/ScalaBasePluginIntegrationTest.groovy | 39 +- ...ctAntForkingScalaCompilerIntegrationTest.groovy | 13 +- .../internal/tasks/scala/ScalaCompilerFactory.java | 6 +- .../api/plugins/scala/ScalaBasePlugin.groovy | 14 - .../org/gradle/api/tasks/scala/ScalaCompile.java | 2 +- .../tasks/DefaultScalaSourceSetTest.groovy | 4 +- .../gradle/api/tasks/scala/ScalaCompileTest.java | 8 +- .../NoSigningCredentialsIntegrationSpec.groovy | 9 +- .../plugins/signing/SigningSamplesSpec.groovy | 6 +- .../testkit/TestKitEndUserIntegrationTest.groovy | 363 +---- .../testkit/TestKitSamplesIntegrationTest.groovy | 11 +- .../AbstractGradleRunnerIntegrationTest.groovy | 108 -- .../GradleRunnerArgumentsIntegrationTest.groovy | 11 +- .../GradleRunnerBuildFailureIntegrationTest.groovy | 11 +- ...GradleRunnerCaptureOutputIntegrationTest.groovy | 28 +- ...GradleRunnerGradleVersionIntegrationTest.groovy | 112 +- .../runner/GradleRunnerIntegrationTest.groovy | 310 ++++ ...radleRunnerIsolatedDaemonIntegrationTest.groovy | 16 +- ...unnerManualClassInjectionIntegrationTest.groovy | 95 ++ ...leRunnerMechanicalFailureIntegrationTest.groovy | 16 +- ...adleRunnerPluginInjectionIntegrationTest.groovy | 60 +- .../GradleRunnerResultIntegrationTest.groovy | 10 +- .../runner/GradleRunnerSmokeIntegrationTest.groovy | 24 +- ...UnsupportedFeatureFailureIntegrationTest.groovy | 122 ++ .../fixtures/GradleRunnerIntegTestRunner.groovy | 74 - .../gradle/testkit/runner/fixtures/NoDebug.java | 28 - .../testkit/runner/fixtures/annotations/Debug.java | 28 + .../annotations/InjectsPluginClasspath.java | 25 + .../fixtures/annotations/InspectsBuildOutput.java | 25 + .../annotations/InspectsExecutedTasks.java | 25 + .../runner/fixtures/annotations/NoDebug.java | 28 + .../fixtures/annotations/NonCrossVersion.java | 28 + .../runner/UnsupportedFeatureException.java | 36 + .../runner/internal/BuildOperationParameters.java | 37 + .../runner/internal/DefaultGradleRunner.java | 3 +- .../runner/internal/FeatureCheckBuildResult.java | 71 + .../runner/internal/GradleExecutionResult.java | 12 +- .../runner/internal/ToolingApiGradleExecutor.java | 13 +- .../feature/BuildResultOutputFeatureCheck.java | 42 + .../feature/BuildResultTasksFeatureCheck.java | 40 + .../runner/internal/feature/FeatureCheck.java | 21 + .../runner/internal/feature/TestKitFeature.java | 37 + .../org/gradle/testkit/runner/package-info.java | 1 + .../runner/internal/DefaultGradleRunnerTest.groovy | 14 +- .../internal/FeatureCheckBuildResultTest.groovy | 110 ++ .../BuildResultOutputFeatureCheckTest.groovy | 58 + .../BuildResultTasksFeatureCheckTest.groovy | 49 + .../tasks/testing/AbstractTestDescriptor.java | 0 .../tasks/testing/DecoratingTestDescriptor.java | 0 .../tasks/testing/DefaultTestClassDescriptor.java | 0 .../tasks/testing/DefaultTestClassRunInfo.java | 0 .../tasks/testing/DefaultTestDescriptor.java | 0 .../tasks/testing/DefaultTestMethodDescriptor.java | 0 .../tasks/testing/DefaultTestOutputEvent.java | 0 .../tasks/testing/DefaultTestSuiteDescriptor.java | 0 .../api/internal/tasks/testing/JULRedirector.java | 42 + .../tasks/testing/NoMatchingTestsReporter.java | 0 .../tasks/testing/SuiteTestClassProcessor.java | 66 + .../internal/tasks/testing/TestClassProcessor.java | 0 .../internal/tasks/testing/TestClassRunInfo.java | 0 .../internal/tasks/testing/TestCompleteEvent.java | 0 .../tasks/testing/TestDescriptorInternal.java | 0 .../tasks/testing/TestResultProcessor.java | 0 .../api/internal/tasks/testing/TestStartEvent.java | 0 .../tasks/testing/TestSuiteExecutionException.java | 0 .../testing/WorkerTestClassProcessorFactory.java | 0 .../tasks/testing/filter/DefaultTestFilter.java | 0 .../tasks/testing/filter/TestSelectionMatcher.java | 0 .../tasks/testing/logging/AbstractTestLogger.java | 0 .../logging/ClassMethodNameStackTraceSpec.java | 0 .../tasks/testing/logging/DefaultTestLogging.java | 0 .../logging/DefaultTestLoggingContainer.java | 0 .../testing/logging/FullExceptionFormatter.java | 0 .../testing/logging/GroovyStackTraceSpec.java | 0 .../testing/logging/ShortExceptionFormatter.java | 0 .../tasks/testing/logging/StackTraceFilter.java | 0 .../tasks/testing/logging/TestCountLogger.java | 0 .../tasks/testing/logging/TestEventLogger.java | 0 .../testing/logging/TestExceptionFormatter.java | 0 .../testing/logging/TruncatedStackTraceSpec.java | 0 .../CaptureTestOutputTestResultProcessor.java | 0 .../DefaultStandardOutputRedirector.java | 0 .../processors/MaxNParallelTestClassProcessor.java | 0 .../RestartEveryNTestClassProcessor.java | 0 .../processors/StandardOutputRedirector.java | 0 .../tasks/testing/processors/TestMainAction.java | 0 .../testing/processors/TestOutputRedirector.java | 0 .../results/AttachParentTestResultProcessor.java | 0 .../tasks/testing/results/DefaultTestResult.java | 0 .../results/StateTrackingTestResultProcessor.java | 0 .../tasks/testing/results/TestListenerAdapter.java | 0 .../testing/results/TestListenerInternal.java | 0 .../internal/tasks/testing/results/TestState.java | 0 .../testing/results/UnknownTestDescriptor.java | 0 .../testing/worker/ForkingTestClassProcessor.java | 0 .../testing/worker/RemoteTestClassProcessor.java | 0 .../tasks/testing/worker/TestEventSerializer.java | 0 .../internal/tasks/testing/worker/TestWorker.java | 0 .../testing/worker/WorkerTestClassProcessor.java | 0 .../gradle/api/tasks/testing/TestDescriptor.java | 0 .../api/tasks/testing/TestExecutionException.java | 0 .../org/gradle/api/tasks/testing/TestFilter.java | 0 .../api/tasks/testing/TestFrameworkOptions.java | 0 .../org/gradle/api/tasks/testing/TestListener.java | 0 .../gradle/api/tasks/testing/TestOutputEvent.java | 0 .../api/tasks/testing/TestOutputListener.java | 0 .../org/gradle/api/tasks/testing/TestResult.java | 0 .../tasks/testing/logging/TestExceptionFormat.java | 0 .../api/tasks/testing/logging/TestLogEvent.java | 0 .../api/tasks/testing/logging/TestLogging.java | 0 .../testing/logging/TestLoggingContainer.java | 0 .../testing/logging/TestStackTraceFilter.java | 0 .../api/tasks/testing/logging/package-info.java | 0 .../org/gradle/api/tasks/testing/package-info.java | 0 .../platform/base/test/TestSuiteBinarySpec.java | 32 + .../platform/base/test/TestSuiteContainer.java | 27 + .../gradle/platform/base/test/TestSuiteSpec.java | 38 + .../gradle/platform/base/test/package-info.java | 21 + .../testing/base/TestSuiteTaskCollection.java | 30 + .../testing/base/internal/BaseTestSuiteSpec.java | 36 + .../base/plugins/TestingModelBasePlugin.java | 78 + .../gradle/testing/base/plugins/package-info.java | 20 + .../testing/DefaultTestClassDescriptorTest.groovy | 0 .../testing/DefaultTestSuiteDescriptorTest.groovy | 0 .../testing/SuiteTestClassProcessorTest.groovy | 0 .../tasks/testing/TestStartEventTest.groovy | 0 .../testing/filter/DefaultTestFilterTest.groovy | 0 .../testing/filter/TestSelectionMatcherTest.groovy | 0 .../testing/logging/AbstractTestLoggerTest.groovy | 0 .../ClassMethodNameStackTraceSpecTest.groovy | 0 .../logging/DefaultTestLoggingContainerTest.groovy | 0 .../testing/logging/DefaultTestLoggingTest.groovy | 0 .../logging/FullExceptionFormatterTest.groovy | 0 .../logging/GroovyStackTraceSpecTest.groovy | 0 .../logging/ShortExceptionFormatterTest.groovy | 0 .../testing/logging/SimpleTestDescriptor.groovy | 0 .../testing/logging/SimpleTestOutputEvent.groovy | 0 .../testing/logging/StackTraceFilterTest.groovy | 0 .../testing/logging/TestCountLoggerTest.groovy | 0 .../testing/logging/TestEventLoggerTest.groovy | 0 .../logging/TruncatedStackTraceSpecTest.groovy | 0 ...CaptureTestOutputTestResultProcessorTest.groovy | 0 .../DefaultStandardOutputRedirectorTest.groovy | 0 .../MaxNParallelTestClassProcessorTest.groovy | 0 .../RestartEveryNTestClassProcessorTest.java | 0 .../testing/processors/TestMainActionTest.groovy | 0 .../processors/TestOutputRedirectorTest.groovy | 0 .../AttachParentTestResultProcessorTest.groovy | 0 .../testing/results/DefaultTestResultTest.groovy | 0 .../StateTrackingTestResultProcessorTest.groovy | 0 .../worker/ForkingTestClassProcessorTest.groovy | 0 .../testing/worker/TestEventSerializerTest.groovy | 0 .../tasks/testing/worker/TestWorkerTest.groovy | 0 .../base/plugins/TestingModelBasePluginTest.groovy | 93 ++ .../tasks/testing/MethodTestOutputEvent.groovy | 0 .../internal/tasks/testing/SimpleTestResult.groovy | 0 subprojects/testing-base/testing-base.gradle | 26 + .../JUnitTestSuitePluginGoodBehaviourTest.groovy | 25 + ...bstractJUnitTestExecutionIntegrationSpec.groovy | 52 + .../JUnitComponentUnderTestIntegrationTest.groovy | 359 +++++ .../test/JUnitIncrementalTestExecutionTest.groovy | 172 +++ ...itStandaloneTestExecutionIntegrationTest.groovy | 883 +++++++++++ ...tTestSuiteComponentReportIntegrationTest.groovy | 281 ++++ .../testing/IncrementalTestIntegrationTest.groovy | 0 .../testing/TestEnvironmentIntegrationTest.groovy | 0 .../TestOutputListenerIntegrationTest.groovy | 0 .../testing/TestReportIntegrationTest.groovy | 0 .../gradle/testing/TestTaskIntegrationTest.groovy | 0 .../gradle/testing/TestingIntegrationTest.groovy | 0 .../CucumberJVMReportIntegrationTest.groovy | 0 .../AbstractTestFilteringIntegrationTest.groovy | 0 .../gradle/testing/fixture/JUnitCoverage.groovy | 0 .../gradle/testing/fixture/TestNGCoverage.groovy | 38 + .../junit/JUnitAssumptionsIntegrationTest.groovy | 0 .../JUnitCategoriesCoverageIntegrationSpec.groovy | 0 .../junit/JUnitCategoriesIntegrationSpec.groovy | 0 .../JUnitClassLevelFilteringIntegrationTest.groovy | 0 .../JUnitConsoleLoggingIntegrationTest.groovy | 0 .../junit/JUnitFilteringIntegrationTest.groovy | 0 .../JUnitFilteringSupportIntegrationTest.groovy | 0 ...itIgnoreClassMultiVersionIntegrationSpec.groovy | 0 .../testing/junit/JUnitIntegrationTest.groovy | 0 .../testing/junit/JUnitJnaIntegrationTest.groovy | 0 ...JUnitLoggingOutputCaptureIntegrationTest.groovy | 295 ++++ .../junit/JUnitMultiVersionIntegrationSpec.groovy | 0 ...JUnitTestFilteringSamplesIntegrationTest.groovy | 0 .../testng/SampleTestNGIntegrationTest.groovy | 0 .../TestNGConsoleLoggingIntegrationTest.groovy | 0 .../TestNGFailurePolicyIntegrationTest.groovy | 0 .../testng/TestNGFilteringIntegrationTest.groovy | 0 .../TestNGGroupByInstancesIntegrationTest.groovy | 103 ++ ...upByInstancesNotSupportedIntegrationTest.groovy | 48 + .../testing/testng/TestNGIntegrationTest.groovy | 0 ...estNGLoggingOutputCaptureIntegrationTest.groovy | 0 .../TestNGParallelSuiteIntegrationTest.groovy | 0 .../TestNGPreserveOrderIntegrationTest.groovy | 117 ++ ...PreserveOrderNotSupportedIntegrationTest.groovy | 48 + .../TestNGProducesOldReportsIntegrationTest.groovy | 0 .../TestNGStaticLoggingIntegrationTest.groovy | 147 ++ ...TestNGSuiteInitialisationIntegrationTest.groovy | 0 .../testng/TestNGSuiteIntegrationTest.groovy | 104 ++ ...tNGXmlResultAndHtmlReportIntegrationTest.groovy | 0 .../doesNotRunStaleTests/src/test/java/Broken.java | 0 .../NewMainClass.java | 0 .../executesTestsWhenSourceChanges/NewOk.java | 0 .../src/main/java/MainClass.java | 0 .../build.gradle | 0 .../src/test/java/JUnitExtra.java | 0 .../src/test/java/JUnitTest.java | 0 .../src/test/java/TestNGTest.java | 0 .../shared/build.gradle | 0 .../shared/src/test/java/Ok.java | 0 .../testing/SuiteTimestampIntegrationTest.groovy | 0 .../build.gradle | 0 .../src/test/java/org/gradle/JUnitTest.java | 0 .../test/java/org/gradle/MySecurityManager.java | 0 .../build.gradle | 0 .../src/test/java/org/gradle/JUnitTest.java | 0 .../test/java/org/gradle/MySystemClassLoader.java | 0 .../build.gradle | 0 .../src/main/java/org/gradle/MyAgent.java | 0 .../main/java/org/gradle/MySystemClassLoader.java | 0 .../src/test/java/org/gradle/JUnitTest.java | 0 .../build.gradle | 0 .../src/test/java/org/gradle/JMockitTest.java | 0 .../build.gradle | 0 .../src/test/java/HelloStepdefs.java | 0 .../src/test/java/RunCukesTest.java | 0 .../src/test/resources/helloworld.feature | 0 .../supportsAssumptions/build.gradle | 0 .../test/java/org/gradle/TestWithAssumptions.java | 0 .../build.gradle | 0 .../src/test/java/org/gradle/CategoryA.java | 0 .../src/test/java/org/gradle/LocaleHolder.java | 0 .../src/test/java/org/gradle/Locales.java | 0 .../src/test/java/org/gradle/SomeLocaleTests.java | 0 .../test/java/org/gradle/SomeMoreLocalTests.java | 0 .../canSpecifyExcludesOnly/build.gradle | 0 .../src/test/java/org/gradle/CatATests.java | 0 .../src/test/java/org/gradle/CategoryA.java | 0 .../src/test/java/org/gradle/NoCatTests.java | 0 .../src/test/java/org/gradle/SomeOtherCat.java | 0 .../test/java/org/gradle/SomeOtherCatTests.java | 0 .../src/test/java/org/gradle/SomeTests.java | 0 .../build.gradle | 0 .../src/test/java/org/gradle/CatACTests.java | 0 .../src/test/java/org/gradle/CatADTests.java | 0 .../src/test/java/org/gradle/CatATests.java | 0 .../src/test/java/org/gradle/CatBTests.java | 0 .../src/test/java/org/gradle/CatCBTests.java | 0 .../src/test/java/org/gradle/CatCTests.java | 0 .../src/test/java/org/gradle/CatDTests.java | 0 .../src/test/java/org/gradle/CatZTests.java | 0 .../src/test/java/org/gradle/CategoryA.java | 0 .../src/test/java/org/gradle/CategoryB.java | 0 .../src/test/java/org/gradle/CategoryC.java | 0 .../src/test/java/org/gradle/CategoryD.java | 0 .../src/test/java/org/gradle/CategoryZ.java | 0 .../src/test/java/org/gradle/MixedTests.java | 0 .../src/test/java/org/gradle/NoCatTests.java | 0 .../reportsUnloadableCategories/build.gradle | 0 .../src/test/java/org/gradle/SomeTestClass.java | 0 .../build.gradle | 0 .../src/test/java/org/gradle/SomeTest.java | 0 .../shared/build.gradle | 0 .../src/test/groovy/org/gradle/JUnit4Test.groovy | 0 .../standardOutputLogging/build.gradle | 0 .../org/gradle/JUnit4StandardOutputTest.groovy | 0 .../canHandleClassLevelIgnoredTests/build.gradle | 0 .../test/java/org/gradle/CustomIgnoredTest.java | 0 .../src/test/java/org/gradle/IgnoredTest.java | 0 .../canHaveMultipleTestTaskInstances/build.gradle | 0 .../src/test/java/org/gradle/Test1.java | 0 .../src/test/java/org/gradle/Test2.java | 0 .../canRunSingleTests/build.gradle | 0 .../canRunSingleTests/src/test/java/NotATest.java | 0 .../canRunSingleTests/src/test/java/Ok.java | 0 .../canRunSingleTests/src/test/java/Ok2.java | 0 .../canRunTestsUsingJUnit3/build.gradle | 0 .../createsRunnerBeforeTests/build.gradle | 0 .../src/test/java/org/gradle/CustomRunner.java | 0 .../test/java/org/gradle/ExecutionOrderTest.java | 0 .../detectsTestClasses/build.gradle | 0 .../test/java/org/gradle/AbstractHasRunWith.java | 0 .../src/test/java/org/gradle/CustomRunner.java | 0 .../test/java/org/gradle/EmptyRunWithSubclass.java | 0 .../src/test/java/org/gradle/TestsOnInner.java | 0 .../executesTestsInCorrectEnvironment/build.gradle | 0 .../src/test/java/org/gradle/OkTest.java | 0 .../src/test/java/org/gradle/OtherTest.java | 0 .../src/test/java/org/gradle/Junit3Test.java | 0 .../src/test/java/org/gradle/Junit4Test.java | 0 .../src/test/java/org/gradle/NoTest.java | 0 .../build.gradle | 0 .../src/test/java/org/gradle/BrokenAfter.java | 0 .../src/test/java/org/gradle/BrokenAfterClass.java | 0 .../src/test/java/org/gradle/BrokenBefore.java | 0 .../test/java/org/gradle/BrokenBeforeAndAfter.java | 0 .../test/java/org/gradle/BrokenBeforeClass.java | 0 .../test/java/org/gradle/BrokenConstructor.java | 0 .../src/test/java/org/gradle/BrokenException.java | 0 .../src/test/java/org/gradle/BrokenRunner.java | 0 .../src/test/java/org/gradle/BrokenTest.java | 0 .../java/org/gradle/ClassWithBrokenRunner.java | 0 .../src/test/java/org/gradle/CustomException.java | 0 .../src/test/java/org/gradle/Unloadable.java | 0 .../java/org/gradle/UnserializableException.java | 0 .../suitesOutputIsVisible/build.gradle | 0 .../src/test/java/org/gradle/ASuite.java | 0 .../src/test/java/org/gradle/OkTest.java | 0 .../src/test/java/org/gradle/OtherTest.java | 0 .../supportsJunit3Suites/build.gradle | 0 .../src/test/java/org/gradle/SomeSuite.java | 0 .../src/test/java/org/gradle/SomeTest1.java | 0 .../src/test/java/org/gradle/SomeTest2.java | 0 .../supportsTestCategories/build.gradle | 0 .../src/test/java/org/gradle/CategoryA.java | 0 .../src/test/java/org/gradle/CategoryB.java | 0 .../src/test/java/org/gradle/CategoryC.java | 0 .../src/test/java/org/gradle/SomeTest.java | 0 .../build.gradle | 0 .../test/java/org/gradle/SomeOtherTestSuite.java | 0 .../src/test/java/org/gradle/SomeTest.java | 0 .../src/test/java/org/gradle/SomeTestSuite.java | 0 .../canRunTestsUsingJna/build.gradle | 0 .../canRunTestsUsingJna/src/test/java/OkTest.java | 0 .../canRunTestsUsingJUnit/build.gradle | 0 .../shared/build.gradle | 0 .../TestWithFailureInConfigMethod.java | 0 .../canListenForTestResults/build.gradle | 0 .../src/test/java/AppException.java | 0 .../src/test/java/SomeTest.java | 0 .../executesTestsInCorrectEnvironment/build.gradle | 0 .../src/test/java/org/gradle/OkTest.java | 0 .../groovyJdk15Failing/build.gradle | 0 .../src/main/groovy/org/gradle/Ok.groovy | 0 .../src/test/groovy/org/gradle/BadTest.groovy | 0 .../groovyJdk15Passing/build.gradle | 0 .../src/main/groovy/org/gradle/Ok.groovy | 0 .../src/test/groovy/org/gradle/OkTest.groovy | 0 .../javaJdk14Failing/build.gradle | 0 .../src/main/java/org/gradle/Ok.java | 0 .../src/test/java/org/gradle/BadTest.java | 0 .../javaJdk15Failing/build.gradle | 0 .../src/main/java/org/gradle/Ok.java | 0 .../src/test/java/org/gradle/BadTest.java | 0 .../src/test/java/org/gradle/BrokenAfterSuite.java | 0 .../org/gradle/TestWithBrokenMethodDependency.java | 0 .../test/java/org/gradle/TestWithBrokenSetup.java | 0 .../supportsTestFactory/build.gradle | 0 .../test/java/org/gradle/factory/FactoryTest.java | 0 .../java/org/gradle/factory/TestNGFactory.java | 0 .../supportsTestGroups/build.gradle | 0 .../src/test/java/org/gradle/groups/SomeTest.java | 0 .../tasks/testing/DefaultJUnitXmlReport.java | 0 .../tasks/testing/DefaultTestTaskReports.java | 0 .../tasks/testing/TestClassLoaderFactory.java | 0 .../api/internal/tasks/testing/TestFramework.java | 0 .../detection/AbstractTestFrameworkDetector.java | 185 +++ .../detection/ClassFileExtractionManager.java | 0 .../testing/detection/DefaultTestClassScanner.java | 0 .../testing/detection/DefaultTestExecuter.java | 81 + .../testing/detection/JarFilePackageListener.java | 0 .../testing/detection/JarFilePackageLister.java | 70 + .../tasks/testing/detection/TestClassVisitor.java | 0 .../tasks/testing/detection/TestExecuter.java | 0 .../testing/detection/TestFrameworkDetector.java | 0 .../junit/AllExceptIgnoredTestRunnerBuilder.java | 0 .../tasks/testing/junit/CategoryFilter.java | 0 .../junit/IgnoredTestDescriptorProvider.java | 0 .../tasks/testing/junit/JUnitDetector.java | 0 .../internal/tasks/testing/junit/JUnitSpec.java | 0 .../testing/junit/JUnitTestClassDetecter.java | 0 .../testing/junit/JUnitTestClassExecuter.java | 0 .../testing/junit/JUnitTestClassProcessor.java | 0 .../tasks/testing/junit/JUnitTestEventAdapter.java | 0 .../tasks/testing/junit/JUnitTestFramework.java | 0 .../testing/junit/JUnitTestMethodDetecter.java | 0 .../junit/TestClassExecutionEventGenerator.java | 0 .../testing/junit/TestClassExecutionListener.java | 0 .../tasks/testing/junit/report/AllTestResults.java | 0 .../testing/junit/report/ClassPageRenderer.java | 0 .../testing/junit/report/ClassTestResults.java | 0 .../testing/junit/report/CompositeTestResults.java | 0 .../testing/junit/report/DefaultTestReport.java | 0 .../junit/report/LocaleSafeDecimalFormat.java | 0 .../testing/junit/report/OverviewPageRenderer.java | 0 .../testing/junit/report/PackagePageRenderer.java | 0 .../testing/junit/report/PackageTestResults.java | 0 .../tasks/testing/junit/report/PageRenderer.java | 0 .../tasks/testing/junit/report/TestReporter.java | 0 .../tasks/testing/junit/report/TestResult.java | 0 .../testing/junit/report/TestResultModel.java | 0 .../junit/result/AggregateTestResultsProvider.java | 0 .../result/Binary2JUnitXmlReportGenerator.java | 0 .../BinaryResultBackedTestResultsProvider.java | 0 .../junit/result/InMemoryTestResultsProvider.java | 0 .../testing/junit/result/JUnitXmlResultWriter.java | 0 .../testing/junit/result/TestClassResult.java | 0 .../tasks/testing/junit/result/TestFailure.java | 0 .../testing/junit/result/TestMethodResult.java | 0 .../junit/result/TestOutputAssociation.java | 0 .../testing/junit/result/TestOutputStore.java | 0 .../junit/result/TestReportDataCollector.java | 0 .../testing/junit/result/TestResultSerializer.java | 0 .../testing/junit/result/TestResultsProvider.java | 0 .../testng/TestNGConfigurationListener.java | 0 .../tasks/testing/testng/TestNGDetector.java | 0 .../testng/TestNGListenerAdapterFactory.java | 0 .../internal/tasks/testing/testng/TestNGSpec.java | 122 ++ .../testing/testng/TestNGTestClassDetecter.java | 0 .../testing/testng/TestNGTestClassProcessor.java | 167 +++ .../tasks/testing/testng/TestNGTestFramework.java | 150 ++ .../testing/testng/TestNGTestMethodDetecter.java | 0 .../testng/TestNGTestResultProcessorAdapter.java | 0 .../testng/UnrepresentableParameterException.java | 0 .../gradle/api/tasks/testing/JUnitXmlReport.java | 0 .../java/org/gradle/api/tasks/testing/Test.java | 1160 +++++++++++++++ .../org/gradle/api/tasks/testing/TestReport.java | 0 .../gradle/api/tasks/testing/TestTaskReports.java | 0 .../api/tasks/testing/junit/JUnitOptions.java | 72 + .../api/tasks/testing/junit/package-info.java | 0 .../api/tasks/testing/testng/TestNGOptions.java | 455 ++++++ .../api/tasks/testing/testng/package-info.java | 0 .../gradle/jvm/plugins/JUnitTestSuitePlugin.java | 87 ++ .../gradle/jvm/test/JUnitTestSuiteBinarySpec.java | 32 + .../org/gradle/jvm/test/JUnitTestSuiteSpec.java | 29 + .../gradle/jvm/test/JvmTestSuiteBinarySpec.java | 51 + .../java/org/gradle/jvm/test/JvmTestSuiteSpec.java | 36 + .../internal/DefaultJUnitTestSuiteBinarySpec.java | 166 +++ .../test/internal/DefaultJUnitTestSuiteSpec.java | 63 + .../internal/JUnitTestSuiteBinaryRenderer.java | 37 + .../internal/JUnitTestSuiteBinarySpecInternal.java | 21 + .../jvm/test/internal/JUnitTestSuiteRules.java | 63 + .../test/internal/JvmTestSuiteBinaryRenderer.java | 45 + .../internal/JvmTestSuiteBinarySpecInternal.java | 32 + .../jvm/test/internal/JvmTestSuiteRules.java | 210 +++ .../test/internal/services/JvmTestingServices.java | 47 + .../java/org/gradle/jvm/test/package-info.java | 21 + .../org.gradle.junit-test-suite.properties | 17 + ...e.internal.service.scopes.PluginServiceRegistry | 1 + .../internal/tasks/testing/junit/report/style.css | 0 .../detection/DefaultTestClassScannerTest.groovy | 0 .../detection/DefaultTestExecuterTest.groovy | 0 .../junit/JUnitTestClassProcessorData.groovy | 293 ++++ .../junit/JUnitTestClassProcessorTest.groovy | 297 ++++ .../TestClassExecutionEventGeneratorTest.groovy | 0 .../testing/junit/report/AllTestResultsTest.groovy | 0 .../junit/report/ClassTestResultsTest.groovy | 0 .../junit/report/CompositeTestResultsTest.groovy | 0 .../junit/report/DefaultTestReportTest.groovy | 0 .../junit/report/LocaleSafeDecimalFormatTest.java | 0 .../junit/report/TestResultModelTest.groovy | 0 .../testing/junit/report/TestResultTest.groovy | 0 .../result/AggregateTestResultsProviderTest.groovy | 0 .../Binary2JUnitXmlReportGeneratorSpec.groovy | 0 .../junit/result/JUnitXmlResultWriterSpec.groovy | 0 .../junit/result/TestClassResultSpec.groovy | 0 .../junit/result/TestOutputStoreSpec.groovy | 0 .../result/TestReportDataCollectorSpec.groovy | 0 .../junit/result/TestResultSerializerTest.groovy | 0 .../testng/TestNGListenerAdapterFactorySpec.groovy | 0 .../testng/TestNGTestClassProcessorTest.groovy | 0 .../testing/testng/TestNGTestFrameworkTest.groovy | 0 .../tasks/testing/BuildableTestMethodResult.groovy | 0 .../testing/BuildableTestResultsProvider.groovy | 163 ++ .../junit/report/HtmlTestResultsFixture.groovy | 0 subprojects/testing-jvm/testing-jvm.gradle | 41 + .../CUnitComponentReportIntegrationTest.groovy | 44 +- .../test/cunit/CUnitIntegrationTest.groovy | 36 +- .../googletest/GoogleTestIntegrationTest.groovy | 28 +- ...tingNativeComponentReportIntegrationTest.groovy | 18 +- .../TestSuiteDefinitionIntegrationSpec.groovy | 210 +++ .../plugins/TestSuiteModelIntegrationSpec.groovy | 350 +++++ .../test/NativeTestSuiteBinarySpec.java | 79 + .../nativeplatform/test/NativeTestSuiteSpec.java | 28 + .../cunit/internal/DefaultCUnitTestSuiteSpec.java | 7 +- .../nativeplatform/test/cunit/package-info.java | 1 + .../test/cunit/plugins/CUnitConventionPlugin.java | 49 + .../test/cunit/plugins/CUnitPlugin.java | 44 +- .../test/cunit/plugins/package-info.java | 1 + .../internal/DefaultGoogleTestTestSuiteSpec.java | 6 +- .../test/googletest/package-info.java | 1 + .../plugins/GoogleTestConventionPlugin.java | 50 + .../test/googletest/plugins/GoogleTestPlugin.java | 50 +- .../test/googletest/plugins/package-info.java | 1 + .../internal/DefaultNativeTestSuiteBinarySpec.java | 107 ++ .../internal/NativeTestSuiteBinariesRules.java | 49 + .../internal/NativeTestSuiteBinaryRenderer.java | 0 .../NativeTestSuiteBinarySpecInternal.java | 0 .../test/internal/NativeTestSuites.java | 95 +- .../internal/services/NativeTestingServices.java | 46 + .../gradle/nativeplatform/test/package-info.java | 21 + .../test/plugins/NativeBinariesTestPlugin.java | 69 + .../nativeplatform/test/plugins/package-info.java | 0 .../test/tasks/RunTestExecutable.java | 95 ++ .../nativeplatform/test/tasks/package-info.java | 0 .../org.gradle.cunit-test-suite.properties | 17 + .../gradle-plugins/org.gradle.cunit.properties | 2 +- .../org.gradle.google-test-test-suite.properties | 17 + .../org.gradle.google-test.properties | 2 +- ...e.internal.service.scopes.PluginServiceRegistry | 2 + .../nativeplatform/test/cunit/CUnitTest.groovy | 5 +- .../test/googletest/GoogleTestTest.groovy | 5 +- .../DefaultNativeTestSuiteBinarySpecTest.groovy | 68 + .../plugins/NativeBinariesTestPluginTest.groovy | 35 + subprojects/testing-native/testing-native.gradle | 6 +- .../tooling-api-builders.gradle | 2 +- .../ToolingApiCompatibilitySuiteRunner.groovy | 2 + .../tooling/fixture/ToolingApiSpecification.groovy | 14 + .../ToolingApiEclipseModelCrossVersionSpec.groovy | 13 +- .../ToolingApiEclipseModelCrossVersionSpec.groovy | 161 ++ .../ToolingApiIdeaModelCrossVersionSpec.groovy | 316 ++++ ...tinuousBuildCancellationCrossVersionSpec.groovy | 1 + .../org/gradle/tooling/events/OperationType.java | 3 + .../org/gradle/tooling/events/package-info.java | 1 + .../gradle/tooling/events/task/package-info.java | 1 + .../gradle/tooling/events/test/package-info.java | 1 + .../internal/adapter/ProtocolToModelAdapter.java | 9 +- .../internal/consumer/DistributionFactory.java | 4 +- .../connection/AbstractConsumerConnection.java | 3 +- .../BuildActionRunnerBackedConsumerConnection.java | 9 +- ...CancellableModelBuilderBackedModelProducer.java | 10 +- .../connection/HasCompatibilityMapperAction.java | 40 + ...InternalConnectionBackedConsumerConnection.java | 9 +- .../ModelBuilderBackedModelProducer.java | 10 +- .../CompatibilityIdeaProjectMapping.java | 46 + .../converters/CompositeMappingAction.java | 63 + .../converters/IdeaProjectCompatibilityMapper.java | 48 + .../model/eclipse/EclipseJavaSourceSettings.java | 35 +- .../tooling/model/eclipse/EclipseProject.java | 14 +- .../tooling/model/gradle/BuildInvocations.java | 2 - .../gradle/tooling/model/gradle/package-info.java | 3 +- .../model/idea/IdeaJavaLanguageSettings.java | 54 + .../org/gradle/tooling/model/idea/IdeaModule.java | 19 +- .../org/gradle/tooling/model/idea/IdeaProject.java | 17 +- .../gradle/tooling/model/java/InstalledJdk.java | 44 + .../org/gradle/tooling/model/java/JavaRuntime.java | 44 + .../gradle/tooling/model/java/JavaSourceAware.java | 39 - .../tooling/model/java/JavaSourceSettings.java | 35 - .../gradle/tooling/model/java/package-info.java | 1 + .../tooling/fixture/GradleVersionSpec.java | 4 +- version.txt | 2 +- 1834 files changed, 47972 insertions(+), 27365 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
