This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository gradle.
commit e8cc85c9000e5590162a972d2fa102728c94d4ba Merge: 604eb48 2a25418 Author: Emmanuel Bourg <[email protected]> Date: Tue Dec 29 23:26:36 2015 +0100 Merge tag 'upstream/2.8' Upstream version 2.8 build.gradle | 114 +++- .../generator/DependencyGenerator.groovy | 114 ++++ .../performance/generator/DependencyGraph.groovy | 18 +- .../performance/generator/MavenJarCreator.groovy | 76 +++ .../performance/generator/MavenModule.groovy | 162 ++++++ .../gradle/performance/generator/MavenPom.groovy | 30 +- .../performance/generator/MavenRepository.groovy | 51 ++ .../gradle/performance/generator/MavenScope.groovy | 14 +- .../performance/generator/RepositoryBuilder.groovy | 80 +++ .../performance/generator/TestProject.groovy | 46 ++ .../generator/tasks/JvmProjectGeneratorTask.groovy | 93 +++ .../MonolithicNativeProjectGeneratorTask.groovy | 60 ++ .../tasks/NativeProjectGeneratorTask.groovy | 39 ++ .../generator/tasks/ProjectGeneratorTask.groovy | 233 ++++++++ .../org/gradle/plugins/buildtypes/BuildType.groovy | 48 ++ .../buildtypes/BuildTypesPlugin.groovy} | 69 +-- .../org.gradle.build-types.properties | 1 + .../generator/DependencyGeneratorTest.groovy | 51 ++ config/codenarc.xml | 3 +- gradle/buildSplits.gradle | 91 +++ gradle/classycle.gradle | 23 +- gradle/compile.gradle | 3 + gradle/dependencies.gradle | 3 +- gradle/groovyProject.gradle | 26 +- gradle/integTest.gradle | 2 +- gradle/java9.gradle | 55 +- gradle/pullRequestBuild.gradle | 6 +- gradle/testGroupings.gradle | 29 +- gradle/versioning.gradle | 2 +- gradle/wrapper/gradle-wrapper.properties | 4 +- gradlew | 6 +- .../api/plugins/antlr/internal/AntlrExecuter.java | 2 +- .../gradle/internal/classloader/ClasspathUtil.java | 2 +- .../classloader/MultiParentClassLoader.java | 5 + .../classloader/TransformingClassLoader.java | 2 +- .../org/gradle/internal/classpath/ClassPath.java | 5 +- .../internal/classpath/DefaultClassPath.java | 12 + .../internal/io/ClassLoaderObjectInputStream.java | 2 +- .../java/org/gradle/internal/service/Service.java} | 22 +- .../gradle/internal/service/ServiceRegistry.java | 1 + .../io/ClassLoaderObjectInputStreamTest.groovy | 45 ++ .../AbstractPmdPluginVersionIntegrationTest.groovy | 33 ++ ...ckstylePluginDependenciesIntegrationTest.groovy | 6 + .../PmdPluginAuxclasspathIntegrationTest.groovy | 153 +++++ .../PmdPluginDependenciesIntegrationTest.groovy | 65 +++ .../quality/PmdPluginIntegrationTest.groovy | 205 +------ .../quality/PmdPluginVersionIntegrationTest.groovy | 202 ++++++- .../api/plugins/quality/CodeNarcPlugin.groovy | 2 +- .../org/gradle/api/plugins/quality/Pmd.groovy | 49 +- .../gradle/api/plugins/quality/PmdExtension.groovy | 25 +- .../gradle/api/plugins/quality/PmdPlugin.groovy | 4 + .../api/plugins/quality/PmdPluginTest.groovy | 15 + .../org/gradle/api/ApplyPluginIntegSpec.groovy | 4 +- .../resource/TextResourceIntegrationTest.groovy | 11 +- .../api/tasks/bundling/ZipIntegrationTest.groovy | 89 +++ .../RuleBasedTaskActionsIntegrationTest.groovy | 87 --- .../RuleBasedTaskBridgingIntegrationTest.groovy | 373 ++++++++++++ .../RuleBasedTaskReferenceIntegrationTest.groovy | 90 --- .../groovy/org/gradle/BuildExceptionReporter.java | 1 + .../src/main/groovy/org/gradle/BuildLogger.java | 1 + .../main/groovy/org/gradle/BuildResultLogger.java | 1 + .../src/main/groovy/org/gradle/StartParameter.java | 65 +-- .../groovy/org/gradle/TaskExecutionLogger.java | 1 + .../gradle/api/artifacts/ConflictResolution.java | 1 + .../groovy/org/gradle/api/artifacts/Module.java | 2 +- .../api/internal/AsmBackedClassGenerator.java | 127 +--- .../internal/artifacts/DefaultDependencySet.java | 3 +- .../artifacts/DefaultPublishArtifactSet.java | 3 +- .../dependencies/DefaultProjectDependency.java | 3 +- .../state/CachingFileSnapshotter.java | 9 +- .../state/InMemoryTaskArtifactCache.java | 97 +++- .../GroovyJava7RuntimeMemoryLeakStrategy.java | 195 +++++++ .../classloading/MemoryLeakPrevention.java | 93 +++ .../api/internal/file/AbstractFileCollection.java | 21 +- .../gradle/api/internal/file/AbstractFileTree.java | 5 +- .../api/internal/file/CompositeFileCollection.java | 62 +- .../api/internal/file/CompositeFileTree.java | 19 +- .../internal/file/DefaultCompositeFileTree.java | 7 +- .../internal/file/DefaultSourceDirectorySet.java | 2 +- .../api/internal/file/FileCollectionInternal.java | 3 +- .../api/internal/file/UnionFileCollection.java | 8 +- .../gradle/api/internal/file/UnionFileTree.java | 2 +- .../api/internal/file/archive/ZipCopyAction.java | 11 +- ...pendenciesOnlyFileCollectionResolveContext.java | 94 ++- .../DefaultConfigurableFileCollection.java | 12 +- .../collections/DefaultConfigurableFileTree.java | 17 +- .../DefaultFileCollectionResolveContext.java | 10 +- .../file/collections/DelegatingFileCollection.java | 113 ---- .../file/collections/DelegatingFileTree.java | 54 -- .../file/collections/FileCollectionAdapter.java | 3 +- .../file/collections/FileCollectionContainer.java | 4 +- .../collections/FileCollectionResolveContext.java | 3 +- .../internal/file/collections/FileTreeAdapter.java | 3 +- .../LazilyInitializedFileCollection.java | 17 +- .../collections/LazilyInitializedFileTree.java | 35 -- .../api/internal/file/collections/MapFileTree.java | 30 +- .../internal/initialization/ClassLoaderScope.java | 10 + .../initialization/DefaultClassLoaderScope.java | 96 ++- .../initialization/RootClassLoaderScope.java | 13 + .../plugins/RuleBasedPluginApplicator.java | 10 +- .../api/internal/project/AbstractProject.java | 31 +- .../project/DefaultIsolatedAntBuilder.groovy | 183 ------ .../api/internal/project/ProjectIdentifier.java | 3 + .../api/internal/project/ant/BasicAntBuilder.java | 8 +- .../project/antbuilder/AntBuilderDelegate.groovy | 86 +++ .../internal/project/antbuilder/CacheEntry.java} | 19 +- .../project/antbuilder/CachedClassLoader.java} | 27 +- .../antbuilder/ClassPathToClassLoaderCache.java | 155 +++++ .../api/internal/project/antbuilder/Cleanup.java | 65 +++ .../antbuilder/DefaultIsolatedAntBuilder.java | 267 +++++++++ .../project/antbuilder/FinalizerThread.java | 101 ++++ .../AnnotationProcessingTaskFactory.java | 50 +- .../internal/project/taskfactory/ITaskFactory.java | 2 + .../FileCollectionBackedArchiveTextResource.java | 22 +- .../api/internal/rules/ModelMapCreators.java | 57 +- .../tasks/CachingTaskDependencyResolveContext.java | 12 +- .../api/internal/tasks/DefaultTaskContainer.java | 23 +- .../tasks/DefaultTaskContainerFactory.java | 5 +- .../api/internal/tasks/DefaultTaskDependency.java | 7 +- .../internal/tasks/RealizableTaskCollection.java | 244 ++++++++ .../api/internal/tasks/TaskContainerInternal.java | 5 +- ...veContext.java => TaskDependencyContainer.java} | 18 +- .../api/internal/tasks/TaskDependencyInternal.java | 3 +- .../tasks/TaskDependencyResolveContext.java | 14 +- .../groovy/org/gradle/api/logging/Logging.java | 1 + .../org/gradle/api/plugins/ExtensionContainer.java | 4 +- .../main/groovy/org/gradle/api/tasks/JavaExec.java | 15 + .../groovy/org/gradle/api/tasks/bundling/Zip.java | 22 +- .../btree/BTreePersistentIndexedCache.java | 1 - .../cache/internal/btree/FileBackedBlockStore.java | 102 +--- .../internal/DefaultScriptCompilationHandler.java | 39 ++ .../initialization/DefaultGradleLauncher.java | 18 +- .../DefaultGradleLauncherFactory.java | 20 +- .../authentication/AbstractAuthentication.java | 23 +- .../authentication/AllSchemesAuthentication.java | 10 +- .../authentication/AuthenticationInternal.java | 6 +- .../service/scopes/BuildScopeServices.java | 212 +++---- .../service/scopes/BuildSessionScopeServices.java | 55 +- .../service/scopes/GlobalScopeServices.java | 7 +- .../org/gradle/logging/LoggingServiceRegistry.java | 20 +- .../internal/DefaultProgressLoggerFactory.java | 26 +- .../collection/internal/BridgedCollections.java | 11 +- .../internal/PolymorphicModelMapProjection.java | 13 +- .../internal/DynamicObjectAwareTypeUtils.java | 35 ++ .../persist/ReusingModelRegistryStore.java | 10 +- .../use/internal/InjectedPluginClasspath.java} | 18 +- .../testfixtures/internal/ProjectBuilderImpl.java | 4 +- .../org/gradle/util/AvailablePortFinder.java | 1 + .../groovy/org/gradle/StartParameterTest.groovy | 2 +- .../org/gradle/api/internal/DefaultTaskTest.groovy | 4 +- .../DefaultProjectDependencyTest.groovy | 4 +- .../changedetection/state/CacheCapSizerTest.groovy | 43 ++ .../state/CachingFileSnapshotterTest.groovy | 14 +- .../state/LoggingEvictionListenerTest.groovy | 47 ++ ...Test.java => AbstractFileCollectionTest.groovy} | 227 +++++--- .../api/internal/file/AbstractFileTreeTest.groovy | 229 +++++--- .../file/CompositeFileCollectionSpec.groovy | 310 ++++++++++ .../internal/file/CompositeFileCollectionTest.java | 85 +-- .../api/internal/file/CompositeFileTreeSpec.groovy | 91 +++ .../api/internal/file/CompositeFileTreeTest.java | 14 +- .../file/DefaultCompositeFileTreeTest.groovy | 20 + .../file/DelegatingFileCollectionTest.groovy | 84 --- .../LazilyInitializedFileCollectionTest.groovy | 46 ++ .../internal/file/UnionFileCollectionTest.groovy | 90 +++ .../api/internal/file/UnionFileCollectionTest.java | 84 --- .../internal/file/archive/ZipCopyActionTest.groovy | 7 +- ...ciesOnlyFileCollectionResolveContextTest.groovy | 187 +++--- .../DefaultConfigurableFileCollectionTest.java | 27 +- .../DefaultConfigurableFileTreeTest.groovy | 4 +- .../DefaultFileCollectionResolveContextTest.groovy | 10 +- .../collections/FileCollectionAdapterTest.groovy | 2 +- .../file/collections/FileTreeAdapterTest.groovy | 2 +- .../DefaultClassLoaderScopeTest.groovy | 120 +++- .../project/DefaultIsolatedAntBuilderTest.groovy | 10 +- .../api/internal/project/DefaultProjectTest.groovy | 6 +- .../antbuilder/AntBuilderMemoryLeakTest.groovy | 100 ++++ ...GroovyJava7RuntimeMemoryLeakStrategyTest.groovy | 49 ++ .../CachingTaskDependencyResolveContextTest.groovy | 70 ++- .../tasks/RealizableTaskCollectionTest.groovy | 99 ++++ .../gradle/execution/TaskNameResolverTest.groovy | 34 +- .../DefaultGradleLauncherFactoryTest.groovy | 8 +- .../initialization/DefaultGradleLauncherTest.java | 4 +- .../service/scopes/BuildScopeServicesTest.groovy | 103 ++-- .../scopes/BuildSessionScopeServicesTest.groovy | 91 +++ .../service/scopes/GlobalScopeServicesTest.java | 1 + .../logging/LoggingServiceRegistryTest.groovy | 72 ++- .../DefaultProgressLoggerFactoryTest.groovy | 28 +- .../ports/FixedAvailablePortAllocatorTest.groovy | 117 ++-- .../util/ports/ReleasingPortAllocatorTest.groovy | 45 ++ .../gradle/api/file/FileCollectionMatchers.java | 2 +- .../ports/AbstractAvailablePortAllocator.groovy | 3 - .../util/ports/FixedAvailablePortAllocator.groovy | 32 +- .../util/ports/ReleasingPortAllocator.groovy | 65 +++ .../AddingConfigurationIntegrationTest.groovy | 94 +++ ...ResolutionStrategySamplesIntegrationTest.groovy | 4 +- ...ationDependencyResolutionIntegrationTest.groovy | 85 +-- .../ivy/IvyHttpRepoResolveIntegrationTest.groovy | 5 +- .../configurations/DirectBuildDependencies.java | 3 +- .../configurations/TasksFromDependentProjects.java | 3 +- .../TasksFromProjectDependencies.java | 3 +- .../internal/artifacts/ivyservice/CacheLayout.java | 4 +- .../transport/RepositoryTransportFactory.java | 9 +- .../TasksFromDependentProjectsTest.groovy | 3 +- .../artifacts/ivyservice/CacheLayoutTest.groovy | 8 +- ...agnosticsComponentReportIntegrationTest.groovy} | 23 +- .../model/ModelReportIntegrationTest.groovy | 230 +++++--- .../internal/AbstractBinaryRenderer.java | 46 +- .../components/internal/BinaryRenderer.java | 8 + .../components/internal/ComponentRenderer.java | 2 +- .../internal/ComponentReportRenderer.java | 22 +- .../components/internal/DiagnosticsServices.java | 5 +- .../components/internal/RendererUtils.java | 60 ++ .../components/internal/SourceSetRenderer.java | 22 +- .../model/internal/ModelNodeRenderer.java | 5 +- .../internal/text/DefaultTextReportBuilder.java | 130 +++-- .../internal/text/TextReportBuilder.java | 9 +- .../internal/ComponentRendererTest.groovy | 16 +- .../components/internal/RendererUtilsTest.groovy | 98 ++++ .../internal/SourceSetRendererTest.groovy | 55 +- .../reporting/model/ModelReportParserTest.groovy | 62 +- .../text/DefaultTextReportBuilderTest.groovy | 214 ++++++- .../AbstractComponentReportIntegrationTest.groovy | 5 +- ...actNativeComponentReportIntegrationTest.groovy} | 2 +- .../JvmComponentReportOutputFormatter.groovy | 2 +- .../NativeComponentReportOutputFormatter.groovy | 2 +- .../api/reporting/model/ModelReportParser.groovy | 19 +- subprojects/distributions/distributions.gradle | 6 +- subprojects/docs/docs.gradle | 6 + .../dsl/org.gradle.api.plugins.quality.Pmd.xml | 10 +- ...org.gradle.api.plugins.quality.PmdExtension.xml | 10 +- .../docs/dsl/org.gradle.api.tasks.bundling.Zip.xml | 4 + ...org.gradle.api.tasks.compile.CompileOptions.xml | 6 +- subprojects/docs/src/docs/release/notes.md | 521 +++++++++++++---- .../src/docs/userguide/buildScriptsTutorial.xml | 2 +- ...newJavaPlugin.xml => buildingJavaLibraries.xml} | 48 +- subprojects/docs/src/docs/userguide/depMngmt.xml | 2 +- .../docs/src/docs/userguide/distributionPlugin.xml | 2 +- .../docs/src/docs/userguide/gradleDaemon.xml | 2 +- .../docs/src/docs/userguide/groovyPlugin.xml | 4 +- subprojects/docs/src/docs/userguide/javaPlugin.xml | 12 +- subprojects/docs/src/docs/userguide/newModel.xml | 101 +++- subprojects/docs/src/docs/userguide/osgi.xml | 4 +- .../docs/src/docs/userguide/sonarPlugin.xml | 6 +- .../docs/src/docs/userguide/sonarRunnerPlugin.xml | 7 +- subprojects/docs/src/docs/userguide/testKit.xml | 6 +- subprojects/docs/src/docs/userguide/userguide.xml | 2 +- .../samples/groovy/customizedLayout/build.gradle | 2 +- .../samples/groovy/mixedJavaAndGroovy/build.gradle | 2 +- .../multiproject/groovycDetector/build.gradle | 2 +- .../groovy/multiproject/testproject/build.gradle | 2 +- .../src/test/groovy/org/gradle/VersionTest.groovy | 7 +- .../src/samples/groovy/quickstart/build.gradle | 2 +- .../src/test/groovy/org/gradle/PersonTest.groovy | 10 +- .../multiplecomponents/build.gradle | 0 .../multiplecomponents/settings.gradle | 0 .../src/client/java/org/gradle/Client.java | 0 .../src/core/java/org/gradle/Person.java | 0 .../src/core/resources/org/gradle/resource.xml | 0 .../src/server/java/org/gradle/PersonServer.java | 0 .../multiplecomponents/util/build.gradle | 0 .../util/src/main/java/org/gradle/Utils.java | 0 .../quickstart/build.gradle | 0 .../src/main/java/org/gradle/Person.java | 0 .../src/main/resources/org/gradle/resource.xml | 0 .../targetplatforms/core/build.gradle | 0 .../core/src/main/java/org/gradle/Person.java | 0 .../core/src/main/java6/org/gradle/Person6.java | 0 .../src/main/resources/org/gradle/resource.xml | 0 .../targetplatforms/server/build.gradle | 0 .../server/src/main/java/org/gradle/Server.java | 0 .../targetplatforms/settings.gradle | 0 .../modelRules/basicRuleSourcePlugin/build.gradle | 8 +- subprojects/docs/src/samples/osgi/build.gradle | 2 +- .../src/samples/testKit/testKitSpock/build.gradle | 4 +- .../testKitSpockClasspath/plugin/build.gradle | 4 +- .../org.gradle.sample.helloworld.properties | 17 + .../gradle/sample/BuildLogicFunctionalTest.groovy | 26 +- .../artifacts/externalDependencies/build.gradle | 6 +- .../userguide/groovy/groovyDependency/build.gradle | 4 +- .../tutorial/groovyWithFlatDir/build.gradle | 2 +- .../userguide/tutorial/projectReports/build.gradle | 2 +- .../basicRuleSourcePlugin-model-task.out | 214 +++---- .../userguideOutput/dependencyInsightReport.out | 4 +- .../userguideOutput/dependencyListReport.out | 6 +- .../userguideOutput/nativeComponentReport.out | 18 +- .../userguideOutput/newJavaComponentReport.out | 2 +- .../newJavaTargetPlatforms-java6MainJar.out | 12 +- .../newJavaTargetPlatforms-server.out | 20 +- .../userguideOutput/playComponentReport.out | 2 +- .../main/groovy/org/gradle/plugins/ear/Ear.groovy | 2 +- .../AbstractIdeDeduplicationIntegrationTest.groovy | 282 +++++++++ .../EclipseMultiModuleIntegrationTest.groovy | 4 +- .../ide/eclipse/EclipseProjectFixture.groovy | 37 +- .../eclipse/EclipseProjectIntegrationTest.groovy | 106 ++-- ...eProjectNameDeduplicationIntegrationTest.groovy | 54 ++ .../IdeaModuleDeduplicationIntegrationTest.groovy} | 21 +- .../ide/idea/IdeaMultiModuleIntegrationTest.groovy | 14 +- .../ide/eclipse/internal/EclipseNameDeduper.groovy | 9 +- .../ide/eclipse/model/EclipseDomainModel.groovy | 1 + .../ide/eclipse/model/EclipseProject.groovy | 26 +- .../internal/configurer/DeduplicationTarget.groovy | 18 +- .../internal/configurer/ModuleNameDeduper.groovy | 89 ++- .../ide/internal/configurer/ProjectDeduper.groovy | 13 +- .../model/internal/SourceFoldersCreatorTest.groovy | 34 +- .../configurer/DeduplicationTargetTest.groovy | 47 -- .../configurer/ModuleNameDeduperTest.groovy | 139 +++-- .../integtests/CacheProjectIntegrationTest.groovy | 2 +- ...latedAntBuilderMemoryLeakIntegrationTest.groovy | 135 +++++ .../OsgiProjectSampleIntegrationTest.groovy | 2 +- .../integtests/ProjectLayoutIntegrationTest.groovy | 2 +- .../SamplesWebProjectIntegrationTest.groovy | 26 +- .../SamplesWebQuickstartIntegrationTest.groovy | 8 +- .../samples/UserGuideSamplesIntegrationTest.groovy | 2 +- .../samples/UserGuideSamplesRunner.groovy | 24 +- .../fixtures/AbstractIntegrationSpec.groovy | 5 +- .../fixtures/AbstractIntegrationTest.java | 8 +- .../fixtures/CrossVersionIntegrationSpec.groovy | 3 +- .../fixtures/executer/AbstractGradleExecuter.java | 18 + .../executer/DefaultGradleDistribution.java | 24 +- .../fixtures/executer/ForkingGradleExecuter.java | 2 +- .../fixtures/executer/GradleDistribution.java | 10 +- .../fixtures/executer/GradleExecuter.java | 20 +- .../fixtures/executer/InProcessGradleExecuter.java | 4 +- .../test/fixtures/server/http/HttpServer.groovy | 14 +- .../test/fixtures/archive/ZipTestFixture.groovy | 8 +- .../file/AbstractTestDirectoryProvider.java | 53 +- .../test/fixtures/file/CleanupTestDirectory.groovy | 44 ++ .../file/CleanupTestDirectoryExtension.groovy | 55 ++ .../test/fixtures/file/TestDirectoryProvider.java | 2 + .../api/publish/ivy/IvyPublishHttpIntegTest.groovy | 3 +- .../ivy/IvyPublishVersionRangeIntegTest.groovy | 104 ++++ .../ivy/IvyHttpPublishIntegrationTest.groovy | 2 - .../IvyVersionRangePublishIntegrationTest.groovy | 95 +++ .../internal/artifact/DefaultIvyArtifactSet.java | 3 +- subprojects/language-groovy/language-groovy.gradle | 2 +- .../gradle/groovy/GroovyDocIntegrationTest.groovy | 2 +- .../GroovyCompilerContinuousIntegrationTest.groovy | 62 ++ .../internal/tasks/compile/ApiGroovyCompiler.java | 42 +- .../tasks/compile/daemon/DaemonGroovyCompiler.java | 7 +- .../org/gradle/api/tasks/javadoc/AntGroovydoc.java | 1 + subprojects/language-java/language-java.gradle | 1 + .../JavaCompilerContinuousIntegrationTest.groovy | 67 +++ ...braryDependencyResolutionIntegrationTest.groovy | 1 + .../java/SampleJavaLanguageIntegrationTest.groovy | 6 +- .../internal/tasks/compile/DaemonJavaCompiler.java | 4 +- .../internal/GroupsJavadocOptionFileOption.java | 14 +- .../internal/JavaToolChainServiceRegistry.java | 4 +- subprojects/language-jvm/language-jvm.gradle | 1 + .../ResourceOnlyJvmLibraryIntegrationTest.groovy | 6 +- ...bstractCompilerContinuousIntegrationTest.groovy | 73 +++ ...AbstractJvmPluginLanguageIntegrationTest.groovy | 16 +- .../AbstractNativeComponentPluginTest.groovy | 9 +- .../assembler/plugins/AssemblerPluginTest.groovy | 9 +- subprojects/language-scala/language-scala.gradle | 1 + .../ScalaCompilerContinuousIntegrationTest.groovy | 67 +++ .../internal/tasks/scala/DaemonScalaCompiler.java | 5 +- ...ionServiceReuseContinuousIntegrationTest.groovy | 73 +++ .../DaemonUsageSuggestionIntegrationTest.groovy | 4 + .../testing/DaemonEventSequenceBuilder.groovy | 4 +- .../launcher/daemon/testing/DaemonsState.groovy | 4 +- .../gradle/launcher/cli/BuildActionsFactory.java | 3 +- .../launcher/exec/BuildActionParameters.java | 3 + .../exec/ContinuousBuildActionExecuter.java | 2 +- .../DaemonUsageSuggestingBuildActionExecuter.java | 6 +- .../exec/DefaultBuildActionParameters.java | 27 +- .../internal/provider/ClasspathInferer.java | 2 +- .../ClientSidePayloadClassLoaderFactory.java | 4 +- .../provider/DaemonBuildActionExecuter.java | 10 +- .../internal/provider/ProviderConnection.java | 8 +- .../provider/ProviderStartParameterConverter.java | 3 +- .../provider/connection/BuildLogLevelMixIn.java | 6 +- .../connection/ProviderOperationParameters.java | 107 +++- .../DaemonServerExceptionHandlingTest.groovy | 3 +- .../exec/DefaultBuildActionParametersTest.groovy | 3 +- .../ProviderStartParameterConverterTest.groovy | 10 +- .../connection/BuildLogLevelMixInTest.groovy | 22 +- .../publish/maven/MavenPublishHttpIntegTest.groovy | 2 - .../maven/MavenPublishIssuesIntegTest.groovy | 43 ++ ...vy => MavenPublishVersionRangeIntegTest.groovy} | 55 +- ...NonUniqueSnapshotPublishIntegrationTest.groovy} | 2 +- ...nPomConfigurationPublishIntegrationTest.groovy} | 2 +- ...avenPomGenerationPublishIntegrationTest.groovy} | 2 +- ... => MavenSettingsPublishIntegrationTest.groovy} | 2 +- .../maven/MavenSftpPublishIntegrationTest.groovy} | 42 +- ...MavenVersionRangePublishIntegrationTest.groovy} | 16 +- .../maven/MavenWagonPublishIntegrationTest.groovy | 55 ++ .../action/AbstractMavenPublishAction.java | 21 +- .../maven/internal/action/MavenDeployAction.java | 5 +- .../maven/internal/action/MavenInstallAction.java | 9 +- .../internal/action/MavenWagonDeployAction.java | 14 +- .../maven/internal/deployer/BaseMavenDeployer.java | 5 +- .../gradle/api/publish/maven/MavenPublication.java | 5 +- .../internal/artifact/DefaultMavenArtifactSet.java | 3 +- .../internal/publisher/MavenRemotePublisher.java | 2 +- .../remote/internal/inet/TcpOutgoingConnector.java | 19 +- .../internal/inet/MulticastConnectionTest.groovy | 6 +- .../remote/internal/inet/TcpConnectorTest.groovy | 8 +- .../ModelRuleBindingFailureIntegrationTest.groovy | 153 ++++- ...ationRuleApplicationOrderIntegrationTest.groovy | 2 +- .../model/TaskCreationIntegrationTest.groovy | 2 +- .../InvalidManagedModelRuleIntegrationTest.groovy | 10 +- ...odelPropertyTargetingRuleIntegrationTest.groovy | 342 +++++++++-- .../ManagedScalarCollectionsIntegrationTest.groovy | 319 ++++++++++ .../ManagedTypeReferencesIntegrationTest.groovy | 44 ++ ...ScalarTypesInManagedModelIntegrationTest.groovy | 114 ++++ .../src/main/java/org/gradle/model/Managed.java | 7 +- .../ChildNodeInitializerStrategyAccessor.java} | 15 +- .../ChildNodeInitializerStrategyAccessors.java | 42 ++ .../internal/ModelMapModelProjection.java | 29 +- .../model/internal/asm/AsmClassGeneratorUtils.java | 144 +++++ .../model/internal/core/AbstractModelAction.java | 53 ++ .../internal/core/AbstractModelActionWithView.java | 53 ++ .../model/internal/core/BaseInstanceFactory.java | 166 +++++- .../internal/core/ChainingModelProjection.java | 25 +- .../core/DefaultInstanceFactoryRegistry.java | 43 ++ .../core/DefaultNodeInitializerRegistry.java | 69 +++ .../core/DependencyOnlyExtractedModelRule.java | 20 +- .../core/DirectNodeInputUsingModelAction.java | 44 +- .../core/DirectNodeNoInputsModelAction.java | 32 +- .../model/internal/core/EmptyModelProjection.java | 8 +- .../model/internal/core/ExtractedModelAction.java | 26 +- .../model/internal/core/ExtractedModelCreator.java | 24 +- .../model/internal/core/ExtractedModelRule.java | 21 +- .../internal/core/FactoryBasedNodeInitializer.java | 22 +- .../model/internal/core/InputUsingModelAction.java | 34 +- .../model/internal/core/InstanceFactory.java | 17 +- ...ceFactory.java => InstanceFactoryRegistry.java} | 14 +- .../gradle/model/internal/core/ModelAction.java | 8 +- .../model/internal/core/ModelActionRole.java | 25 +- .../gradle/model/internal/core/ModelAdapter.java | 4 +- .../gradle/model/internal/core/ModelCreator.java | 14 +- .../gradle/model/internal/core/ModelCreators.java | 129 +++-- .../internal/core/ModelMapGroovyDecorator.java | 31 +- .../org/gradle/model/internal/core/ModelNode.java | 10 +- .../gradle/model/internal/core/ModelPredicate.java | 6 + .../gradle/model/internal/core/ModelPromise.java | 4 +- .../gradle/model/internal/core/ModelReference.java | 45 +- .../core/ModelTypeInitializationException.java | 50 ++ .../model/internal/core/MutableModelNode.java | 14 +- .../model/internal/core/NoInputsModelAction.java | 24 +- .../model/internal/core/NodeBackedModelMap.java | 54 +- .../model/internal/core/NodeBackedModelSet.java | 5 + .../model/internal/core/NodeInitializer.java | 10 +- ...ceFactory.java => NodeInitializerRegistry.java} | 16 +- .../core/ProjectionBackedModelCreator.java | 61 +- .../ReadonlyImmutableManagedPropertyException.java | 37 ++ .../core/SpecializedModelMapProjection.java | 22 +- .../TypeCompatibilityModelProjectionSupport.java | 44 +- .../internal/core/UnmanagedModelProjection.java | 5 +- .../AbstractModelCreationRuleExtractor.java | 18 +- .../inspect/ManagedChildNodeCreatorStrategy.java | 17 +- .../inspect/ManagedModelCreationRuleExtractor.java | 46 +- .../internal/inspect/ManagedModelInitializer.java | 82 ++- .../internal/inspect/MethodBackedModelAction.java | 28 +- .../inspect/ProjectionOnlyNodeInitializer.java | 9 + .../UnmanagedModelCreationRuleExtractor.java | 7 +- .../UnmanagedPropertyMissingSetterException.java} | 16 +- .../internal/manage/instance/ManagedInstance.java | 6 + .../manage/instance/ManagedProxyFactory.java | 4 +- .../manage/projection/ManagedModelProjection.java | 55 +- .../manage/schema/ManagedImplModelSchema.java | 3 - .../manage/schema/ModelCollectionSchema.java | 11 +- .../schema/ModelManagedImplStructSchema.java | 19 +- .../internal/manage/schema/ModelProperty.java | 32 +- .../internal/manage/schema/ModelSchemaStore.java | 2 + ...lMapSchema.java => ScalarCollectionSchema.java} | 30 +- .../manage/schema/SpecializedMapSchema.java | 57 ++ .../extract/AbstractProxyClassGenerator.java | 1 + ...CollectionNodeInitializerExtractionSupport.java | 34 ++ .../manage/schema/extract/CollectionStrategy.java | 36 ++ .../extract/ConstructableTypesRegistry.java} | 14 +- .../extract/DefaultConstructableTypesRegistry.java | 47 ++ .../schema/extract/DefaultModelSchemaStore.java | 8 +- .../manage/schema/extract/EnumStrategy.java | 7 +- ...toryBasedNodeInitializerExtractionStrategy.java | 44 ++ .../schema/extract/JdkValueTypeStrategy.java | 38 +- ...plStructNodeInitializerExtractionStrategy.java} | 17 +- ...ImplStructNodeInitializerExtractionSupport.java | 61 ++ ...dImplStructSchemaExtractionStrategySupport.java | 71 +-- .../schema/extract/ManagedImplStructStrategy.java | 22 +- ...Strategy.java => ManagedInstanceTypeUtils.java} | 20 +- .../schema/extract/ManagedProxyClassGenerator.java | 283 +++++---- ...nagedSetNodeInitializerExtractionStrategy.java} | 46 +- .../manage/schema/extract/ManagedSetStrategy.java | 62 -- .../ModelMapNodeInitializerExtractionStrategy.java | 49 ++ .../manage/schema/extract/ModelMapStrategy.java | 29 +- .../extract/ModelSchemaAspectExtractionResult.java | 14 - .../schema/extract/ModelSchemaAspectExtractor.java | 5 - .../extract/ModelSchemaExtractionContext.java | 34 +- .../extract/ModelSchemaExtractionResult.java | 47 -- .../extract/ModelSchemaExtractionStrategy.java | 7 +- .../schema/extract/ModelSchemaExtractor.java | 45 +- ...ModelSetNodeInitializerExtractionStrategy.java} | 48 +- .../manage/schema/extract/ModelSetStrategy.java | 62 -- .../NodeInitializerExtractionStrategy.java} | 17 +- .../manage/schema/extract/PrimitiveStrategy.java | 8 +- .../extract/PropertyAccessorExtractionContext.java | 29 +- ...ollectionNodeInitializerExtractionStrategy.java | 406 +++++++++++++ .../schema/extract/ScalarCollectionStrategy.java | 49 ++ ...{JdkValueTypeStrategy.java => ScalarTypes.java} | 39 +- .../manage/schema/extract/SetStrategy.java | 50 +- .../schema/extract/SpecializedMapStrategy.java | 21 +- .../StructSchemaExtractionStrategySupport.java | 47 +- .../extract/UnmanagedImplStructStrategy.java | 20 +- .../method/WeaklyTypeReferencingMethod.java | 41 +- .../model/internal/registry/BindingPredicate.java | 7 +- .../internal/registry/DefaultModelRegistry.java | 641 +++++++++++++-------- ...tatorRuleBinder.java => ModelActionBinder.java} | 15 +- .../model/internal/registry/ModelBinding.java | 5 +- .../internal/registry/ModelCreationListener.java | 5 +- .../gradle/model/internal/registry/ModelGraph.java | 50 +- .../model/internal/registry/ModelNodeInternal.java | 67 ++- .../internal/registry/ModelReferenceNode.java | 87 ++- .../model/internal/registry/ModelRegistry.java | 7 +- .../registry/OneOfTypeBinderCreationListener.java | 6 + .../registry/PathBinderCreationListener.java | 12 +- .../model/internal/registry/RuleBindings.java | 116 ++-- .../internal/registry/UnboundRulesProcessor.java | 12 +- .../model/internal/type/ClassTypeWrapper.java | 7 + .../internal/type/GenericArrayTypeWrapper.java | 72 +++ .../org/gradle/model/internal/type/ModelType.java | 35 +- .../org/gradle/model/internal/type/ModelTypes.java | 18 + .../internal/type/ParameterizedTypeWrapper.java | 9 + .../internal/type/TypeVariableTypeWrapper.java | 10 +- .../gradle/model/internal/type/TypeWrapper.java | 4 + .../model/internal/type/WildcardTypeWrapper.java | 12 + .../org/gradle/model/ManagedNamedTest.groovy | 18 +- .../model/ManagedNodeBackedModelMapTest.groovy | 24 +- .../model/UnmanagedNodeBackedModelMapTest.groovy | 41 +- .../model/internal/ModelValidationTypes.groovy | 120 ++++ .../core/InstanceBackedModelCreatorTest.groovy | 8 +- .../model/internal/core/ModelReferenceTest.groovy | 58 ++ .../core/UnmanagedModelProjectionTest.groovy | 42 ++ .../inspect/ManagedModelInitializerTest.groovy | 117 ++++ .../internal/inspect/ModelRuleBindingTest.groovy | 32 +- .../internal/inspect/ModelRuleExtractorTest.groovy | 63 +- .../inspect/MutationRuleExecutionOrderTest.groovy | 2 +- .../manage/instance/ManagedProxyTest.groovy | 2 +- .../AbstractCollectionModelProjectionTest.groovy | 280 +++++++++ .../projection/ListModelProjectionTest.groovy | 103 ++++ .../projection/ModelSetModelProjectionTest.groovy | 12 +- .../projection/SetModelProjectionTest.groovy} | 23 +- .../extract/DefaultModelSchemaStoreTest.groovy | 13 +- .../extract/ManagedProxyClassGeneratorTest.groovy | 262 ++++++++- .../schema/extract/ModelSchemaExtractorTest.groovy | 347 ++++++----- .../schema/extract/ModelStoreTestUtils.groovy | 47 ++ .../extract/ScalarTypesInManagedModelTest.groovy | 30 +- .../schema/extract/SomeTypeWithParameters.java} | 13 +- ...TypeWithManagedSuperTypeExtractionStrategy.java | 8 - .../model/internal/registry/BeanInternal.groovy} | 16 +- .../registry/DefaultModelRegistryTest.groovy | 613 +++++++++++++------- .../model/internal/registry/ModelGraphTest.groovy | 70 ++- .../internal/registry/ModelNodeInternalTest.groovy | 4 +- .../registry/ModelRegistryEphemeralNodeTest.groovy | 38 +- .../model/internal/registry/RegistrySpec.groovy | 32 +- .../internal/registry/RuleBindingsTest.groovy | 68 ++- .../internal/fixture/ModelRegistryHelper.java | 149 +++-- .../dsl/ModelDslCreationIntegrationTest.groovy | 2 +- .../internal/NonTransformedModelDslBacking.java | 26 +- .../dsl/internal/TransformedModelDslBacking.java | 26 +- .../NonTransformedModelDslBackingTest.groovy | 16 +- .../internal/TransformedModelDslBackingTest.groovy | 15 +- subprojects/osgi/osgi.gradle | 4 +- subprojects/performance/performance.gradle | 199 +++++-- .../performance/src/configPlugin/ConfigPlugin.java | 2 +- subprojects/performance/src/generator.groovy | 545 ------------------ .../performance/CleanBuildPerformanceTest.groovy | 2 +- .../ConfigurationPerformanceTest.groovy | 2 +- .../performance/DaemonPerformanceTest.groovy | 2 +- .../DependencyReportPerformanceTest.groovy | 2 +- .../performance/FirstBuildPerformanceTest.groovy | 2 +- .../IdeIntegrationPerformanceTest.groovy | 4 +- .../ManyEmptyProjectsHelpPerformanceTest.groovy | 12 +- .../performance/NativePerformanceTest.groovy | 10 +- .../NativeScenarioPerformanceTest.groovy | 2 + .../NewJavaPluginPerformanceTest.groovy | 55 ++ .../OldJavaPluginBigProjectPerformanceTest.groovy | 2 +- .../ProjectDependenciesPerformanceTest.groovy | 5 +- .../UpToDateBuildPerformanceTest.groovy | 2 +- .../src/templates/config-inject/build.gradle | 4 +- .../src/templates/native-monolithic/build.gradle | 5 + .../src/templates/native-monolithic/common.gradle | 55 ++ .../templates/native-monolithic/components.gradle | 41 ++ .../templates/native-monolithic/prebuilt.gradle | 23 + .../src/templates/native-monolithic/src/common.h | 7 + .../src/templates/native-monolithic/src/prebuilt.h | 7 + .../src/templates/native-monolithic/src/src.c | 19 + .../src/templates/native-monolithic/src/src.cpp | 20 + .../src/templates/native-monolithic/src/src.h | 14 + .../src/templates/native-monolithic/src/unused.c | 2 + .../src/templates/new-java-project/build.gradle | 140 +++++ .../src/templates/project-with-source/build.gradle | 4 +- .../src/templates/root-project/checkstyle.xml | 22 + .../performance/src/templates/with-junit/Test.java | 2 +- .../performance/fixture/YourKitProfilerTest.groovy | 76 +++ .../performance/fixture/BuildExperimentSpec.groovy | 2 +- .../CrossVersionPerformanceTestRunner.groovy | 9 +- .../fixture/GradleExecuterBackedSession.groovy | 1 - .../fixture/GradleInvocationSpec.groovy | 39 +- .../org/gradle/performance/fixture/Profiler.java} | 10 +- .../performance/fixture/YourKitProfiler.groovy | 206 +++++++ .../base/ComponentModelIntegrationTest.groovy | 88 ++- .../base/CustomBinaryIntegrationTest.groovy | 96 ++- ...tomComponentInternalViewsIntegrationTest.groovy | 204 +++++++ .../base/FunctionalSourceSetIntegrationTest.groovy | 156 +++++ .../LifecycleBasePluginIntegrationTest.groovy | 1 + .../org/gradle/language/base/ProjectSourceSet.java | 2 + .../internal/model/BinarySpecFactoryRegistry.java | 2 + .../internal/model/DefaultVariantsMetaData.java | 10 +- .../model/FunctionalSourceSetNodeInitializer.java | 60 ++ .../base/plugins/ComponentModelBasePlugin.java | 37 +- .../language/base/plugins/LanguageBasePlugin.java | 42 +- .../language/base/plugins/LifecycleBasePlugin.java | 29 +- .../org/gradle/platform/base/BinaryContainer.java | 2 + .../java/org/gradle/platform/base/TypeBuilder.java | 2 + .../platform/base/binary/BaseBinarySpec.java | 28 +- .../platform/base/component/BaseComponentSpec.java | 31 +- .../platform/base/internal/BinarySpecFactory.java | 2 + .../platform/base/internal/BinarySpecInternal.java | 2 + .../base/internal/ComponentSpecFactory.java | 2 + .../base/internal/DefaultPlatformRequirement.java | 5 + .../base/internal/builder/TypeBuilderInternal.java | 4 + .../internal/registry/AbstractTypeBuilder.java | 19 + .../registry/BinaryTasksModelRuleExtractor.java | 9 +- .../registry/BinaryTypeModelRuleExtractor.java | 33 +- .../ComponentBinariesModelRuleExtractor.java | 2 +- .../ComponentModelBaseServiceRegistry.java | 3 +- .../registry/ComponentTypeModelRuleExtractor.java | 60 +- .../registry/LanguageTypeModelRuleExtractor.java | 29 +- .../base/internal/registry/ModelMapBasedRule.java | 55 +- .../internal/registry/TypeModelRuleExtractor.java | 12 + .../internal/resolve/VariantsMatcherTest.groovy | 17 +- .../ComponentTypeModelRuleExtractorTest.groovy | 82 ++- .../model/DefaultVariantsMetaDataTest.groovy | 6 +- .../internal/model/ParametrizedBinaryString.java | 4 +- .../model/ParametrizedBinaryVariantDimension1.java | 4 +- .../model/VariantsMetaDataHelperTest.groovy | 20 +- .../LanguageTypeModelRuleExtractorTest.groovy | 23 +- .../testinterfaces/BareInternalView.groovy} | 7 +- .../ComponentSpecInternalView.groovy} | 13 +- ...NotImplementedComponentSpecInternalView.groovy} | 13 +- .../base/plugins/LanguageBasePluginTest.groovy | 9 +- ...DomainObjectCollectionBackedModelMapTest.groovy | 13 + .../platform/base/binary/BaseBinarySpecTest.groovy | 11 +- .../base/component/BaseComponentSpecTest.groovy | 24 +- ...SpecSpecializationSchemaExtractionStrategy.java | 7 - .../BinaryTasksModelRuleExtractorTest.groovy | 21 +- .../BinaryTypeModelRuleExtractorTest.groovy | 24 +- .../ComponentBinariesModelRuleExtractorTest.groovy | 24 +- .../base/component/BaseComponentFixtures.groovy | 16 +- ...atformJvmComponentReportIntegrationTest.groovy} | 112 +++- .../jvm/internal/AbstractJvmBinaryRenderer.java | 6 +- .../gradle/jvm/internal/DefaultJarBinarySpec.java | 11 + .../org/gradle/jvm/internal/JarBinaryRenderer.java | 9 + ...arBinarySpecSpecializationModelInitializer.java | 21 +- ...lizationNodeInitializerExtractionStrategy.java} | 20 +- ...SpecSpecializationSchemaExtractionStrategy.java | 7 - .../jvm/internal/services/PlatformJvmServices.java | 1 - .../org/gradle/jvm/plugins/JvmComponentPlugin.java | 8 + .../src/main/java/org/gradle/jvm/tasks/Jar.java | 2 +- .../JvmLocalLibraryDependencyResolverTest.groovy | 4 +- .../jvm/internal/DefaultJarBinarySpecTest.groovy | 3 +- .../jvm/internal/DefaultJvmLibrarySpecTest.groovy | 30 +- .../internal/plugins/CreateJvmBinariesTest.groovy | 15 +- ...ormNativeComponentReportIntegrationTest.groovy} | 88 +-- .../gradle/nativeplatform/NativeBinarySpec.java | 4 + .../internal/AbstractNativeBinaryRenderer.java | 8 +- .../internal/NativeExecutableBinaryRenderer.java | 8 + .../internal/SharedLibraryBinaryRenderer.java | 8 + .../internal/StaticLibraryBinaryRenderer.java | 8 + .../internal/configure/NativeBinaries.java | 19 +- .../internal/NativeTestSuiteBinaryRenderer.java | 8 + .../test/plugins/NativeBinariesTestPlugin.java | 8 +- .../internal/DefaultNativeComponentTest.groovy | 6 +- .../DefaultNativeExecutableBinarySpecTest.groovy | 3 +- .../DefaultNativeExecutableSpecTest.groovy | 4 +- .../internal/DefaultNativeLibrarySpecTest.groovy | 5 +- .../DefaultSharedLibraryBinarySpecTest.groovy | 4 +- .../DefaultStaticLibraryBinarySpecTest.groovy | 3 +- .../internal/NativeBinarySpecTest.groovy | 8 +- .../configure/NativeComponentRulesTest.groovy | 34 +- .../plugins/NativeBinariesTestPluginTest.groovy | 3 +- .../gcc/version/GccVersionDeterminerTest.groovy | 8 +- .../configure/TestNativeBinariesFactory.java | 4 +- subprojects/platform-play/platform-play.gradle | 2 + ...dPlayAndJvmLibraryProjectIntegrationTest.groovy | 36 +- .../PlayAppWithFailingTestsIntegrationTest.groovy | 2 +- ...ayMultiProjectApplicationIntegrationTest.groovy | 2 +- ...ayPlatformComponentReportIntegrationTest.groovy | 76 +++ .../integtest/PlayPlatformIntegrationTest.groovy | 2 +- .../PlayBinaryAdvancedAppIntegrationTest.groovy | 2 +- ...ayDistributionAdvancedAppIntegrationTest.groovy | 2 +- .../basic/PlayBinaryBasicAppIntegrationTest.groovy | 2 +- .../PlayDistributionBasicAppIntegrationTest.groovy | 2 +- .../basic/PlayTestBasicAppIntegrationTest.groovy | 2 +- .../PlayContinuousBuildIntegrationTest.groovy | 2 +- ...aScriptCompilerContinuousIntegrationTest.groovy | 54 ++ ...ltiProjectContinuousBuildIntegrationTest.groovy | 2 +- .../PlayMultiProjectReloadIntegrationTest.groovy | 2 +- .../continuous/PlayReloadIntegrationTest.groovy | 5 +- ...RoutesCompilerContinuousIntegrationTest.groovy} | 34 +- ...ayTwirlCompilerContinuousIntegrationTest.groovy | 60 ++ ...BinaryAppWithDependenciesIntegrationTest.groovy | 2 +- ...butionAppWithDependenciesIntegrationTest.groovy | 2 +- ...ayTestAppWithDependenciesIntegrationTest.groovy | 2 +- .../PlayApplicationPluginIntegrationTest.groovy | 53 +- .../PlayDistributionPluginIntegrationTest.groovy | 14 +- .../AbstractRoutesCompileIntegrationTest.groovy | 14 +- .../CoffeeScriptCompileIntegrationTest.groovy | 21 +- .../tasks/DistributionZipIntegrationTest.groovy | 14 +- .../tasks/JavaScriptMinifyIntegrationTest.groovy | 14 +- .../play/tasks/PlayRunIntegrationTest.groovy | 2 +- .../play/tasks/TwirlCompileIntegrationTest.groovy | 14 +- .../play/tasks/TwirlVersionIntegrationTest.groovy | 14 +- .../org/gradle/play/PlayApplicationBinarySpec.java | 2 + .../gradle/play/internal/DefaultPlayPlatform.java | 5 + .../internal/javascript/GoogleClosureCompiler.java | 5 +- .../DefaultVersionedRoutesCompilerAdapter.java | 6 +- .../play/internal/routes/RoutesCompiler.java | 3 +- .../routes/VersionedRoutesCompilerAdapter.java | 3 +- .../spec/PlayApplicationBinaryRenderer.java | 14 +- .../internal/toolchain/DaemonPlayCompiler.java | 5 +- .../gradle/play/internal/twirl/TwirlCompiler.java | 3 +- .../internal/twirl/TwirlCompilerAdapterV10X.java | 6 +- .../internal/twirl/TwirlCompilerAdapterV22X.java | 6 +- .../twirl/VersionedTwirlCompilerAdapter.java | 3 +- .../play/plugins/PlayCoffeeScriptPlugin.java | 2 +- .../gradle/play/plugins/PlayJavaScriptPlugin.java | 2 +- .../play/plugins/PlayPluginConfigurations.java | 11 + .../DefaultPlayApplicationBinarySpecTest.groovy | 3 +- .../play/plugins/PlayCoffeeScriptPluginTest.groovy | 2 +- .../play/plugins/PlayJavaScriptPluginTest.groovy | 2 +- ...ctPlayCompilerContinuousIntegrationTest.groovy} | 24 +- ...stractPlayContinuousBuildIntegrationTest.groovy | 1 - .../DistributionTestExecHandleBuilder.groovy | 1 + .../integtest/fixtures/{app => }/PlayApp.groovy | 11 +- ...ayMultiVersionApplicationIntegrationTest.groovy | 1 - .../play/integtest/fixtures/Repositories.groovy | 44 ++ .../integtest/fixtures/app/AdvancedPlayApp.groovy | 15 + .../integtest/fixtures/app/BasicPlayApp.groovy | 2 + .../fixtures/app/PlayAppWithDependencies.groovy | 2 + .../integtest/fixtures/app/PlayMultiProject.groovy | 1 + .../fixtures/app/WithFailingTestsApp.groovy | 11 +- .../fixtures/app/advancedplayapp/build.gradle | 17 +- .../fixtures/app/basicplayapp/build.gradle | 13 +- .../app/playappwithdependencies/build.gradle | 13 +- .../fixtures/app/playmultiproject/build.gradle | 15 +- .../internal/DefaultPluginRequestApplicator.java | 38 +- .../plugin/use/internal/PluginResolverFactory.java | 11 +- .../internal/PluginUsePluginServiceRegistry.java | 23 +- .../use/resolve/internal/PluginResolveContext.java | 2 + .../internal/InjectedClasspathPluginResolver.java | 91 +++ .../api/tasks/bundling/JarIntegrationTest.groovy | 107 ++++ .../groovy/GroovyBasePluginIntegrationTest.groovy | 8 +- .../BasicGroovyCompilerIntegrationSpec.groovy | 2 +- .../java/ComponentReportIntegrationTest.groovy | 67 --- .../JavaProjectModelBridgingIntegrationTest.groovy | 97 ++++ .../PluginsComponentReportIntegrationTest.groovy | 191 ++++++ .../BasicJavaCompilerIntegrationSpec.groovy | 2 +- .../TestNGConsoleLoggingIntegrationTest.groovy | 4 +- .../shared/build.gradle | 2 +- .../standardOutputLogging/build.gradle | 2 +- .../groovyJdk15Failing/build.gradle | 4 +- .../groovyJdk15Passing/build.gradle | 4 +- .../jvm/ClassDirectoryBinaryNamingScheme.java | 2 +- .../internal/jvm/ClassDirectoryBinaryRenderer.java | 8 + .../jvm/ClassDirectoryBinarySpecInternal.java | 3 - .../jvm/DefaultClassDirectoryBinarySpec.java | 35 +- .../api/internal/tasks/DefaultSourceSet.java | 13 +- .../api/internal/tasks/DefaultSourceSetOutput.java | 10 +- .../tasks/testing/junit/JULRedirector.java | 2 +- .../CaptureTestOutputTestResultProcessor.java | 1 - .../DefaultStandardOutputRedirector.java | 3 +- .../processors}/StandardOutputRedirector.java | 3 +- .../testing/processors/TestOutputRedirector.java | 1 - .../org/gradle/api/plugins/JavaBasePlugin.java | 210 +++++-- .../api/plugins/LegacyJavaComponentPlugin.java | 156 ----- .../groovy/org/gradle/api/tasks/GroovyRuntime.java | 26 +- .../api/internal/plugins/unixStartScript.txt | 4 +- .../ClassDirectoryBinaryNamingSchemeTest.groovy | 16 +- .../jvm/DefaultClassDirectoryBinarySpecTest.groovy | 51 +- .../plugins/UnixStartScriptGeneratorTest.groovy | 2 +- .../api/internal/tasks/DefaultSourceSetTest.groovy | 41 +- .../DefaultStandardOutputRedirectorTest.groovy | 2 +- .../processors/TestOutputRedirectorTest.groovy | 1 - .../gradle/api/plugins/JavaBasePluginTest.groovy | 90 ++- .../plugins/LegacyJavaComponentPluginTest.groovy | 55 -- .../org/gradle/api/tasks/GroovyRuntimeTest.groovy | 3 +- .../org/gradle/api/tasks/testing/TestTest.java | 2 +- .../BuildDashboardPluginIntegrationTest.groovy | 1 - .../http/RepeatableInputStreamEntity.java | 2 +- .../s3/ivy/IvyS3RepoResolveIntegrationTest.groovy | 2 +- .../ivy/IvyPublishSftpIntegrationTest.groovy | 10 +- .../ivy/IvySftpLegacyPublishIntegrationTest.groovy | 2 +- .../maven/MavenPublishSftpIntegrationTest.groovy | 2 +- .../AbstractSftpDependencyResolutionTest.groovy | 2 +- .../ivy/IvySftpRepoResolveIntegrationTest.groovy | 2 +- .../groovy/org/gradle/api/tasks/ScalaRuntime.java | 24 +- .../org/gradle/api/tasks/scala/AntScalaDoc.groovy | 1 + .../org/gradle/api/tasks/ScalaRuntimeTest.groovy | 3 +- .../plugins/sonar/SonarSmokeIntegrationTest.groovy | 14 +- .../org/gradle/sonar/runner/SonarTestServer.groovy | 9 +- .../shared/groovyProject/build.gradle | 2 +- .../gradle/api/plugins/sonar/SonarAnalyze.groovy | 5 +- .../gradle/api/plugins/sonar/SonarPlugin.groovy | 6 + .../plugins/sonar/model/IncludeProperties.groovy | 4 +- .../sonar/model/ModelToPropertiesConverter.groovy | 3 + .../api/plugins/sonar/model/SonarProperty.groovy | 4 +- .../api/plugins/sonar/model/SonarRootModel.groovy | 21 + .../org/gradle/sonar/runner/SonarProperties.java | 6 +- .../gradle/sonar/runner/SonarRunnerExtension.java | 5 +- .../sonar/runner/SonarRunnerRootExtension.java | 3 + .../org/gradle/sonar/runner/package-info.java | 4 +- .../sonar/runner/plugins/SonarRunnerPlugin.java | 8 +- .../org/gradle/sonar/runner/tasks/SonarRunner.java | 9 +- .../testkit/TestKitEndUserIntegrationTest.groovy | 140 ++++- .../AbstractGradleRunnerIntegrationTest.groovy | 14 +- ...adleRunnerPluginInjectionIntegrationTest.groovy | 492 ++++++++++++++++ .../runner/fixtures/GradleRunnerCoverage.groovy} | 17 +- .../runner/fixtures/GradleRunnerType.groovy} | 17 +- .../fixtures/MultiGradleRunnerSpecRunner.groovy | 83 +++ .../org/gradle/testkit/runner/GradleRunner.java | 29 +- .../runner/internal/DefaultGradleRunner.java | 53 +- .../testkit/runner/internal/GradleExecutor.java | 4 +- .../runner/internal/TestKitGradleExecutor.java | 14 +- .../runner/internal/DefaultGradleRunnerTest.groovy | 64 +- ... => CUnitComponentReportIntegrationTest.groovy} | 16 +- ...ingNativeComponentReportIntegrationTest.groovy} | 16 +- .../runner/TestExecutionResultEvaluator.java | 2 +- ...GlobalLoggingManipulationIntegrationTest.groovy | 4 +- .../tooling/ToolingApiIntegrationTest.groovy | 7 +- .../tooling/ToolingApiRemoteIntegrationTest.groovy | 5 +- .../ToolingApiCompatibilitySuiteRunner.groovy | 3 - .../fixture/ToolingApiDistributionResolver.groovy | 2 +- .../fixture/ToolingApiLoggingSpecification.groovy} | 11 +- .../m3/ToolingApiLoggingCrossVersionSpec.groovy | 8 +- .../m5/ToolingApiIdeaModelCrossVersionSpec.groovy | 25 +- ...ReceivingStandardStreamsCrossVersionSpec.groovy | 86 ++- .../m8/ToolingApiLoggingCrossVersionSpec.groovy | 6 +- .../r23/StandardStreamsCrossVersionSpec.groovy | 8 +- .../ToolingApiEclipseModelCrossVersionSpec.groovy | 64 ++ .../r28/ToolingApiIdeaModelCrossVersionSpec.groovy | 64 ++ .../consumer/AbstractLongRunningOperation.java | 13 + .../internal/consumer/DefaultBuildLauncher.java | 2 +- .../parameters/ConsumerOperationParameters.java | 66 ++- .../ConsumerOperationParametersTest.groovy | 18 +- version.txt | 2 +- 847 files changed, 21726 insertions(+), 8167 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
