Misc: Move example gui code into dedicated :example:common project

EssentialGG · Aug 6, 2024 · 78ad29f · 78ad29f
1 parent 1140bcb
commit 78ad29f
Show file tree

Hide file tree

Showing 10 changed files with 25 additions and 5 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -71,14 +71,10 @@ tasks.processResources {
 tasks.jar {
     dependsOn(internal)
     from({ internal.map { zipTree(it) } })
-
-    // TODO move into separate project
-    exclude("com") // `com.example` package
 }
 
 apiValidation {
     ignoredProjects.addAll(subprojects.map { it.name })
-    ignoredPackages.add("com.example")
     nonPublicMarkers.add("org.jetbrains.annotations.ApiStatus\$Internal")
 }
 

diff --git a/example/build.gradle.kts b/example/build.gradle.kts
@@ -18,7 +18,7 @@ dependencies {
         exclude(group = "org.jetbrains.kotlin")
     }
 
-    implementation(project(":"))
+    implementation(project(":example:common"))
 
     if (platform.isFabric) {
         val fabricApiVersion = when(platform.mcVersion) {

diff --git a/example/common/build.gradle.kts b/example/common/build.gradle.kts
@@ -0,0 +1,23 @@
+import gg.essential.gradle.multiversion.StripReferencesTransform.Companion.registerStripReferencesAttribute
+
+plugins {
+    kotlin("jvm")
+    id("gg.essential.defaults")
+}
+repositories.mavenLocal()
+
+kotlin.jvmToolchain(8)
+
+val common = registerStripReferencesAttribute("common") {
+    excludes.add("net.minecraft")
+}
+
+dependencies {
+    api(libs.kotlin.stdlib.jdk8)
+
+    compileOnly(libs.versions.universalcraft.map { "gg.essential:universalcraft-1.8.9-forge:$it" }) {
+        attributes { attribute(common, true) }
+    }
+
+    api(project(":"))
+}
diff --git a/...a/com/example/examplemod/ComponentsGui.kt → ...n/com/example/examplemod/ComponentsGui.kt b/...a/com/example/examplemod/ComponentsGui.kt → ...n/com/example/examplemod/ComponentsGui.kt
diff --git a/...java/com/example/examplemod/ExampleGui.kt → ...tlin/com/example/examplemod/ExampleGui.kt b/...java/com/example/examplemod/ExampleGui.kt → ...tlin/com/example/examplemod/ExampleGui.kt
diff --git a/...m/example/examplemod/ExampleServerList.kt → ...m/example/examplemod/ExampleServerList.kt b/...m/example/examplemod/ExampleServerList.kt → ...m/example/examplemod/ExampleServerList.kt
diff --git a/...ava/com/example/examplemod/ExamplesGui.kt → ...lin/com/example/examplemod/ExamplesGui.kt b/...ava/com/example/examplemod/ExamplesGui.kt → ...lin/com/example/examplemod/ExamplesGui.kt
diff --git a/...a/com/example/examplemod/JavaTestGui.java → ...n/com/example/examplemod/JavaTestGui.java b/...a/com/example/examplemod/JavaTestGui.java → ...n/com/example/examplemod/JavaTestGui.java
diff --git a/.../java/com/example/examplemod/KtTestGui.kt → ...otlin/com/example/examplemod/KtTestGui.kt b/.../java/com/example/examplemod/KtTestGui.kt → ...otlin/com/example/examplemod/KtTestGui.kt
diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -29,6 +29,7 @@ include(":example")
 project(":example").apply {
     buildFileName = "root.gradle.kts"
 }
+include(":example:common")
 listOf(
     "1.8.9-forge",
     "1.12.2-forge",