Build sources are engine room too

- Update buildSrc to use engine_room package - Publish artifacts under engine_room - Specify group in gradle.properties
Engine-Room · May 25, 2024 · 9593126 · 9593126
1 parent a69389c
commit 9593126
Show file tree

Hide file tree

Showing 12 changed files with 26 additions and 22 deletions.
diff --git a/README.md b/README.md
@@ -46,11 +46,12 @@ repositories {
 }
 
 dependencies {
-    compileOnly fg.deobf("com.jozufozu.flywheel:flywheel-forge-api-${minecraft_version}:${flywheel_version}")
-    runtimeOnly fg.deobf("com.jozufozu.flywheel:flywheel-forge-${minecraft_version}:${flywheel_version}")
+    compileOnly fg.deobf("dev.engine_room.flywheel:flywheel-forge-api-${minecraft_version}:${flywheel_version}")
+    runtimeOnly fg.deobf("dev.engine_room.flywheel:flywheel-forge-${minecraft_version}:${flywheel_version}")
 }
 ```
 `${flywheel_version}` gets replaced by the version of Flywheel you want to use, eg. `1.0.0-beta`
+
 `${minecraft_version}` gets replaced by the version of Minecraft you're on, eg. `1.20.1`
 
 For a list of available Flywheel versions, you can check [the maven](https://maven.tterrag.com/com/jozufozu/flywheel/Flywheel-Forge/).

diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
@@ -21,11 +21,11 @@ gradlePlugin {
     plugins {
         create("platformPlugin") {
             id = "flywheel.platform"
-            implementationClass = "com.jozufozu.gradle.platform.PlatformPlugin"
+            implementationClass = "dev.engine_room.gradle.platform.PlatformPlugin"
         }
         create("subprojectPlugin") {
             id = "flywheel.subproject"
-            implementationClass = "com.jozufozu.gradle.subproject.SubprojectPlugin"
+            implementationClass = "dev.engine_room.gradle.subproject.SubprojectPlugin"
         }
     }
 }

diff --git a/...jozufozu/gradle/jarset/JarSetExtension.kt → ...ine_room/gradle/jarset/JarSetExtension.kt b/...jozufozu/gradle/jarset/JarSetExtension.kt → ...ine_room/gradle/jarset/JarSetExtension.kt
@@ -1,4 +1,4 @@
-package com.jozufozu.gradle.jarset
+package dev.engine_room.gradle.jarset
 
 import net.fabricmc.loom.task.RemapJarTask
 import net.fabricmc.loom.task.RemapSourcesJarTask

diff --git a/.../com/jozufozu/gradle/jarset/JarTaskSet.kt → ...v/engine_room/gradle/jarset/JarTaskSet.kt b/.../com/jozufozu/gradle/jarset/JarTaskSet.kt → ...v/engine_room/gradle/jarset/JarTaskSet.kt
@@ -1,4 +1,4 @@
-package com.jozufozu.gradle.jarset
+package dev.engine_room.gradle.jarset
 
 import net.fabricmc.loom.task.AbstractRemapJarTask
 import net.fabricmc.loom.task.RemapJarTask

diff --git a/...e/nullability/GeneratePackageInfosTask.kt → ...e/nullability/GeneratePackageInfosTask.kt b/...e/nullability/GeneratePackageInfosTask.kt → ...e/nullability/GeneratePackageInfosTask.kt
@@ -1,4 +1,4 @@
-package com.jozufozu.gradle.nullability
+package dev.engine_room.gradle.nullability
 
 import org.apache.groovy.nio.extensions.NioExtensions
 import org.codehaus.groovy.runtime.StringGroovyMethods

diff --git a/...adle/nullability/PackageInfosExtension.kt → ...adle/nullability/PackageInfosExtension.kt b/...adle/nullability/PackageInfosExtension.kt → ...adle/nullability/PackageInfosExtension.kt
@@ -1,4 +1,4 @@
-package com.jozufozu.gradle.nullability
+package dev.engine_room.gradle.nullability
 
 import org.gradle.api.Project
 import org.gradle.api.tasks.Delete

diff --git a/...fozu/gradle/platform/PlatformExtension.kt → ...room/gradle/platform/PlatformExtension.kt b/...fozu/gradle/platform/PlatformExtension.kt → ...room/gradle/platform/PlatformExtension.kt
@@ -1,6 +1,6 @@
-package com.jozufozu.gradle.platform
+package dev.engine_room.gradle.platform
 
-import com.jozufozu.gradle.jarset.JarTaskSet
+import dev.engine_room.gradle.jarset.JarTaskSet
 import net.fabricmc.loom.api.LoomGradleExtensionAPI
 import org.gradle.api.Project
 import org.gradle.api.tasks.SourceSet

diff --git a/...ozufozu/gradle/platform/PlatformPlugin.kt → ...ne_room/gradle/platform/PlatformPlugin.kt b/...ozufozu/gradle/platform/PlatformPlugin.kt → ...ne_room/gradle/platform/PlatformPlugin.kt
@@ -1,4 +1,4 @@
-package com.jozufozu.gradle.platform
+package dev.engine_room.gradle.platform
 
 import org.gradle.api.Plugin
 import org.gradle.api.Project

diff --git a/...ozu/gradle/subproject/SubprojectPlugin.kt → ...oom/gradle/subproject/SubprojectPlugin.kt b/...ozu/gradle/subproject/SubprojectPlugin.kt → ...oom/gradle/subproject/SubprojectPlugin.kt
@@ -1,8 +1,8 @@
-package com.jozufozu.gradle.subproject
+package dev.engine_room.gradle.subproject
 
-import com.jozufozu.gradle.jarset.JarSetExtension
-import com.jozufozu.gradle.nullability.PackageInfosExtension
-import com.jozufozu.gradle.transitive.TransitiveSourceSetsExtension
+import dev.engine_room.gradle.jarset.JarSetExtension
+import dev.engine_room.gradle.nullability.PackageInfosExtension
+import dev.engine_room.gradle.transitive.TransitiveSourceSetsExtension
 import net.fabricmc.loom.api.LoomGradleExtensionAPI
 import org.gradle.api.JavaVersion
 import org.gradle.api.Plugin
@@ -38,12 +38,14 @@ class SubprojectPlugin: Plugin<Project> {
         val dev = System.getenv("RELEASE")?.contentEquals("false", true) ?: true
         val buildNumber = System.getenv("BUILD_NUMBER")
 
-        val mod_version: String by project
-        project.group = "com.jozufozu.flywheel"
-        project.version = mod_version + if (dev && buildNumber != null) "-${buildNumber}" else ""
+        val versionSuffix = if (dev && buildNumber != null) "-${buildNumber}" else ""
 
-        val artifact_minecraft_version: String by project
-        project.the<BasePluginExtension>().archivesName = "flywheel-${project.name}-${artifact_minecraft_version}"
+        project.group = project.property("group") as String
+        project.version = "${project.property("mod_version")}${versionSuffix}"
+
+        project.the<BasePluginExtension>().apply {
+            archivesName = "flywheel-${project.name}-${project.property("artifact_minecraft_version")}"
+        }
     }
 
     @Suppress("UnstableApiUsage")

diff --git a/...sitive/TransitiveSourceSetConfigurator.kt → ...sitive/TransitiveSourceSetConfigurator.kt b/...sitive/TransitiveSourceSetConfigurator.kt → ...sitive/TransitiveSourceSetConfigurator.kt
@@ -1,4 +1,4 @@
-package com.jozufozu.gradle.transitive
+package dev.engine_room.gradle.transitive
 
 import org.gradle.api.tasks.SourceSet
 

diff --git a/...ansitive/TransitiveSourceSetsExtension.kt → ...ansitive/TransitiveSourceSetsExtension.kt b/...ansitive/TransitiveSourceSetsExtension.kt → ...ansitive/TransitiveSourceSetsExtension.kt
@@ -1,4 +1,4 @@
-package com.jozufozu.gradle.transitive
+package dev.engine_room.gradle.transitive
 
 import org.gradle.api.Action
 import org.gradle.api.Project

diff --git a/gradle.properties b/gradle.properties
@@ -36,4 +36,5 @@ embeddium_version = 0.3.9+mc1.20.1
 oculus_version = 1.20.1-1.6.15a
 
 # Publication info
+group = dev.engine_room.flywheel
 artifact_minecraft_version = 1.20.1