Stubborn stubs

- Remove Stub SourceSet
Engine-Room · Nov 3, 2024 · ad2f3c8 · ad2f3c8
1 parent d881ba5
commit ad2f3c8
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 21 deletions.
diff --git a/common/build.gradle.kts b/common/build.gradle.kts
@@ -9,7 +9,6 @@ plugins {
 val api = sourceSets.create("api")
 val lib = sourceSets.create("lib")
 val backend = sourceSets.create("backend")
-val stubs = sourceSets.create("stubs")
 val main = sourceSets.getByName("main")
 
 transitiveSourceSets {
@@ -26,11 +25,8 @@ transitiveSourceSets {
         rootCompile()
         compile(api, lib)
     }
-    sourceSet(stubs) {
-        rootCompile()
-    }
     sourceSet(main) {
-        compile(api, lib, backend, stubs)
+        compile(api, lib, backend)
     }
     sourceSet(sourceSets.getByName("test")) {
         implementation(api, lib, backend)
@@ -46,7 +42,6 @@ jarSets {
     outgoing("commonApiOnly", api)
     outgoing("commonLib", lib)
     outgoing("commonBackend", backend)
-    outgoing("commonStubs", stubs)
     outgoing("commonImpl", main)
 
     // For publishing.

diff --git a/fabric/build.gradle.kts b/fabric/build.gradle.kts
@@ -10,7 +10,6 @@ plugins {
 val api = sourceSets.create("api")
 val lib = sourceSets.create("lib")
 val backend = sourceSets.create("backend")
-val stubs = sourceSets.create("stubs")
 val main = sourceSets.getByName("main")
 
 transitiveSourceSets {
@@ -27,12 +26,7 @@ transitiveSourceSets {
         rootCompile()
         compile(api, lib)
     }
-    sourceSet(stubs) {
-        rootCompile()
-    }
     sourceSet(main) {
-        // Don't want stubs at runtime
-        compile(stubs)
         implementation(api, lib, backend)
     }
 
@@ -41,7 +35,7 @@ transitiveSourceSets {
 
 platform {
     commonProject = project(":common")
-    compileWithCommonSourceSets(api, lib, backend, stubs, main)
+    compileWithCommonSourceSets(api, lib, backend, main)
     setupLoomMod(api, lib, backend, main)
     setupLoomRuns()
     setupFatJar(api, lib, backend, main)
@@ -83,6 +77,5 @@ dependencies {
     "forApi"(project(path = ":common", configuration = "commonApiOnly"))
     "forLib"(project(path = ":common", configuration = "commonLib"))
     "forBackend"(project(path = ":common", configuration = "commonBackend"))
-    "forStubs"(project(path = ":common", configuration = "commonStubs"))
     "forMain"(project(path = ":common", configuration = "commonImpl"))
 }
diff --git a/forge/build.gradle.kts b/forge/build.gradle.kts
@@ -10,7 +10,6 @@ plugins {
 val api = sourceSets.create("api")
 val lib = sourceSets.create("lib")
 val backend = sourceSets.create("backend")
-val stubs = sourceSets.create("stubs")
 val main = sourceSets.getByName("main")
 
 transitiveSourceSets {
@@ -27,19 +26,16 @@ transitiveSourceSets {
         rootCompile()
         compile(api, lib)
     }
-    sourceSet(stubs) {
-        rootCompile()
-    }
     sourceSet(main) {
-        compile(api, lib, backend, stubs)
+        compile(api, lib, backend)
     }
 
     createCompileConfigurations()
 }
 
 platform {
     commonProject = project(":common")
-    compileWithCommonSourceSets(api, lib, backend, stubs, main)
+    compileWithCommonSourceSets(api, lib, backend, main)
     setupLoomMod(api, lib, backend, main)
     setupLoomRuns()
     setupFatJar(api, lib, backend, main)
@@ -91,6 +87,5 @@ dependencies {
     "forApi"(project(path = ":common", configuration = "commonApiOnly"))
     "forLib"(project(path = ":common", configuration = "commonLib"))
     "forBackend"(project(path = ":common", configuration = "commonBackend"))
-    "forStubs"(project(path = ":common", configuration = "commonStubs"))
     "forMain"(project(path = ":common", configuration = "commonImpl"))
 }