Skip to content

Commit

Permalink
Merge pull request #10762 from gradle/lacasseio/native/deincubating
Browse files Browse the repository at this point in the history
Deincubate the new C++ and Swift plugins
  • Loading branch information
big-guy committed Sep 18, 2019
2 parents 6565d02 + 946abeb commit 4c751cb
Show file tree
Hide file tree
Showing 114 changed files with 30 additions and 234 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,11 @@

package org.gradle.api.component;

import org.gradle.api.Incubating;

/**
* Represents a component that can be built.
*
* @since 4.7
*/
@Incubating
public interface BuildableComponent extends SoftwareComponent {

}
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,10 @@

package org.gradle.api.component;

import org.gradle.api.Incubating;

/**
* Represents a component that can be published.
*
* @since 4.7
*/
@Incubating
public interface PublishableComponent extends SoftwareComponent, ComponentWithCoordinates {
}
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@

package org.gradle.ide.visualstudio.plugins;

import org.gradle.api.Incubating;
import org.gradle.api.Project;
import org.gradle.api.Task;
import org.gradle.api.internal.CollectionCallbackActionDecorator;
Expand Down Expand Up @@ -61,7 +60,6 @@
/**
* A plugin for creating a Visual Studio solution for a gradle project.
*/
@Incubating
public class VisualStudioPlugin extends IdePlugin {
private static final String LIFECYCLE_TASK_NAME = "visualStudio";

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@

package org.gradle.ide.visualstudio.plugins;

import org.gradle.api.Incubating;
import org.gradle.api.internal.project.ProjectIdentifier;
import org.gradle.api.internal.project.ProjectInternal;
import org.gradle.api.internal.project.ProjectRegistry;
Expand All @@ -33,6 +34,7 @@
import org.gradle.nativeplatform.NativeBinarySpec;
import org.gradle.platform.base.BinaryContainer;

@Incubating
class VisualStudioPluginRules {
static class VisualStudioExtensionRules extends RuleSource {
@Model
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,11 @@

package org.gradle.ide.visualstudio;

import org.gradle.api.Incubating;
import org.gradle.api.NamedDomainObjectSet;

/**
* The configuration for mapping a set of native components to a Visual Studio project.
*/
@Incubating
public interface VisualStudioExtension {
/**
* The {@link VisualStudioProject}s generated.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -47,23 +47,25 @@
* }
* </pre>
*/
@Incubating
@HasInternalProtocol
public interface VisualStudioProject extends Named, Buildable {
/**
* Configuration for the generated project file.
*/
@Internal
@Incubating
XmlConfigFile getProjectFile();

/**
* Configuration for the generated filters file.
*/
@Internal
@Incubating
XmlConfigFile getFiltersFile();

@Override
@Internal
@Incubating
TaskDependency getBuildDependencies();

@Override
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,12 @@
package org.gradle.ide.visualstudio;

import org.gradle.api.Action;
import org.gradle.api.Incubating;

/**
* The configuration for mapping a set of native components to a Visual Studio project and solution.
*
* @since 4.6
*/
@Incubating
public interface VisualStudioRootExtension extends VisualStudioExtension {
/**
* Returns the generated {@link VisualStudioSolution} for this build.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@ public interface VisualStudioSolution extends Named, Buildable, IdeWorkspace {
* Configuration for the generated solution file.
*/
@Internal
@Incubating
TextConfigFile getSolutionFile();

/**
Expand All @@ -65,6 +66,7 @@ public interface VisualStudioSolution extends Named, Buildable, IdeWorkspace {

@Override
@Internal
@Incubating
TaskDependency getBuildDependencies();

@Override
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,5 +17,4 @@
/**
* Model classes for visual studio.
*/
@org.gradle.api.Incubating
package org.gradle.ide.visualstudio;
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,11 @@

package org.gradle.ide.xcode;

import org.gradle.api.Incubating;

/**
* The configuration for mapping a C++ or Swift project to an XCode project.
*
* @since 4.2
*/
@Incubating
public interface XcodeExtension {
/**
* Returns the generated Xcode project for this Gradle project.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,11 @@

package org.gradle.ide.xcode;

import org.gradle.api.Incubating;

/**
* A xcode project, created from C++ or Swift capable project.
*
* @since 4.2
* @see <a href="https://developer.apple.com/library/content/featuredarticles/XcodeConcepts/Concept-Projects.html">XCode Project Concept</a>
*/
@Incubating
public interface XcodeProject {
}
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,11 @@

package org.gradle.ide.xcode;

import org.gradle.api.Incubating;

/**
* The configuration for mapping a C++ or Swift project to XCode project and workspace.
*
* @since 4.7
*/
@Incubating
public interface XcodeRootExtension extends XcodeExtension {
/**
* Returns the generated Xcode workspace for this Gradle build.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@

package org.gradle.ide.xcode;

import org.gradle.api.Incubating;
import org.gradle.api.file.Directory;
import org.gradle.api.provider.Provider;
import org.gradle.plugins.ide.IdeWorkspace;
Expand All @@ -26,7 +25,6 @@
*
* @since 4.7
*/
@Incubating
public interface XcodeWorkspace extends IdeWorkspace {
/**
* Returns the location of the generated workspace.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,5 +19,4 @@
*
* @since 4.2
*/
@org.gradle.api.Incubating
package org.gradle.ide.xcode;
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@
import org.apache.commons.lang.StringUtils;
import org.gradle.api.Action;
import org.gradle.api.GradleException;
import org.gradle.api.Incubating;
import org.gradle.api.Project;
import org.gradle.api.Task;
import org.gradle.api.artifacts.ArtifactView;
Expand Down Expand Up @@ -82,7 +81,6 @@
*
* @since 4.2
*/
@Incubating
public class XcodePlugin extends IdePlugin {
private final GidGenerator gidGenerator;
private final ObjectFactory objectFactory;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,5 +19,4 @@
*
* @since 4.2
*/
@org.gradle.api.Incubating
package org.gradle.ide.xcode.plugins;
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
package org.gradle.language;

import org.gradle.api.Action;
import org.gradle.api.Incubating;
import org.gradle.api.component.SoftwareComponent;
import org.gradle.api.provider.Provider;
import org.gradle.api.specs.Spec;
Expand All @@ -32,7 +31,6 @@
* @param <T> type of the elements in this container.
* @since 4.5
*/
@Incubating
public interface BinaryCollection<T extends SoftwareComponent> {
/**
* Returns a {@link BinaryProvider} that contains the single binary matching the specified type and specification. The binary will be in the finalized state. The provider can be used to apply configuration to the element before it is finalized.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
package org.gradle.language;

import org.gradle.api.Action;
import org.gradle.api.Incubating;
import org.gradle.api.provider.Provider;

/**
Expand All @@ -26,7 +25,6 @@
* @since 4.5
* @param <T> The type of binary.
*/
@Incubating
public interface BinaryProvider<T> extends Provider<T> {
/**
* Registers an action to execute to configure the binary. The action is executed only when the element is required.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,15 +17,13 @@
package org.gradle.language;

import org.gradle.api.Action;
import org.gradle.api.Incubating;
import org.gradle.api.artifacts.ExternalModuleDependency;

/**
* Allows the implementation dependencies of a component to be specified.
*
* @since 4.6
*/
@Incubating
public interface ComponentDependencies {
/**
* Adds an implementation dependency to this component. An implementation dependency is not visible to consumers that are compiled against this component.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,15 +16,13 @@

package org.gradle.language;

import org.gradle.api.Incubating;
import org.gradle.api.component.SoftwareComponent;

/**
* Represents a component that is composed of one or more binaries.
*
* @since 4.5
*/
@Incubating
public interface ComponentWithBinaries extends SoftwareComponent {
/**
* Returns the binaries of this component.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,15 +16,13 @@

package org.gradle.language;

import org.gradle.api.Incubating;
import org.gradle.api.component.SoftwareComponent;

/**
* Represents a component with implementation dependencies.
*
* @since 4.6
*/
@Incubating
public interface ComponentWithDependencies extends SoftwareComponent {
/**
* Returns the dependencies of this component.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@

package org.gradle.language;

import org.gradle.api.Incubating;
import org.gradle.api.component.SoftwareComponent;
import org.gradle.api.file.FileCollection;

Expand All @@ -25,7 +24,6 @@
*
* @since 4.5
*/
@Incubating
public interface ComponentWithOutputs extends SoftwareComponent {
/**
* Returns the outputs produced for this component.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@

package org.gradle.language;

import org.gradle.api.Incubating;
import org.gradle.api.provider.SetProperty;
import org.gradle.nativeplatform.TargetMachine;

Expand All @@ -25,7 +24,6 @@
*
* @since 5.2
*/
@Incubating
public interface ComponentWithTargetMachines {
/**
* Specifies the target machines this component should be built for. The "machines" extension property (see {@link org.gradle.nativeplatform.TargetMachineFactory}) can be used to construct common operating system and architecture combinations.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,15 +17,13 @@
package org.gradle.language;

import org.gradle.api.Action;
import org.gradle.api.Incubating;
import org.gradle.api.artifacts.ExternalModuleDependency;

/**
* Allows the API and implementation dependencies of a library to be specified.
*
* @since 4.6
*/
@Incubating
public interface LibraryDependencies extends ComponentDependencies {
/**
* Adds an API dependency to this library. An API dependency is made visible to consumers that are compiled against this component.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@

package org.gradle.language;

import org.gradle.api.Incubating;
import org.gradle.api.component.SoftwareComponent;
import org.gradle.api.provider.Provider;

Expand All @@ -25,7 +24,6 @@
*
* @since 4.5
*/
@Incubating
public interface ProductionComponent extends SoftwareComponent {
/**
* Returns the binary of the component to use as the default for development.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@

package org.gradle.language.cpp;

import org.gradle.api.Incubating;
import org.gradle.api.provider.Provider;

/**
Expand All @@ -26,7 +25,6 @@
*
* @since 4.2
*/
@Incubating
public interface CppApplication extends ProductionCppComponent {
/**
* {@inheritDoc}
Expand Down
Loading

0 comments on commit 4c751cb

Please sign in to comment.