Merge pull request #125 from gradle/tt/update-cpp-and-swift

Restore testbeds to build, fix cpp and swift plugin extension registration
gradle · Oct 28, 2024 · aa6c1d6 · aa6c1d6
2 parents 59f5d7c + f68abdd
commit aa6c1d6
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 24 deletions.
diff --git a/unified-prototype/settings.gradle.dcl b/unified-prototype/settings.gradle.dcl
@@ -36,23 +36,23 @@ defaults {
     }
 }
 
-//include("android-util")
-//include("java-util")
-//include("kotlin-jvm-util")
-//include("kotlin-util")
-//include("swift-util")
-//include("cpp-util")
-//include("testbed-android-library")
-//include("testbed-android-application")
-//include("testbed-kotlin-library")
-//include("testbed-kotlin-application")
-//include("testbed-kotlin-jvm-application")
-//include("testbed-kotlin-jvm-library")
-//include("testbed-jvm-library")
-//include("testbed-jvm-application")
-//include("testbed-java-application")
-//include("testbed-java-library")
-//include("testbed-swift-library")
-//include("testbed-swift-application")
-//include("testbed-cpp-library")
-//include("testbed-cpp-application")
+include("android-util")
+include("java-util")
+include("kotlin-jvm-util")
+include("kotlin-util")
+include("swift-util")
+include("cpp-util")
+include("testbed-android-library")
+include("testbed-android-application")
+include("testbed-kotlin-library")
+include("testbed-kotlin-application")
+include("testbed-kotlin-jvm-application")
+include("testbed-kotlin-jvm-library")
+include("testbed-jvm-library")
+include("testbed-jvm-application")
+include("testbed-java-application")
+include("testbed-java-library")
+include("testbed-swift-library")
+include("testbed-swift-application")
+include("testbed-cpp-library")
+include("testbed-cpp-application")
diff --git a/...gin-cpp/src/main/java/org/gradle/api/experimental/cpp/StandaloneCppApplicationPlugin.java b/...gin-cpp/src/main/java/org/gradle/api/experimental/cpp/StandaloneCppApplicationPlugin.java
@@ -23,7 +23,6 @@ public abstract class StandaloneCppApplicationPlugin implements Plugin<Project>
     @Override
     public void apply(Project target) {
         CppApplication application = getApplication();
-        target.getExtensions().add(CPP_APPLICATION, application);
 
         target.getPlugins().apply(CppApplicationPlugin.class);
         target.getPlugins().apply(CliApplicationConventionsPlugin.class);

diff --git a/.../plugin-cpp/src/main/java/org/gradle/api/experimental/cpp/StandaloneCppLibraryPlugin.java b/.../plugin-cpp/src/main/java/org/gradle/api/experimental/cpp/StandaloneCppLibraryPlugin.java
@@ -15,7 +15,6 @@ public abstract class StandaloneCppLibraryPlugin implements Plugin<Project> {
     @Override
     public void apply(Project target) {
         CppLibrary library = getLibrary();
-        target.getExtensions().add(CPP_LIBRARY, library);
 
         target.getPlugins().apply(CppLibraryPlugin.class);
 

diff --git a/...ift/src/main/java/org/gradle/api/experimental/swift/StandaloneSwiftApplicationPlugin.java b/...ift/src/main/java/org/gradle/api/experimental/swift/StandaloneSwiftApplicationPlugin.java
@@ -25,7 +25,6 @@ public abstract class StandaloneSwiftApplicationPlugin implements Plugin<Project
     @Override
     public void apply(Project project) {
         SwiftApplication application = getApplication();
-        project.getExtensions().add(SWIFT_APPLICATION, application);
 
         project.getPlugins().apply(SwiftApplicationPlugin.class);
         project.getPlugins().apply(CliApplicationConventionsPlugin.class);

diff --git a/...n-swift/src/main/java/org/gradle/api/experimental/swift/StandaloneSwiftLibraryPlugin.java b/...n-swift/src/main/java/org/gradle/api/experimental/swift/StandaloneSwiftLibraryPlugin.java
@@ -16,7 +16,6 @@ public abstract class StandaloneSwiftLibraryPlugin implements Plugin<Project> {
     @Override
     public void apply(Project project) {
         SwiftLibrary library = getLibrary();
-        project.getExtensions().add(SWIFT_LIBRARY, library);
 
         project.getPlugins().apply(SwiftLibraryPlugin.class);