From fb41248c4cf12a48f95ce88408d1ceedba73e959 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rhys=E2=81=A3=E2=81=A3=E2=81=A3=E2=81=A3=E2=81=A3=E2=81=A3?=
 =?UTF-8?q?=E2=81=A3?= <98863820+rhysdh540@users.noreply.github.com>
Date: Mon, 9 Sep 2024 22:11:05 -0400
Subject: [PATCH] fix loom version getting (#254)

* fix loom version getting
very cursed but it works :)

* remove commented out stuff in settings.gradle.kts, unnecessary plugins in buildSrc, and configure buildSrc to download sources/javadoc
---
 .gitignore                |  1 +
 buildSrc/build.gradle.kts | 21 ++++++++++++++++-----
 gradle.properties         |  3 +--
 settings.gradle.kts       |  6 ------
 4 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/.gitignore b/.gitignore
index 96431a961..ac9299c20 100644
--- a/.gitignore
+++ b/.gitignore
@@ -44,6 +44,7 @@ local.properties
 .buildpath
 
 # Other
+.DS_Store
 mcmodsrepo
 src/*/generatedPackageInfos/
 */src/*/generatedPackageInfos/
diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
index ea885f0e6..09e510ed6 100644
--- a/buildSrc/build.gradle.kts
+++ b/buildSrc/build.gradle.kts
@@ -1,7 +1,8 @@
+import java.util.Properties
+
 plugins {
-    id("java-gradle-plugin")
-    kotlin("jvm") version "1.9.23"
     `kotlin-dsl`
+    idea
 }
 
 repositories {
@@ -17,6 +18,11 @@ repositories {
     maven("https://maven.parchmentmc.org")
 }
 
+idea.module {
+    isDownloadJavadoc = true
+    isDownloadSources = true
+}
+
 gradlePlugin {
     plugins {
         create("platformPlugin") {
@@ -30,7 +36,12 @@ gradlePlugin {
     }
 }
 
-dependencies {
-    // FIXME: This should not hard-code the Loom version.
-    implementation("dev.architectury.loom:dev.architectury.loom.gradle.plugin:1.6.397")
+val properties by lazy {
+    Properties().apply {
+        load(rootDir.parentFile.resolve("gradle.properties").inputStream())
+    }
+}
+
+dependencies {
+    implementation("dev.architectury.loom:dev.architectury.loom.gradle.plugin:${properties["arch_loom_version"]}")
 }
diff --git a/gradle.properties b/gradle.properties
index 284ee34aa..6fbee910b 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -19,8 +19,7 @@ forge_version_range = [47.0.0,)
 
 # General build dependency versions
 java_version = 17
-# FIXME: This doesn't do anything.
-# arch_loom_version = 1.6-SNAPSHOT
+arch_loom_version = 1.6.397
 cursegradle_version = 1.4.0
 parchment_version = 2023.09.03
 
diff --git a/settings.gradle.kts b/settings.gradle.kts
index d9d1bb952..cdaa0ff9f 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -11,12 +11,6 @@ pluginManagement {
         maven("https://repo.spongepowered.org/repository/maven-public")
         maven("https://maven.parchmentmc.org")
     }
-
-    // FIXME: This doesn't do anything. The actual version is always the one defined in buildSrc/build.gradle.kts.
-//    plugins {
-//        val arch_loom_version: String by settings
-//        id("dev.architectury.loom") version arch_loom_version
-//    }
 }
 
 rootProject.name = "Flywheel"