This is an automated email from the git hooks/post-receive script. seamlik-guest pushed a commit to branch master in repository gradle.
commit cf34db5148609ab37ee02071dac3998bc910d8f1 Merge: b284d9f 9e019b1 Author: Kai-Chung Yan <[email protected]> Date: Sat Jan 16 20:37:44 2016 +0800 Merge tag 'upstream/2.10' Upstream version 2.10 # gpg: 由 2016年01月16日 (週六) 20時37分01秒 CST 建立的簽章, 使用 RSA 金鑰 ID 37FE9825 # gpg: 完好的簽章來自於 "Kai-Chung Yan (seamlik) <[email protected]>" # gpg: 警告: 這把金鑰並非以受信任的簽章所認證! # gpg: 沒有證據指出這個簽章屬於這個持有者. # 主鑰指紋: B88A 153A DD3D 973F 3B1F F79A DD1F AB89 37FE 9825 buildSrc/build.gradle | 2 +- .../main/groovy/org/gradle/build/JarJarJar.groovy | 3 +- .../gradle/build/docs/BuildableDOMCategory.groovy | 3 +- .../build/docs/UserGuideTransformTask.groovy | 64 +- .../docs/dsl/docbook/AssembleDslDocTask.groovy | 37 +- .../generator/tasks/JvmProjectGeneratorTask.groovy | 56 +- .../generator/tasks/ProjectGeneratorTask.groovy | 25 +- .../org/gradle/build/docs/XmlSpecification.groovy | 16 +- config/checkstyle/suppressions.xml | 4 +- gradle/buildReceipt.gradle | 5 + gradle/buildReceiptInit.gradle | 20 + gradle/dependencies.gradle | 4 +- gradle/integTest.gradle | 9 +- gradle/wrapper/gradle-wrapper.properties | 5 +- .../antlr/Antlr2PluginIntegrationTest.groovy | 11 +- .../scripts/internal/ScriptSourceTransformer.java | 50 -- .../src/main/java/org/gradle/api/JavaVersion.java | 7 +- .../typeconversion/TypeConversionException.java | 0 .../internal/typeconversion/TypeConverter.java} | 11 +- .../UnsupportedNotationException.java | 0 .../src/main/java}/org/gradle/util/GUtil.java | 0 .../groovy/org/gradle/api/JavaVersionSpec.groovy | 13 + .../reflect/MethodSignatureEquivalenceTest.groovy | 47 ++ .../groovy/org/gradle/util}/util/GUtilTest.groovy | 0 .../plugins/MavenConversionIntegrationTest.groovy | 16 +- .../CheckstylePluginVersionIntegrationTest.groovy | 21 +- .../gradle/api/plugins/quality/Checkstyle.groovy | 21 +- .../api/plugins/quality/CheckstylePlugin.groovy | 8 +- .../api/plugins/quality/CheckstyleReports.java | 14 + .../quality/internal/CheckstyleReportsImpl.java | 7 +- .../main/resources/checkstyle-noframes-sorted.xsl | 195 ++++++ .../plugins/quality/CheckstylePluginTest.groovy | 4 + .../api/plugins/quality/CheckstyleTest.groovy | 3 + .../integtest/fixtures/CheckstyleCoverage.groovy | 2 +- .../tasks/IncrementalTasksIntegrationTest.groovy | 30 +- ...oovy => RuleTaskBridgingIntegrationTest.groovy} | 300 ++++++++- .../RuleTaskCreationIntegrationTest.groovy} | 207 ++---- ...ovy => RuleTaskExecutionIntegrationTest.groovy} | 35 +- .../execution/taskgraph/WithRuleBasedTasks.groovy | 8 +- .../groovy/org/gradle/api/file/RelativePath.java | 41 +- .../org/gradle/api/file/SourceDirectorySet.java | 2 + .../org/gradle/api/internal/BeanDynamicObject.java | 3 +- .../api/internal/DependencyClassPathProvider.java | 10 +- .../changes/IncrementalTaskInputsInternal.java | 7 +- .../changes/StatefulIncrementalTaskInputs.java | 6 - .../changedetection/rules/TaskUpToDateState.java | 5 +- .../state/DefaultFileCollectionSnapshotter.java | 2 +- .../file/collections/FilteredFileTree.java | 4 +- .../api/internal/file/collections/MapFileTree.java | 44 +- .../file/collections/jdk7/Jdk7DirectoryWalker.java | 5 +- .../loadercache/DefaultClassLoaderCache.java | 28 +- .../loadercache/HashClassPathSnapshotter.java | 27 +- .../api/internal/project/AbstractProject.java | 104 +-- ...yRuleAwarePolymorphicDomainObjectContainer.java | 77 --- .../api/internal/rules/ModelMapCreators.java | 53 -- .../RuleAwarePolymorphicDomainObjectContainer.java | 36 -- .../api/internal/tasks/DefaultTaskContainer.java | 29 +- .../tasks/DefaultTaskContainerFactory.java | 11 +- .../api/internal/tasks/TaskContainerInternal.java | 5 +- .../tasks/incremental/IncrementalTaskInputs.java | 4 +- .../internal/DefaultPersistentDirectoryCache.java | 8 +- ...emoryStore.java => MapBackedInMemoryStore.java} | 19 +- .../org/gradle/execution/TaskNameResolver.java | 7 +- .../taskgraph/DefaultTaskExecutionPlan.java | 30 +- .../scripts/internal/BuildScriptTransformer.java | 3 +- .../DefaultGradleLauncherFactory.java | 2 +- .../filewatch/DefaultFileSystemChangeWaiter.java | 142 ---- .../DefaultFileSystemChangeWaiterFactory.java | 161 +++++ .../filewatch/DefaultFileWatcherFactory.java | 5 +- .../internal/filewatch/FileSystemChangeWaiter.java | 4 +- ...ter.java => FileSystemChangeWaiterFactory.java} | 5 +- .../org/gradle/internal/filewatch/FileWatcher.java | 5 + .../internal/filewatch/FileWatcherFactory.java | 4 +- .../filewatch/jdk7/Jdk7FileWatcherFactory.java | 5 +- .../jdk7/WatchServiceFileWatcherBacking.java | 13 +- .../filewatch/jdk7/WatchServiceRegistrar.java | 53 +- .../service/scopes/GlobalScopeServices.java | 5 +- .../service/scopes/ProjectScopeServices.java | 6 + .../typeconversion/DefaultTypeConverter.java | 333 ++++++++++ .../typeconversion/NotationParserBuilder.java | 2 +- .../collection/internal/BridgedCollections.java | 17 +- .../internal/PolymorphicModelMapProjection.java | 49 -- .../internal/DynamicObjectAwareTypeUtils.java | 35 - .../src/main/groovy/org/gradle/util/Clock.java | 2 +- .../core/src/main/groovy/org/gradle/util/Path.java | 17 +- .../AsmBackedClassGeneratorGroovyTest.groovy | 30 +- .../DependencyClassPathProviderTest.groovy | 1 + .../jdk7/Jdk7DirectoryWalkerTest.groovy | 12 +- .../HashClassPathSnapshotterTest.groovy | 5 +- .../plugins/RuleSourceApplicationTest.groovy | 8 +- .../api/internal/project/DefaultProjectTest.groovy | 2 +- ...warePolymorphicDomainObjectContainerTest.groovy | 75 --- ...wareNamedDomainObjectFactoryRegistryTest.groovy | 51 -- ...rePolymorphicNamedEntityInstantiatorTest.groovy | 49 -- ...warePolymorphicDomainObjectContainerTest.groovy | 66 -- .../tasks/RealizableTaskCollectionTest.groovy | 14 +- .../gradle/execution/TaskNameResolverTest.groovy | 44 +- .../DefaultFileSystemChangeWaiterTest.groovy | 48 +- .../filewatch/DefaultFileWatcherFactoryTest.groovy | 27 +- .../jdk7/WatchServiceFileWatcherBackingTest.groovy | 3 +- .../typeconversion/DefaultTypeConverterTest.groovy | 159 +++++ .../test/groovy/org/gradle/util/PathTest.groovy | 5 +- .../ArtifactDependenciesIntegrationTest.groovy | 6 +- ...pendencyHandlerApiResolveIntegrationTest.groovy | 12 +- .../DependencyResolveRulesIntegrationTest.groovy | 18 +- ...pendencySubstitutionRulesIntegrationTest.groovy | 28 +- .../ProjectDependencyResolveIntegrationTest.groovy | 24 +- .../ResolutionResultApiIntegrationTest.groovy | 6 +- .../ResolvedConfigurationIntegrationTest.groovy | 126 ++-- ...VersionConflictResolutionIntegrationTest.groovy | 5 +- .../ivy/IvyFileRepoResolveIntegrationTest.groovy | 2 +- .../maven/BadPomFileResolveIntegrationTest.groovy | 42 -- .../MavenFileRepoResolveIntegrationTest.groovy | 2 +- .../MavenParentPomResolveIntegrationTest.groovy | 63 ++ .../MavenPomPackagingResolveIntegrationTest.groovy | 2 +- .../maven/MavenPomResolveIntegrationTest.groovy | 44 ++ .../MavenProfileResolveIntegrationTest.groovy | 73 +++ .../artifacts/DefaultResolvedArtifact.java | 11 +- .../parser/GradlePomModuleDescriptorBuilder.java | 4 +- .../store/ResolutionResultsStoreFactory.java | 41 +- .../artifacts/DefaultResolvedArtifactTest.groovy | 12 +- ...iagnosticsComponentReportIntegrationTest.groovy | 11 +- .../DetailedModelReportIntegrationTest.groovy | 14 +- .../model/ModelReportIntegrationTest.groovy | 153 ++++- .../model/ModelReportTaskIntegrationTest.groovy | 3 +- ...uildEnvironmentReportTaskIntegrationTest.groovy | 98 +++ ...pendencyInsightReportTaskIntegrationTest.groovy | 150 +++-- .../DependencyReportTaskIntegrationTest.groovy | 84 ++- .../diagnostics/HelpTaskIntegrationTest.groovy | 48 +- .../TaskReportTaskIntegrationTest.groovy | 6 +- .../org/gradle/api/plugins/HelpTasksPlugin.java | 17 +- .../api/reporting/components/ComponentReport.java | 20 +- .../internal/AbstractBinaryRenderer.java | 6 +- .../internal/ComponentReportRenderer.java | 46 +- .../components/internal/SourceSetRenderer.java | 19 +- .../gradle/api/reporting/model/ModelReport.java | 15 +- .../model/internal/ModelNodeRenderer.java | 8 +- ...Task.java => AbstractDependencyReportTask.java} | 18 +- .../api/tasks/diagnostics/AbstractReportTask.java | 28 +- .../diagnostics/BuildEnvironmentReportTask.java | 95 +++ .../tasks/diagnostics/DependencyReportTask.java | 75 +-- .../internal/ProjectReportGenerator.java} | 11 +- .../diagnostics/internal/ReportGenerator.java | 87 +++ .../gradle/api/plugins/HelpTasksPluginSpec.groovy | 1 + .../internal/SourceSetRendererTest.groovy | 4 +- .../reporting/model/ModelReportParserTest.groovy | 47 +- .../BuildEnvironmentReportTaskTest.groovy | 50 ++ .../internal/ReportGeneratorTest.groovy | 133 ++++ .../ComponentReportOutputFormatter.groovy | 2 - .../NativeComponentReportOutputFormatter.groovy | 6 +- .../api/reporting/model/ModelReportParser.groovy | 2 +- subprojects/docs/src/docs/css/base.css | 2 +- subprojects/docs/src/docs/css/userguide.css | 12 + subprojects/docs/src/docs/dsl/dsl.xml | 42 +- ...s.diagnostics.AbstractDependencyReportTask.xml} | 9 +- ...sks.diagnostics.BuildEnvironmentReportTask.xml} | 4 +- ...api.tasks.incremental.IncrementalTaskInputs.xml | 2 +- .../org.gradle.language.base.LanguageSourceSet.xml | 3 - ...age.nativeplatform.HeaderExportingSourceSet.xml | 3 - .../org.gradle.nativeplatform.NativeBinarySpec.xml | 29 +- ...rg.gradle.nativeplatform.PreprocessingTool.xml} | 0 ...adle.nativeplatform.StaticLibraryBinarySpec.xml | 5 +- ...dle.nativeplatform.platform.NativePlatform.xml} | 12 +- .../dsl/org.gradle.platform.base.BinarySpec.xml | 3 - .../dsl/org.gradle.platform.base.ComponentSpec.xml | 3 - subprojects/docs/src/docs/dsl/plugins.xml | 18 - subprojects/docs/src/docs/release/notes.md | 488 +++++++++----- .../src/docs/stylesheets/userGuideHtmlCommon.xsl | 8 +- .../docs/src/docs/userguide/buildEnvironment.xml | 11 +- .../src/docs/userguide/buildingJavaLibraries.xml | 316 +++++---- .../src/docs/userguide/commandLineTutorial.xml | 9 +- .../docs/src/docs/userguide/gradleDaemon.xml | 115 ++-- .../docs/src/docs/userguide/gradleWrapper.xml | 161 +++-- subprojects/docs/src/docs/userguide/ideSupport.xml | 58 -- .../src/docs/userguide/introMultiProjectBuilds.xml | 129 ++++ .../docs/src/docs/userguide/nativeBinaries.xml | 54 +- .../docs/src/docs/userguide/organizeBuildLogic.xml | 16 +- subprojects/docs/src/docs/userguide/playPlugin.xml | 19 +- subprojects/docs/src/docs/userguide/plugins.xml | 2 +- .../docs/src/docs/userguide/projectReports.xml | 4 +- .../userguide/{newModel.xml => softwareModel.xml} | 228 +++++-- .../src/docs/userguide/softwareModelConcepts.xml | 52 ++ .../docs/src/docs/userguide/standardPlugins.xml | 16 +- subprojects/docs/src/docs/userguide/tasks.xml | 2 +- subprojects/docs/src/docs/userguide/userguide.xml | 175 ++--- .../src/docs/userguide/writingBuildScripts.xml | 23 +- .../samples/customModel/componentType/build.gradle | 38 +- .../documentation/DocumentationComponent.groovy | 2 + .../documentation/DocumentationPlugin.groovy | 6 +- .../documentation/DocumentationSourceSet.groovy | 4 +- .../groovy/sample/markdown/MarkdownPlugin.groovy | 2 +- .../javaLibraryPlugin/apispec-support/build.gradle | 5 + .../src/main/java/org/gradle/Person.java | 17 + .../samples/javaLibraryPlugin/apispec/build.gradle | 34 +- .../src/brokenclient/java/org/gradle/Client.java | 10 + .../apispec/src/client/java/org/gradle/Client.java | 8 + .../apispec/src/main/java/org/gradle/Person.java | 13 + .../java/org/gradle/internal/PersonInternal.java | 9 + .../main/java/org/gradle/utils/StringUtils.java | 5 + .../src/main/resources/org/gradle/resource.xml | 1 + .../multiplecomponents/build.gradle | 49 +- .../src/verifier/java/org/gradle/Verifier.java | 16 + .../targetplatforms/core/build.gradle | 2 +- .../modelRules/language-support/build.gradle | 36 ++ .../src/samples/modelRules/modelDsl/build.gradle | 121 +++- .../modelRules/modelDslCoercion/build.gradle | 57 ++ .../samples/modelRules/modelDslCoercion/data.csv | 1 + .../samples/native-binaries/cpp-exe/build.gradle | 2 +- .../src/samples/native-binaries/cunit/build.gradle | 4 +- .../samples/native-binaries/prebuilt/build.gradle | 4 +- .../native-binaries/sourceset-variant/build.gradle | 8 +- .../native-binaries/tool-chains/build.gradle | 2 +- .../samples/native-binaries/variants/build.gradle | 4 +- .../src/samples/play/custom-assets/build.gradle | 4 +- .../modelRules/configureAsRequired/build.gradle | 35 + .../modelRules/configureElementsOfMap/build.gradle | 49 ++ .../build.gradle | 35 + .../basicRuleSourcePlugin-model-task.out | 8 +- .../buildingJavaLibraries-compile-avoid.out | 8 + .../buildingJavaLibraries-compile-brokenclient.out | 5 + .../buildingJavaLibraries-compile-first.out | 8 + .../buildingJavaLibraries-updateSources.out | 3 + .../src/samples/userguideOutput/listProjects.out | 14 + .../userguideOutput/model-language-support-all.out | 1 + .../modelDslConfigureRuleNotRunWhenNotRequired.out | 6 + .../modelDslConfigureRuleRunWhenRequired.out | 7 + ...itializationRuleRunsBeforeConfigurationRule.out | 9 + .../userguideOutput/modelDslModelMapNestedAll.out | 11 + .../userguideOutput/nativeComponentReport.out | 6 +- .../userguideOutput/newJavaComponentReport.out | 7 +- .../newJavaMultiComponents-clientJar.out | 5 +- .../newJavaMultiComponents-serverJar.out | 9 +- .../newJavaMultiComponents-verifierJar.out | 6 + .../samples/userguideOutput/newJavaQuickstart.out | 2 +- .../newJavaTargetPlatforms-java6MainJar.out | 12 +- .../newJavaTargetPlatforms-server.out | 36 +- .../userguideOutput/newJavaTargetPlatforms.out | 22 +- .../userguideOutput/playComponentReport.out | 2 +- .../samples/userguideOutput/taskListAllReport.out | 3 + .../src/samples/userguideOutput/taskListReport.out | 1 + ...alStudioFileCustomizationIntegrationTest.groovy | 6 +- .../VisualStudioMultiProjectIntegrationTest.groovy | 6 +- ...VisualStudioSingleProjectIntegrationTest.groovy | 10 +- .../VisualStudioProjectConfiguration.groovy | 2 +- .../internal/VisualStudioProjectResolver.java | 4 +- .../VisualStudioProjectConfigurationTest.groovy | 2 +- .../eclipse/AbstractEclipseIntegrationSpec.groovy | 28 +- .../eclipse/AbstractEclipseIntegrationTest.groovy | 8 +- .../ide/eclipse/EclipseClasspathFixture.groovy | 32 +- ...pseDependencySubstitutionIntegrationTest.groovy | 2 +- .../ide/eclipse/EclipseIntegrationTest.groovy | 44 ++ .../ide/eclipse/EclipseProjectFixture.groovy | 37 +- ...eProjectNameDeduplicationIntegrationTest.groovy | 2 +- ...ipseSourcesAndJavadocJarsIntegrationTest.groovy | 4 +- .../ide/eclipse/EclipseWtpComponentFixture.groovy | 34 +- .../ide/eclipse/EclipseWtpFacetsFixture.groovy | 26 +- .../ide/eclipse/EclipseWtpIntegrationTest.groovy | 2 +- .../eclipse/EclipseWtpModelIntegrationTest.groovy | 711 ++++++++++----------- ...deaDependencySubstitutionIntegrationTest.groovy | 2 +- .../plugins/ide/idea/IdeaIntegrationTest.groovy | 8 +- .../ide/idea/IdeaMultiModuleIntegrationTest.groovy | 8 +- .../plugins/ide/eclipse/model/EclipseJdt.groovy | 12 +- .../ide/internal/tooling/EclipseModelBuilder.java | 10 + .../tooling/eclipse/DefaultEclipseProject.java | 10 + .../tooling/java/DefaultJavaSourceSettings.java} | 22 +- .../tooling/eclipse/EclipseModelBuilderTest.groovy | 120 +++- ...gacyAndComponentJvmPluginIntegrationTest.groovy | 6 +- .../MixedNativeAndJvmProjectIntegrationTest.groovy | 14 +- .../BuildEnvironmentIntegrationTest.groovy | 4 +- .../logging/LoggingIntegrationTest.groovy | 11 +- .../SamplesRepositoriesIntegrationTest.groovy | 6 +- .../samples/UserGuideSamplesRunner.groovy | 23 +- .../fixtures/AbstractIntegrationSpec.groovy | 11 +- .../fixtures/executer/AbstractGradleExecuter.java | 3 +- .../fixtures/executer/ExecutionFailure.java | 12 +- .../fixtures/executer/ExecutionResult.java | 6 + .../executer/GradleBackedArtifactBuilder.java | 4 +- .../fixtures/executer/InProcessGradleExecuter.java | 35 +- .../executer/OutputScrapingExecutionResult.java | 12 +- .../test/fixtures/maven/AbstractMavenModule.groovy | 13 +- .../test/fixtures/maven/DelegatingMavenModule.java | 10 +- .../gradle/test/fixtures/maven/MavenModule.groovy | 4 +- .../fixtures/jvm/OsXJavaHomeParserTest.groovy | 47 +- .../test/fixtures/maven/MavenFileModuleTest.groovy | 6 +- .../fixtures/maven/MavenLocalModuleTest.groovy | 6 +- .../test/fixtures/concurrent/ConcurrentSpec.groovy | 2 +- .../file/AbstractTestDirectoryProvider.java | 15 +- .../org/gradle/test/fixtures/file/TestFile.java | 41 +- .../test/fixtures/file/TestFileHelper.groovy | 48 +- .../file/TestNameTestDirectoryProvider.java | 5 + .../internal/NativeServicesTestFixture.java | 2 +- .../ivy/plugins/IvyPublishPluginTest.groovy | 4 +- ...ncrementalJavaCompilationIntegrationTest.groovy | 83 ++- .../language/java/ApiSpecIntegrationTest.groovy | 282 -------- ...ustomComponentJarBinariesIntegrationTest.groovy | 18 +- .../gradle/language/java/DependencyScope.groovy | 65 ++ .../language/java/JarBinaryTypeVariantsTest.groovy | 12 +- ...ionAgainstApiDependenciesIntegrationTest.groovy | 54 -- ...aCompilationAgainstApiJarIntegrationTest.groovy | 142 ++-- ...lationAgainstDependenciesIntegrationTest.groovy | 151 +++++ ...braryDependencyResolutionIntegrationTest.groovy | 260 ++++---- ...guageDependencyResolutionIntegrationTest.groovy | 457 +++++++------ ...ernalDependencyResolutionIntegrationTest.groovy | 371 +++++------ .../java/JavaLanguageIntegrationTest.groovy | 14 +- .../java/JavaSourceSetIntegrationTest.groovy | 138 +--- .../language/java/JvmApiSpecIntegrationTest.groovy | 491 ++++++++++++++ .../MultipleBinaryTypesWithVariantsTest.groovy | 23 +- .../java/SampleJavaLanguageIntegrationTest.groovy | 64 +- .../java/SingleBinaryTypeWithVariantsTest.groovy | 153 ++--- .../VariantAwareDependencyResolutionSpec.groovy | 19 +- .../compile/incremental/CompilationSourceDirs.java | 67 +- .../incremental/IncrementalCompilerDecorator.java | 2 +- .../compile/incremental/SourceToNameConverter.java | 2 +- .../org/gradle/language/java/JavaSourceSet.java | 3 +- .../internal/DefaultJavaLanguageSourceSet.java | 10 +- .../language/java/plugins/JavaLanguagePlugin.java | 14 +- .../incremental/SourceToNameConverterTest.groovy | 2 +- .../DefaultJavaLanguageSourceSetTest.groovy | 19 +- .../ResourceOnlyJvmLibraryIntegrationTest.groovy | 10 +- .../jvm/internal/JvmPluginServiceRegistry.java | 11 +- .../language/jvm/plugins/JvmResourcesPlugin.java | 5 +- .../fixtures/jvm/TestJvmComponent.groovy | 4 + ...mLanguageIncrementalBuildIntegrationTest.groovy | 30 +- .../AbstractJvmLanguageIntegrationTest.groovy | 37 +- ...AbstractJvmPluginLanguageIntegrationTest.groovy | 31 +- ...eLanguageIncrementalBuildIntegrationTest.groovy | 25 +- ...anguageIncrementalCompileIntegrationTest.groovy | 106 ++- .../AbstractNativeLanguageIntegrationTest.groovy | 26 +- ...ctNativePreCompiledHeaderIntegrationTest.groovy | 4 +- .../DuplicateBaseNamesIntegrationTest.groovy | 8 +- ...yLanguageIncrementalBuildIntegrationTest.groovy | 6 +- .../AssemblyLanguageIntegrationTest.groovy | 3 +- .../language/c/CLanguageIntegrationTest.groovy | 8 +- .../language/c/MixedLanguageIntegrationTest.groovy | 4 +- .../language/cpp/CppLanguageIntegrationTest.groovy | 4 +- .../NativeLanguageSamplesIntegrationTest.groovy | 20 +- .../ParallelNativePluginsIntegrationTest.groovy | 4 +- ...anguageIncrementalCompileIntegrationTest.groovy | 6 +- ...ResourcesIncrementalBuildIntegrationTest.groovy | 6 +- .../rc/WindowsResourcesIntegrationTest.groovy | 4 +- .../plugins/internal/AssembleTaskConfig.java | 4 +- .../internal/AbstractHeaderExportingSourceSet.java | 5 - .../internal/AbstractNativeCompileSpec.java | 10 + .../nativeplatform/internal/CompileTaskConfig.java | 2 +- .../internal/PCHCompileTaskConfig.java | 2 +- .../internal/SourceCompileTaskConfig.java | 4 +- .../incremental/IncrementalCompileProcessor.java | 8 +- .../incremental/IncrementalNativeCompiler.java | 50 +- .../internal/incremental/ResolvedInclude.java | 20 + .../tasks/AbstractNativeCompileTask.java | 6 +- .../WindowsResourcesCompileTaskConfig.java | 4 +- .../language/rc/tasks/WindowsResourceCompile.java | 1 + .../AbstractNativeComponentPluginTest.groovy | 12 +- .../plugins/AssemblerLangPluginTest.groovy | 4 +- .../assembler/plugins/AssemblerPluginTest.groovy | 12 +- .../language/c/plugins/CLangPluginTest.groovy | 4 +- .../cpp/internal/DefaultCppSourceSetTest.groovy | 4 +- .../language/cpp/plugins/CppLangPluginTest.groovy | 4 +- .../DefaultSourceIncludesResolverTest.groovy | 1 + .../IncrementalCompileProcessorTest.groovy | 5 +- .../plugins/ObjectiveCLangPluginTest.groovy | 4 +- .../plugins/ObjectiveCppLangPluginTest.groovy | 4 +- .../scala/JointScalaLangIntegrationTest.groovy | 3 +- .../SampleScalaLanguageIntegrationTest.groovy | 2 +- .../scala/plugins/ScalaLanguagePlugin.java | 10 +- subprojects/launcher/launcher.gradle | 5 + .../launcher/CommandLineIntegrationSpec.groovy | 17 + .../ArchivesContinuousIntegrationTest.groovy | 37 +- ...ngesDuringBuildContinuousIntegrationTest.groovy | 57 ++ .../SmokeContinuousIntegrationTest.groovy | 9 +- .../daemon/DaemonFeedbackIntegrationSpec.groovy | 10 +- .../daemon/SingleUseDaemonIntegrationTest.groovy | 14 +- .../daemon/StoppingDaemonIntegrationSpec.groovy | 9 +- .../launcher/daemon/server/health/DaemonStats.java | 9 +- .../exec/ContinuousBuildActionExecuter.java | 15 +- .../daemon/server/health/DaemonStatsTest.groovy | 31 + .../exec/ContinuousBuildActionExecuterTest.groovy | 27 +- .../AbstractContinuousIntegrationTest.groovy | 17 +- .../org/gradle/launcher/debug/JDWPUtil.groovy | 78 +++ .../maven/MavenPublishMultiProjectIntegTest.groovy | 64 ++ .../maven/internal/pom/CustomModelBuilder.java | 2 +- .../publication/DefaultMavenPublication.java | 4 +- .../publication/DefaultMavenPublicationTest.groovy | 1 + .../maven/plugins/MavenPublishPluginTest.groovy | 3 +- .../model/ConfigurationCycleIntegrationTest.groovy | 4 +- .../gradle/model/ModelReuseIntegrationTest.groovy | 2 +- .../ModelRuleBindingFailureIntegrationTest.groovy | 20 +- .../model/ModelRuleSamplesIntegrationTest.groovy | 5 +- ...ationRuleApplicationOrderIntegrationTest.groovy | 2 +- .../model/PluginRuleSourceIntegrationTest.groovy | 26 +- ...validManagedModelMutationIntegrationTest.groovy | 4 +- .../InvalidManagedModelRuleIntegrationTest.groovy | 10 +- ...GroovyScalarConfigurationIntegrationTest.groovy | 595 +++++++++++++---- .../managed/ManagedModelMapIntegrationTest.groovy | 10 +- ...odelPropertyTargetingRuleIntegrationTest.groovy | 6 +- .../ManagedScalarCollectionsIntegrationTest.groovy | 6 +- .../model/managed/ManagedSetIntegrationTest.groovy | 23 +- .../model/managed/ModelSetIntegrationTest.groovy | 25 +- ...ScalarTypesInManagedModelIntegrationTest.groovy | 4 +- ...managedCollectionPropertyIntegrationTest.groovy | 21 +- .../src/main/java/org/gradle/model/Managed.java | 4 +- .../src/main/java/org/gradle/model/ModelMap.java | 3 +- .../internal/ModelMapModelProjection.java | 22 +- .../model/internal/core/AddProjectionsAction.java | 46 ++ .../model/internal/core/BaseInstanceFactory.java | 94 +-- ...lCreator.java => DefaultModelRegistration.java} | 51 +- .../core/DefaultNodeInitializerRegistry.java | 37 +- .../{ModelRule.java => DeferredModelAction.java} | 7 +- .../core/DirectNodeInputUsingModelAction.java | 12 + ...reator.java => ExtractedModelRegistration.java} | 12 +- .../core/FactoryBasedManagedNodeInitializer.java | 136 ---- .../internal/core/FactoryBasedNodeInitializer.java | 174 ++++- .../model/internal/core/InstanceFactory.java | 22 +- .../gradle/model/internal/core/ModelAction.java | 2 +- .../model/internal/core/ModelActionRole.java | 3 +- .../internal/core/ModelMapGroovyDecorator.java | 278 -------- .../model/internal/core/ModelMapGroovyView.java | 98 +++ .../org/gradle/model/internal/core/ModelMaps.java | 65 ++ .../org/gradle/model/internal/core/ModelNode.java | 5 +- .../{ModelCreator.java => ModelRegistration.java} | 13 +- ...{ModelCreators.java => ModelRegistrations.java} | 146 +++-- .../core/ModelTypeInitializationException.java | 25 +- .../org/gradle/model/internal/core/ModelViews.java | 9 + .../model/internal/core/MutableModelNode.java | 11 +- .../model/internal/core/NodeBackedModelMap.java | 180 ++++-- .../model/internal/core/NodeBackedModelSet.java | 4 +- .../model/internal/core/NodeInitializer.java | 20 +- .../internal/core/NodeInitializerContext.java | 44 +- .../internal/core/NodeInitializerRegistry.java | 7 +- .../core/SpecializedModelMapProjection.java | 11 +- .../core/{ModelRule.java => UnmanagedStruct.java} | 12 +- .../rule/describe/MethodModelRuleDescriptor.java | 2 +- .../inspect/AbstractManagedModelInitializer.java | 71 +- ...bstractUnmanagedModelCreationRuleExtractor.java | 8 +- .../inspect/DefaultMethodRuleDefinition.java | 3 +- .../internal/inspect/DefaultModelRuleInvoker.java | 2 +- .../inspect/ManagedModelCreationRuleExtractor.java | 32 +- .../internal/inspect/ManagedModelInitializer.java | 65 +- .../model/internal/inspect/ModelRuleExtractor.java | 28 +- .../inspect/ProjectionOnlyNodeInitializer.java | 28 +- .../inspect/ServiceModelCreationRuleExtractor.java | 6 +- .../UnmanagedModelCreationRuleExtractor.java | 6 +- .../internal/manage/instance/ManagedInstance.java | 2 +- .../manage/instance/ManagedProxyFactory.java | 25 +- .../manage/instance/ModelElementState.java | 4 + .../manage/projection/ManagedModelProjection.java | 48 +- ...StructSchema.java => AbstractStructSchema.java} | 9 +- ...CollectionSchema.java => CollectionSchema.java} | 17 +- .../internal/manage/schema/CompositeSchema.java} | 12 +- ...ImplModelSchema.java => ManagedImplSchema.java} | 8 +- ...uctSchema.java => ManagedImplStructSchema.java} | 4 +- .../{ModelValueSchema.java => ModelMapSchema.java} | 14 +- .../internal/manage/schema/ModelProperty.java | 9 + .../model/internal/manage/schema/ModelSchema.java | 3 + .../{ModelValueSchema.java => ModelSetSchema.java} | 14 +- .../manage/schema/ScalarCollectionSchema.java | 2 +- ...odelValueSchema.java => ScalarValueSchema.java} | 7 +- .../manage/schema/SpecializedMapSchema.java | 24 +- .../{ModelStructSchema.java => StructSchema.java} | 8 +- ...tSchema.java => UnmanagedImplStructSchema.java} | 11 +- .../extract/AbstractProxyClassGenerator.java | 4 +- .../manage/schema/extract/CandidateMethods.java | 114 ++++ ...CollectionNodeInitializerExtractionSupport.java | 8 +- .../schema/extract/ConstructableTypesRegistry.java | 1 + ...va => DefaultModelSchemaExtractionContext.java} | 26 +- .../manage/schema/extract/EnumStrategy.java | 4 +- ...toryBasedNodeInitializerExtractionStrategy.java | 30 +- .../InvalidManagedModelElementTypeException.java | 8 +- .../schema/extract/JdkValueTypeStrategy.java | 4 +- .../ManagedCollectionProxyClassGenerator.java | 2 +- ...mplStructNodeInitializerExtractionStrategy.java | 18 +- .../schema/extract/ManagedImplStructStrategy.java | 352 +++++----- .../schema/extract/ManagedInstanceTypeUtils.java | 30 - .../schema/extract/ManagedProxyClassGenerator.java | 435 ++++++++----- ...anagedSetNodeInitializerExtractionStrategy.java | 63 +- .../internal/manage/schema/extract/MethodType.java | 87 +++ .../ModelMapNodeInitializerExtractionStrategy.java | 62 +- .../manage/schema/extract/ModelMapStrategy.java | 15 +- .../extract/ModelPropertyExtractionContext.java | 76 +++ .../extract/ModelSchemaExtractionContext.java | 88 +-- .../schema/extract/ModelSchemaExtractor.java | 29 +- .../manage/schema/extract/ModelSchemaUtils.java | 45 +- .../ModelSetNodeInitializerExtractionStrategy.java | 63 +- .../manage/schema/extract/PrimitiveStrategy.java | 4 +- ...ollectionNodeInitializerExtractionStrategy.java | 4 +- .../schema/extract/ScalarCollectionStrategy.java | 15 +- .../manage/schema/extract/SetStrategy.java | 9 +- ...alizedMapNodeInitializerExtractionStrategy.java | 91 +++ .../schema/extract/SpecializedMapStrategy.java | 40 +- .../StructSchemaExtractionStrategySupport.java | 251 +++----- .../extract/UnmanagedImplStructStrategy.java | 40 +- .../method/WeaklyTypeReferencingMethod.java | 70 +- .../model/internal/registry/BindingPredicate.java | 1 - .../model/internal/registry/CreatorRuleBinder.java | 35 - .../internal/registry/DefaultModelRegistry.java | 249 ++++---- .../model/internal/registry/ModelActionBinder.java | 67 -- .../model/internal/registry/ModelBinding.java | 4 + .../gradle/model/internal/registry/ModelGraph.java | 38 +- ...delCreationListener.java => ModelListener.java} | 6 +- .../model/internal/registry/ModelNodeInternal.java | 71 +- .../internal/registry/ModelReferenceNode.java | 18 +- .../model/internal/registry/ModelRegistry.java | 30 +- .../registry/OneOfTypeBinderCreationListener.java | 2 +- .../registry/PathBinderCreationListener.java | 2 +- .../gradle/model/internal/registry/RuleBinder.java | 69 +- .../model/internal/registry/RuleBindings.java | 28 +- .../internal/registry/UnboundRulesProcessor.java | 12 +- .../internal/report/AmbiguousBindingReporter.java | 4 +- .../org/gradle/model/ManagedNamedTest.groovy | 34 +- .../model/ManagedNodeBackedModelMapTest.groovy | 208 ++++-- .../model/UnmanagedNodeBackedModelMapTest.groovy | 38 +- .../internal/core/BaseInstanceFactoryTest.groovy | 50 +- ... => InstanceBackedModelRegistrationTest.groovy} | 29 +- .../inspect/ManagedModelInitializerTest.groovy | 23 +- .../internal/inspect/ModelRuleExtractorTest.groovy | 101 ++- .../inspect/MutationRuleExecutionOrderTest.groovy | 3 +- .../manage/instance/ManagedProxyTest.groovy | 7 +- .../AbstractCollectionModelProjectionTest.groovy | 12 +- .../projection/ModelSetModelProjectionTest.groovy | 20 +- .../extract/DefaultModelSchemaStoreTest.groovy | 4 +- ...ManagedCollectionProxyClassGeneratorTest.groovy | 4 + .../extract/ManagedImplStructStrategyTest.groovy | 70 ++ .../extract/ManagedProxyClassGeneratorTest.groovy | 293 ++++++++- .../schema/extract/ModelMapStrategyTest.groovy | 42 ++ .../schema/extract/ModelSchemaExtractorTest.groovy | 250 +++++++- .../schema/extract/ModelSchemaUtilsTest.groovy | 70 +- .../schema/extract/ModelSetStrategyTest.groovy | 42 ++ .../extract/ScalarCollectionStrategyTest.groovy | 53 ++ .../extract/ScalarTypesInManagedModelTest.groovy | 20 +- .../extract/SpecializedModelMapStrategyTest.groovy | 40 ++ .../extract/UnmanagedCollectionStrategyTest.groovy | 42 ++ .../extract/UnmanagedImplStructStrategyTest.groovy | 82 +++ .../registry/DefaultModelRegistryTest.groovy | 375 ++++++----- .../model/internal/registry/ModelGraphTest.groovy | 182 +++--- .../internal/registry/ModelNodeInternalTest.groovy | 15 +- .../registry/ModelNodeReplacementTest.groovy | 16 +- .../registry/ModelRegistryEphemeralNodeTest.groovy | 46 +- .../model/internal/registry/RegistrySpec.groovy | 40 +- .../internal/registry/RuleBindingsTest.groovy | 6 +- .../model/internal/registry/ScopedRuleTest.groovy | 36 +- .../registry/UnboundRulesProcessorTest.groovy | 3 + ...tRuleAwareNamedDomainObjectFactoryRegistry.java | 0 ...uleAwarePolymorphicNamedEntityInstantiator.java | 0 .../RuleAwareNamedDomainObjectFactoryRegistry.java | 0 ...uleAwarePolymorphicNamedEntityInstantiator.java | 0 .../model/internal/fixture/ModelActionBuilder.java | 140 ++++ .../internal/fixture/ModelRegistrationBuilder.java | 182 ++++++ .../internal/fixture/ModelRegistryHelper.java | 599 +---------------- .../fixture/ModelRegistryHelperExtension.java | 238 +++++++ .../internal/fixture/ProjectRegistrySpec.groovy | 41 ++ .../fixture/TestManagedProxyFactory.groovy} | 11 +- .../fixture/TestNodeInitializerRegistry.java | 2 +- .../org.codehaus.groovy.runtime.ExtensionModule | 19 + .../model/dsl/ManagedTypeDslIntegrationTest.groovy | 204 ++++++ .../dsl/ModelDslCreationIntegrationTest.groovy | 81 ++- .../model/dsl/ModelDslIntegrationTest.groovy | 86 ++- .../model/dsl/ModelMapDslIntegrationTest.groovy | 466 ++++++++++++++ .../ModelDslRuleDetectionIntegrationSpec.groovy | 25 + ...odelDslRuleInputDetectionIntegrationSpec.groovy | 47 +- .../NestedModelDslUsageIntegrationSpec.groovy | 46 +- ...stedModelRuleDslDetectionIntegrationTest.groovy | 106 +++ .../internal/NonTransformedModelDslBacking.java | 18 +- .../dsl/internal/TransformedModelDslBacking.java | 113 +--- .../model/dsl/internal/inputs/PotentialInput.java | 12 +- .../model/dsl/internal/inputs/PotentialInputs.java | 11 +- .../model/dsl/internal/inputs/RuleInputAccess.java | 25 - .../transform/ClosureBackedRuleFactory.java | 120 ++++ .../dsl/internal/transform/InputReference.java} | 22 +- .../dsl/internal/transform/InputReferences.java | 50 +- .../internal/transform/ModelBlockTransformer.java | 14 +- .../model/dsl/internal/transform/RuleMetadata.java | 39 -- .../model/dsl/internal/transform/RuleVisitor.java | 235 +++++-- .../model/dsl/internal/transform/RulesVisitor.java | 33 +- .../dsl/internal/transform/SourceLocation.java | 35 +- .../dsl/internal/transform/TransformedClosure.java | 18 +- .../NonTransformedModelDslBackingTest.groovy | 31 +- .../nativeintegration/services/NativeServices.java | 48 +- subprojects/performance/performance.gradle | 111 +++- .../performance/CleanBuildPerformanceTest.groovy | 3 + .../ConfigurationPerformanceTest.groovy | 5 +- .../performance/DaemonPerformanceTest.groovy | 5 +- .../DependencyReportPerformanceTest.groovy | 5 +- .../DependencyResolutionStressTest.groovy | 6 +- .../performance/FirstBuildPerformanceTest.groovy | 5 +- .../IdeIntegrationPerformanceTest.groovy | 7 +- .../JavaSoftwareModelBuildPerformanceTest.groovy | 105 +++ ...wareModelCompileAvoidancePerformanceTest.groovy | 70 ++ ...ftwareModelConfigurationPerformanceTest.groovy} | 34 +- .../JavaSoftwareModelSourceFileUpdater.groovy | 210 ++++++ .../ManyEmptyProjectsHelpPerformanceTest.groovy | 5 +- .../MonolithicNativePluginPerformanceTest.groovy | 115 +++- ...st.groovy => NativeBuildPerformanceTest.groovy} | 5 +- .../NativeParallelPerformanceTest.groovy | 3 + .../NativePreCompiledHeaderPerformanceTest.groovy | 4 +- .../NativeScenarioPerformanceTest.groovy | 9 +- .../OldJavaPluginBigProjectPerformanceTest.groovy | 12 +- .../OldVsNewJavaPluginPerformanceTest.groovy | 21 +- .../ParallelBuildPerformanceTest.groovy | 4 + .../ProjectDependenciesPerformanceTest.groovy | 6 +- .../TestExecutionPerformanceTest.groovy | 6 +- .../UpToDateBuildPerformanceTest.groovy | 5 +- .../performance/VariantsPerformanceTest.groovy | 14 +- .../templates/build-event-timestamps/build.gradle | 4 +- .../src/templates/config-inject/build.gradle | 2 +- .../src/templates/heap-capture/build.gradle | 6 +- subprojects/performance/src/templates/init.gradle | 4 +- .../src/templates/java-source/Production.java | 30 +- .../templates/java-sw-model-project/build.gradle | 53 +- .../src/templates/native-monolithic/common.gradle | 5 + .../src/templates/new-java-plugin/build.gradle | 7 + .../src/templates/old-java-plugin/build.gradle | 5 + .../src/templates/project-with-source/build.gradle | 2 +- .../BuildEventTimestampCollectorTest.groovy | 16 +- .../performance/fixture/GCEventParserTest.groovy | 11 + .../AbstractCrossBuildPerformanceTest.groovy | 1 + .../AbstractCrossVersionPerformanceTest.groovy | 1 + .../categories/BasicPerformanceTest.java} | 12 +- .../performance/{ => categories}/Experiment.java | 7 +- .../categories/JavaPerformanceTest.java} | 13 +- .../categories/NativePerformanceTest.java} | 10 +- .../{ => categories}/PerformanceTest.java | 5 +- .../fixture/BuildEventTimestampCollector.java | 8 +- .../fixture/BuildExperimentInvocationInfo.java} | 19 +- .../fixture/BuildExperimentListener.java} | 25 +- .../fixture/BuildExperimentListenerAdapter.java} | 21 +- .../performance/fixture/BuildExperimentRunner.java | 91 ++- .../performance/fixture/BuildExperimentSpec.groovy | 12 +- .../fixture/CompilationLoggingCollector.java | 60 ++ .../fixture/CompositeDataCollector.java | 4 +- .../fixture/CrossBuildPerformanceTestRunner.groovy | 6 + .../CrossVersionPerformanceTestRunner.groovy | 9 +- .../gradle/performance/fixture/DataCollector.java | 2 +- .../gradle/performance/fixture/GCEventParser.java | 2 +- .../performance/fixture/GCLoggingCollector.java | 5 +- .../fixture/GradleExecuterBackedSession.groovy | 8 +- .../fixture/GradleInvocationCustomizer.java} | 7 +- .../fixture/GradleInvocationSpec.groovy | 29 +- .../gradle/performance/fixture/GradleSession.java | 4 +- .../org/gradle/performance/fixture/LogFiles.java | 41 ++ .../fixture/MeasuredOperationList.groovy | 2 +- .../performance/fixture/MemoryInfoCollector.groovy | 4 +- .../gradle/performance/fixture/OperationTimer.java | 4 +- .../fixture/ToolingApiBackedGradleSession.groovy | 4 +- .../AbstractComponentModelIntegrationTest.groovy | 7 +- .../base/AssembleTaskIntegrationTest.groovy | 4 +- .../language/base/BaseModelIntegrationTest.groovy} | 28 +- .../base/ComponentBinariesIntegrationTest.groovy | 123 ++-- .../ComponentBinarySourcesIntegrationTest.groovy | 331 ++++++++++ .../base/ComponentModelIntegrationTest.groovy | 236 ++----- .../base/ComponentSourcesIntegrationTest.groovy | 210 ++++++ .../base/ComponentTypeSampleIntegTest.groovy | 14 +- .../base/CustomBinaryIntegrationTest.groovy | 43 +- ...CustomBinaryInternalViewsIntegrationTest.groovy | 99 ++- .../base/CustomBinaryTasksIntegrationTest.groovy | 29 +- .../CustomComponentBinariesIntegrationTest.groovy | 140 ++-- .../base/CustomComponentIntegrationTest.groovy | 321 +++++++++- .../CustomComponentPluginIntegrationTest.groovy | 67 +- .../CustomComponentSourceSetIntegrationTest.groovy | 21 +- .../base/CustomManagedBinaryIntegrationTest.groovy | 143 +++++ .../base/FunctionalSourceSetIntegrationTest.groovy | 40 +- .../base/LanguageSourceSetIntegrationTest.groovy | 213 ++++++ .../base/LanguageTypeIntegrationTest.groovy | 24 +- .../base/LanguageTypeSampleIntegrationTest.groovy | 19 +- .../VariantAspectExtractionIntegrationTest.groovy | 15 +- .../org/gradle/api/BuildableModelElement.java | 0 .../internal/AbstractBuildableModelElement.java | 0 .../resolve/LocalLibraryDependencyResolver.java | 11 +- .../resolve/LocalLibraryMetaDataAdapter.java | 3 +- ...rceSetInternal.java => DependentSourceSet.java} | 11 +- .../gradle/language/base/FunctionalSourceSet.java | 8 +- .../gradle/language/base/LanguageSourceSet.java | 5 - .../base/internal/DefaultFunctionalSourceSet.java | 87 --- .../base/internal/LanguageSourceSetFactory.java | 68 ++ .../base/internal/LanguageSourceSetInternal.java | 5 +- .../{DirectoryHolder.java => ProjectLayout.java} | 21 +- .../base/internal/model/ComponentBinaryRules.java | 11 - .../base/internal/model/ComponentRules.java | 28 +- .../internal/model/ComponentSpecInitializer.java | 8 +- .../DefaultLibraryLocalComponentMetaData.java | 93 ++- .../internal/model/DefaultVariantsMetaData.java | 6 +- .../model/FunctionalSourceSetNodeInitializer.java | 67 -- .../internal/registry/DefaultLanguageRegistry.java | 2 +- .../internal/registry/LanguageRegistration.java | 15 +- .../registry/NamedLanguageRegistration.java | 57 ++ .../registry/RuleBasedLanguageRegistration.java | 59 -- .../resolve/DependentSourceSetResolveContext.java | 45 +- .../internal/tasks/apigen/ApiStubGenerator.java | 343 ---------- .../internal/tasks/apigen/abi/AnnotationSig.java | 53 -- .../internal/tasks/apigen/abi/ApiValidator.java | 30 - .../tasks/apigen/abi/DefaultApiValidator.java | 135 ---- .../apigen/abi/DefaultMemberOfApiChecker.java | 50 -- .../base/internal/tasks/apigen/abi/FieldSig.java | 79 --- .../internal/tasks/apigen/abi/JavaBaseModule.java | 93 --- .../base/internal/tasks/apigen/abi/MethodSig.java | 111 ---- .../internal/tasks/apigen/abi/NoOpValidator.java | 41 -- .../tasks/apigen/abi/SortingAnnotationVisitor.java | 79 --- .../base/plugins/ComponentModelBasePlugin.java | 83 +-- .../language/base/plugins/LanguageBasePlugin.java | 115 ++-- .../base/sources/BaseLanguageSourceSet.java | 46 +- .../core/DomainObjectCollectionBackedModelMap.java | 2 +- .../org/gradle/platform/base/BinaryContainer.java | 4 +- .../java/org/gradle/platform/base/BinarySpec.java | 16 +- .../platform/base/BinaryTasksCollection.java | 12 + .../org/gradle/platform/base/ComponentSpec.java | 13 +- .../org/gradle/platform/base/ComponentType.java | 2 +- .../org/gradle/platform/base/DependencySpec.java | 18 +- .../platform/base/DependencySpecBuilder.java | 26 +- .../platform/base/DependencySpecContainer.java | 27 +- .../gradle/platform/base/LibraryBinarySpec.java | 2 +- ...pendencySpec.java => ModuleDependencySpec.java} | 26 +- ...ilder.java => ModuleDependencySpecBuilder.java} | 30 +- ...endencySpec.java => ProjectDependencySpec.java} | 5 +- ...lder.java => ProjectDependencySpecBuilder.java} | 20 +- .../platform/base/binary/BaseBinarySpec.java | 122 ++-- .../base/binary/internal/BinarySpecFactory.java | 62 +- .../platform/base/component/BaseComponentSpec.java | 151 +---- .../component/internal/ComponentSpecFactory.java | 32 +- .../platform/base/internal/BinaryNamingScheme.java | 47 +- .../base/internal/BinaryNamingSchemeBuilder.java | 26 - .../platform/base/internal/BinarySpecInternal.java | 14 +- .../internal/BinaryTasksCollectionWrapper.java | 10 + .../base/internal/ComponentSpecInternal.java | 3 - .../base/internal/DefaultBinaryContainer.java | 28 - .../base/internal/DefaultBinaryNamingScheme.java | 161 ++++- .../internal/DefaultBinaryNamingSchemeBuilder.java | 65 -- .../internal/DefaultBinaryTasksCollection.java | 16 +- .../base/internal/DefaultDependencySpec.java | 102 --- .../internal/DefaultDependencySpecContainer.java | 79 +-- .../base/internal/DefaultModuleDependencySpec.java | 152 +++++ .../internal/DefaultProjectDependencySpec.java | 123 ++++ .../PlatformAwareComponentSpecInternal.java | 2 +- .../internal/registry/AbstractTypeBuilder.java | 4 +- .../registry/BinaryTasksModelRuleExtractor.java | 1 + .../registry/BinaryTypeModelRuleExtractor.java | 83 +-- .../ComponentBinariesModelRuleExtractor.java | 2 +- .../registry/ComponentTypeModelRuleExtractor.java | 68 +- .../registry/LanguageTypeModelRuleExtractor.java | 52 +- .../internal/registry/TypeModelRuleExtractor.java | 2 +- .../internal/util/ImplementationTypeDetermer.java | 61 -- .../ComponentTypeModelRuleExtractorTest.groovy | 1 - .../internal/DefaultFunctionalSourceSetTest.groovy | 29 - .../LanguageTypeModelRuleExtractorTest.groovy | 5 - .../DependentSourceSetResolveContextTest.groovy | 21 +- .../apigen/ApiStubGeneratorAnnotationsTest.groovy | 276 -------- .../apigen/ApiStubGeneratorValidationTest.groovy | 545 ---------------- .../base/plugins/LanguageBasePluginTest.groovy | 10 +- .../base/sources/BaseLanguageSourceSetTest.groovy} | 28 +- ...DomainObjectCollectionBackedModelMapTest.groovy | 33 +- .../platform/base/binary/BaseBinarySpecTest.groovy | 65 +- .../base/component/BaseComponentSpecTest.groovy | 35 +- .../internal/DefaultBinaryNamingSchemeTest.groovy | 159 ++++- .../DefaultBinaryTasksCollectionTest.groovy | 9 +- .../DefaultDependencySpecContainerTest.groovy | 195 ++++++ ...SpecSpecializationSchemaExtractionStrategy.java | 29 - .../BinaryTypeModelRuleExtractorTest.groovy | 5 +- .../sources/BaseLanguageSourceSetFixtures.groovy | 50 ++ .../platform/base/binary/BaseBinaryFixtures.groovy | 47 ++ .../base/component/BaseComponentFixtures.groovy | 33 +- .../plugin/AbstractLanguagePluginSpec.groovy | 9 +- ...ustomJarBinarySpecSubtypeIntegrationTest.groovy | 19 +- .../gradle/jvm/JarBinariesIntegrationTest.groovy | 60 +- ...latformJvmComponentReportIntegrationTest.groovy | 103 ++- .../JvmComponentPluginIntegrationTest.groovy | 38 +- .../resolve/JvmLocalLibraryMetaDataAdapter.java | 30 +- .../main/java/org/gradle/jvm/JarBinarySpec.java | 6 - .../src/main/java/org/gradle/jvm/JvmApiSpec.java | 58 ++ .../main/java/org/gradle/jvm/JvmLibrarySpec.java | 19 +- .../jvm/internal/AbstractJvmBinaryRenderer.java | 6 + .../gradle/jvm/internal/DefaultJarBinarySpec.java | 39 +- .../org/gradle/jvm/internal/DefaultJarFile.java} | 20 +- .../{ApiSpec.java => DefaultJvmApiSpec.java} | 43 +- .../gradle/jvm/internal/DefaultJvmLibrarySpec.java | 34 +- .../jvm/internal/DependencyResolvingClasspath.java | 16 +- .../org/gradle/jvm/internal/JarBinaryRenderer.java | 2 + .../org/gradle/jvm/internal/JarBinaryRules.java | 24 +- .../gradle/jvm/internal/JarBinarySpecInternal.java | 22 +- .../java/org/gradle/jvm/internal/JarFile.java} | 23 +- .../jvm/internal/JvmLibrarySpecInternal.java | 3 - .../{PackageName.java => JvmPackageName.java} | 24 +- .../java/org/gradle/jvm/internal/StubbedJar.java | 213 ------ .../org/gradle/jvm/plugins/JvmComponentPlugin.java | 118 ++-- .../main/java/org/gradle/jvm/tasks/api/ApiJar.java | 235 +++++++ .../jvm/tasks/api/internal/AccessibleMember.java} | 22 +- .../jvm/tasks/api/internal/AnnotatableMember.java | 51 ++ .../api/internal/AnnotationAnnotationValue.java} | 10 +- .../jvm/tasks/api/internal/AnnotationMember.java | 61 ++ .../jvm/tasks/api/internal/AnnotationValue.java} | 17 +- .../jvm/tasks/api/internal/ApiClassExtractor.java | 140 ++++ .../jvm/tasks/api/internal/ApiMemberSelector.java | 231 +++++++ .../tasks/api/internal/ArrayAnnotationValue.java} | 11 +- .../jvm/tasks/api/internal/ClassMember.java} | 42 +- .../tasks/api/internal}/EnumAnnotationValue.java | 14 +- .../jvm/tasks/api/internal/FieldMember.java} | 22 +- .../jvm/tasks/api/internal/InnerClassMember.java} | 27 +- .../org/gradle/jvm/tasks/api/internal/Member.java | 49 ++ .../jvm/tasks/api/internal/MethodMember.java | 77 +++ .../internal/MethodStubbingApiMemberAdapter.java} | 61 +- .../api/internal/ParameterAnnotationMember.java} | 16 +- .../tasks/api/internal/SimpleAnnotationValue.java} | 10 +- .../api/internal/SortingAnnotationVisitor.java | 85 +++ .../jvm/tasks/api/internal/TypedMember.java} | 25 +- .../org/gradle/jvm/tasks/api/package-info.java} | 13 +- .../JvmLocalLibraryDependencyResolverTest.groovy | 8 +- .../jvm/internal/DefaultJarBinarySpecTest.groovy | 6 +- .../jvm/internal/DefaultJvmBinaryTasksTest.groovy | 6 +- .../jvm/internal/DefaultJvmLibrarySpecTest.groovy | 7 +- ...geNameTest.groovy => JvmPackageNameTest.groovy} | 24 +- .../internal/plugins/CreateJvmBinariesTest.groovy | 21 +- .../ApiClassExtractorAnnotationsTest.groovy | 291 +++++++++ .../ApiClassExtractorInnerClassTest.groovy} | 99 +-- .../api/internal/ApiClassExtractorTest.groovy} | 320 ++++++---- .../internal/ApiClassExtractorTestSupport.groovy} | 44 +- .../ApiClassExtractorTestSupportTest.groovy} | 49 +- .../BinaryBuildTypesIntegrationTest.groovy | 18 +- .../BinaryConfigurationIntegrationTest.groovy | 24 +- .../BinaryFlavorsIntegrationTest.groovy | 18 +- .../LibraryApiDependenciesIntegrationTest.groovy | 14 +- .../LibraryBinariesIntegrationTest.groovy | 18 +- .../LibraryDependenciesIntegrationTest.groovy | 26 +- .../NativeBinariesIntegrationTest.groovy | 112 +++- .../NativePlatformSamplesIntegrationTest.groovy | 68 +- ...formNativeComponentReportIntegrationTest.groovy | 44 +- .../PrebuiltLibrariesIntegrationTest.groovy | 16 +- .../SharedLibrarySoNameIntegrationTest.groovy | 6 +- .../TestSuiteDefinitionIntegrationSpec.groovy | 73 ++- .../TestSuiteModelIntegrationSpec.groovy | 47 +- .../BinaryNativePlatformIntegrationTest.groovy | 48 +- .../GeneratedSourcesIntegrationTest.groovy | 2 +- ...rceSetCompileDependenciesIntegrationTest.groovy | 6 +- .../SourceSetDependenciesIntegrationTest.groovy | 6 +- ...SourceSetLinkDependenciesIntegrationTest.groovy | 6 +- .../CommonToolchainCustomizationIntegTest.groovy | 2 +- ...ToolChainCrossCompilationIntegrationTest.groovy | 6 +- ...GccToolChainCustomisationIntegrationTest.groovy | 22 +- .../GccToolChainDiscoveryIntegrationTest.groovy | 2 +- .../MultipleNativeToolChainIntegrationTest.groovy | 6 +- .../NativeToolChainDiscoveryIntegrationTest.groovy | 4 +- .../nativeplatform/HeaderExportingSourceSet.java | 7 - .../org/gradle/nativeplatform/NativeBinary.java | 4 +- .../gradle/nativeplatform/NativeBinarySpec.java | 61 +- .../nativeplatform/NativeExecutableBinarySpec.java | 2 +- .../nativeplatform/NativeExecutableFileSpec.java | 3 +- .../nativeplatform/NativeInstallationSpec.java | 3 +- .../nativeplatform/NativeLibraryBinarySpec.java | 6 +- .../PreprocessingTool.java | 3 +- .../nativeplatform/SharedLibraryBinarySpec.java | 2 +- .../nativeplatform/StaticLibraryBinarySpec.java | 2 +- .../nativeplatform/TargetedNativeComponent.java | 2 +- .../internal/AbstractNativeBinarySpec.java | 23 +- .../internal/AbstractNativeLibraryBinarySpec.java | 5 +- .../DefaultNativeExecutableBinarySpec.java | 9 +- .../internal/DefaultPreprocessingTool.java | 2 +- .../internal/NativeBinarySpecInternal.java | 21 +- .../internal/configure/NativeBinaries.java | 11 +- .../internal/configure/NativeBinaryRules.java | 114 +++- .../internal/configure/NativeComponentRules.java | 31 +- .../prebuilt/PrebuiltLibraryBinaryLocator.java | 4 +- .../prebuilt/PrebuiltLibraryInitializer.java | 11 +- .../resolve/ProjectLibraryBinaryLocator.java | 4 +- .../plugins/NativeComponentModelPlugin.java | 10 +- .../test/NativeTestSuiteBinarySpec.java | 5 +- .../internal/DefaultNativeTestSuiteBinarySpec.java | 4 +- .../internal/NativeTestSuiteBinaryRenderer.java | 1 + .../test/plugins/NativeBinariesTestPlugin.java | 39 +- .../toolchain/internal/NativeCompileSpec.java | 4 + .../internal/DefaultNativeComponentTest.groovy | 8 +- .../DefaultNativeExecutableBinarySpecTest.groovy | 11 +- .../DefaultNativeExecutableSpecTest.groovy | 5 +- .../internal/DefaultNativeLibrarySpecTest.groovy | 4 +- .../DefaultSharedLibraryBinarySpecTest.groovy | 13 +- .../DefaultStaticLibraryBinarySpecTest.groovy | 10 +- .../internal/NativeBinarySpecTest.groovy | 10 +- .../internal}/TestNativeBinariesFactory.java | 15 +- .../configure/NativeBinaryRulesTest.groovy | 23 +- .../configure/NativeComponentRulesTest.groovy | 132 ++-- .../resolve/ProjectLibraryBinaryLocatorTest.groovy | 9 +- .../plugins/NativeComponentModelPluginTest.groovy | 30 +- .../plugins/NativeComponentPluginTest.groovy | 7 +- .../plugins/NativeToolChainPluginTest.groovy | 9 +- .../ide/visualstudio/fixtures/ProjectFile.groovy | 4 + ...bstractInstalledToolChainIntegrationSpec.groovy | 2 +- subprojects/platform-play/platform-play.gradle | 1 + ...dPlayAndJvmLibraryProjectIntegrationTest.groovy | 5 +- .../PlayAppWithFailingTestsIntegrationTest.groovy | 11 +- .../PlayApplicationBinariesIntegrationTest.groovy | 2 +- .../PlayBinaryApplicationIntegrationTest.groovy | 3 +- ...ayPlatformComponentReportIntegrationTest.groovy | 2 +- .../PlayBinaryAdvancedAppIntegrationTest.groovy | 3 +- .../PlayApplicationPluginIntegrationTest.groovy | 12 +- .../PlayCoffeeScriptPluginIntegrationTest.groovy | 2 +- .../PlayJavaScriptPluginIntegrationTest.groovy | 2 +- .../AbstractRoutesCompileIntegrationTest.groovy | 8 +- .../play/tasks/TwirlCompileIntegrationTest.groovy | 8 +- .../java/org/gradle/play/PlayApplicationSpec.java | 9 +- .../play/PlayPlatformAwareComponentSpec.java} | 18 +- .../internal/DefaultPlayApplicationBinarySpec.java | 8 +- ... => DefaultPlayPlatformAwareComponentSpec.java} | 22 +- .../PlayApplicationBinarySpecInternal.java | 3 - .../play/internal/PlayApplicationSpecInternal.java | 5 +- ...=> PlayPlatformAwareComponentSpecInternal.java} | 7 +- .../DefaultPlayDistributionContainer.java | 4 +- .../gradle/play/plugins/PlayApplicationPlugin.java | 71 +- .../play/plugins/PlayCoffeeScriptPlugin.java | 15 +- .../play/plugins/PlayDistributionPlugin.java | 17 +- .../gradle/play/plugins/PlayJavaScriptPlugin.java | 14 +- .../org/gradle/play/plugins/PlayTestPlugin.java | 13 +- .../DefaultCoffeeScriptSourceSetTest.groovy | 4 +- .../internal/DefaultJavaScriptSourceSetTest.groovy | 4 +- .../DefaultPlayApplicationBinarySpecTest.groovy | 6 +- .../play/plugins/PlayDistributionPluginTest.groovy | 4 +- .../gradle/play/plugins/PlayTestPluginTest.groovy | 7 +- .../advancedplayapp/conf/evolutions/default/1.sql | 5 + .../JavaProjectModelBridgingIntegrationTest.groovy | 4 +- .../PluginsComponentReportIntegrationTest.groovy | 7 +- ...JUnitLoggingOutputCaptureIntegrationTest.groovy | 5 +- ...estNGLoggingOutputCaptureIntegrationTest.groovy | 9 +- .../internal/java/AbstractLanguageSourceSet.java | 7 +- .../api/internal/java/DefaultJavaSourceSet.java | 7 + .../jvm/ClassDirectoryBinaryNamingScheme.java | 14 +- .../internal/jvm/ClassDirectoryBinaryRenderer.java | 9 +- .../jvm/DefaultClassDirectoryBinarySpec.java | 39 +- .../api/internal/tasks/DefaultSourceSet.java | 3 +- .../groovy/org/gradle/api/plugins/BasePlugin.java | 13 +- .../org/gradle/api/plugins/JavaBasePlugin.java | 17 +- .../ClassDirectoryBinaryNamingSchemeTest.groovy | 10 +- .../gradle/api/plugins/JavaBasePluginTest.groovy | 13 +- .../s3/ivy/IvyS3RepoResolveIntegrationTest.groovy | 2 +- .../maven/MavenS3RepoErrorsIntegrationTest.groovy | 7 +- .../ivy/IvySftpRepoErrorsIntegrationTest.groovy | 2 +- .../MavenSftpRepoResolveIntegrationTest.groovy | 2 +- .../transport/sftp/SftpResourceUploader.java | 2 +- .../testkit/TestKitEndUserIntegrationTest.groovy | 196 +++++- .../testkit/TestKitSamplesIntegrationTest.groovy | 3 +- .../AbstractGradleRunnerIntegrationTest.groovy | 4 +- ...GradleRunnerGradleVersionIntegrationTest.groovy | 11 +- ...radleRunnerIsolatedDaemonIntegrationTest.groovy | 4 - .../GradleRunnerResultIntegrationTest.groovy | 16 +- .../java/org/gradle/testkit/runner/BuildTask.java | 3 + .../org/gradle/testkit/runner/TaskOutcome.java | 3 + .../runner/internal/DefaultGradleRunner.java | 6 +- .../runner/internal/ToolingApiGradleExecutor.java | 8 +- .../runner/internal/io/TeeOutputStream.java | 68 -- .../runner/internal/io/WriterOutputStream.java | 305 --------- .../runner/internal/DefaultGradleRunnerTest.groovy | 15 +- subprojects/test-kit/test-kit.gradle | 42 ++ .../CUnitComponentReportIntegrationTest.groovy | 5 +- .../test/cunit/CUnitIntegrationTest.groovy | 44 +- .../test/cunit/CUnitSamplesIntegrationTest.groovy | 32 +- .../googletest/GoogleTestIntegrationTest.groovy | 19 +- .../GoogleTestSamplesIntegrationTest.groovy | 20 +- ...tingNativeComponentReportIntegrationTest.groovy | 5 +- .../test/cunit/CUnitTestSuiteBinarySpec.java | 5 +- .../internal/DefaultCUnitTestSuiteBinary.java | 10 +- .../test/cunit/plugins/CUnitPlugin.java | 86 +-- .../googletest/GoogleTestTestSuiteBinarySpec.java | 4 +- .../internal/DefaultGoogleTestTestSuiteBinary.java | 8 +- .../test/googletest/plugins/GoogleTestPlugin.java | 56 +- .../test/internal/NativeTestSuites.java | 103 +++ .../nativeplatform/test/cunit/CUnitTest.groovy | 6 +- .../test/googletest/GoogleTestTest.groovy | 6 +- .../ContinuousBuildToolingApiSpecification.groovy | 58 +- .../tooling/fixture/ProgressEvents.groovy | 10 +- .../tooling/fixture/ToolingApiSpecification.groovy | 4 +- .../m8/JavaConfigurabilityCrossVersionSpec.groovy | 4 +- .../m8/ToolingApiLoggingCrossVersionSpec.groovy | 4 +- ...adlePropertiesToolingApiCrossVersionSpec.groovy | 6 +- .../r112/BuildInvocationsCrossVersionSpec.groovy | 1 - .../ToolingApiEclipseModelCrossVersionSpec.groovy | 127 ++++ .../tooling/r22/BuildActionCrossVersionSpec.groovy | 19 +- .../ToolingApiEclipseModelCrossVersionSpec.groovy | 36 +- .../internal/adapter/ProtocolToModelAdapter.java | 23 + .../org/gradle/tooling/model/GradleProject.java | 11 +- .../model/eclipse/EclipseJavaSourceSettings.java} | 21 +- .../tooling/model/eclipse/EclipseProject.java | 38 +- .../model/eclipse/HierarchicalEclipseProject.java | 4 +- .../tooling/model/java/JavaSourceAware.java} | 26 +- .../tooling/model/java/JavaSourceSettings.java} | 26 +- .../gradle/tooling/model/java/package-info.java} | 8 +- .../adapter/ProtocolToModelAdapterTest.groovy | 39 ++ .../gradle/wrapper/GradleUserHomeLookupTest.groovy | 75 +++ .../groovy/org/gradle/wrapper/InstallTest.groovy | 4 +- version.txt | 2 +- 982 files changed, 23729 insertions(+), 15397 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
