User: rednesto
Date: 15 May 23 10:22
Revision: 91634e9484ae03fd4457a3db6682bc6a1fa85538
Summary:
Bump default Gradle version, SpongeGradle and Loom


TeamCity URL: http://ci.mcdev.io:80/viewModification.html?tab=vcsModificationFiles&modId=8506&personal=false

Index: src/main/kotlin/creator/buildsystem/gradle-steps.kt
===================================================================
--- src/main/kotlin/creator/buildsystem/gradle-steps.kt	(revision 985ce0efb706f2c0168cb166640b673cbf6248d4)
+++ src/main/kotlin/creator/buildsystem/gradle-steps.kt	(revision 91634e9484ae03fd4457a3db6682bc6a1fa85538)
@@ -59,7 +59,7 @@
 import org.jetbrains.plugins.gradle.service.project.open.canLinkAndRefreshGradleProject
 import org.jetbrains.plugins.gradle.service.project.open.linkAndRefreshGradleProject
 
-val DEFAULT_GRADLE_VERSION = SemanticVersion.release(7, 6, 1)
+val DEFAULT_GRADLE_VERSION = SemanticVersion.release(8, 1, 1)
 val GRADLE_VERSION_KEY = Key.create<SemanticVersion>("mcdev.gradleVersion")
 
 fun FixedAssetsNewProjectWizardStep.addGradleWrapperProperties(project: Project) {
Index: src/main/kotlin/platform/architectury/creator/gradle-steps.kt
===================================================================
--- src/main/kotlin/platform/architectury/creator/gradle-steps.kt	(revision 985ce0efb706f2c0168cb166640b673cbf6248d4)
+++ src/main/kotlin/platform/architectury/creator/gradle-steps.kt	(revision 91634e9484ae03fd4457a3db6682bc6a1fa85538)
@@ -26,6 +26,7 @@
 import com.demonwav.mcdev.creator.addTemplates
 import com.demonwav.mcdev.creator.buildsystem.BuildSystemPropertiesStep
 import com.demonwav.mcdev.creator.buildsystem.BuildSystemSupport
+import com.demonwav.mcdev.creator.buildsystem.GRADLE_VERSION_KEY
 import com.demonwav.mcdev.creator.buildsystem.GradleImportStep
 import com.demonwav.mcdev.creator.buildsystem.GradleWrapperStep
 import com.demonwav.mcdev.creator.buildsystem.addGradleWrapperProperties
@@ -63,6 +64,8 @@
     override val description = "Creating Gradle files"
 
     override fun setupAssets(project: Project) {
+        data.putUserData(GRADLE_VERSION_KEY, SemanticVersion.release(7, 6, 1))
+
         val buildSystemProps = findStep<BuildSystemPropertiesStep<*>>()
         val modName = data.getUserData(AbstractModNameStep.KEY) ?: return
         val mcVersion = data.getUserData(ArchitecturyVersionChainStep.MC_VERSION_KEY) ?: return
Index: src/main/kotlin/platform/fabric/creator/gradle-steps.kt
===================================================================
--- src/main/kotlin/platform/fabric/creator/gradle-steps.kt	(revision 985ce0efb706f2c0168cb166640b673cbf6248d4)
+++ src/main/kotlin/platform/fabric/creator/gradle-steps.kt	(revision 91634e9484ae03fd4457a3db6682bc6a1fa85538)
@@ -57,7 +57,7 @@
         val mcVersion = data.getUserData(FabricVersionChainStep.MC_VERSION_KEY) ?: return
         val yarnVersion = data.getUserData(FabricVersionChainStep.YARN_VERSION_KEY) ?: return
         val loaderVersion = data.getUserData(FabricVersionChainStep.LOADER_VERSION_KEY) ?: return
-        val loomVersion = "1.1-SNAPSHOT"
+        val loomVersion = "1.2-SNAPSHOT"
         val javaVersion = findStep<JdkProjectSetupFinalizer>().preferredJdk.ordinal
         val apiVersion = data.getUserData(FabricVersionChainStep.API_VERSION_KEY)
         val officialMappings = data.getUserData(FabricVersionChainStep.OFFICIAL_MAPPINGS_KEY) ?: false
Index: src/main/kotlin/platform/sponge/creator/gradle-steps.kt
===================================================================
--- src/main/kotlin/platform/sponge/creator/gradle-steps.kt	(revision 985ce0efb706f2c0168cb166640b673cbf6248d4)
+++ src/main/kotlin/platform/sponge/creator/gradle-steps.kt	(revision 91634e9484ae03fd4457a3db6682bc6a1fa85538)
@@ -26,7 +26,6 @@
 import com.demonwav.mcdev.creator.addTemplates
 import com.demonwav.mcdev.creator.buildsystem.BuildSystemPropertiesStep
 import com.demonwav.mcdev.creator.buildsystem.BuildSystemSupport
-import com.demonwav.mcdev.creator.buildsystem.GRADLE_VERSION_KEY
 import com.demonwav.mcdev.creator.buildsystem.GradleImportStep
 import com.demonwav.mcdev.creator.buildsystem.GradleWrapperStep
 import com.demonwav.mcdev.creator.buildsystem.ReformatBuildGradleStep
@@ -43,7 +42,6 @@
 import com.demonwav.mcdev.creator.step.NewProjectWizardChainStep.Companion.nextStep
 import com.demonwav.mcdev.creator.step.WebsiteStep
 import com.demonwav.mcdev.util.MinecraftTemplates
-import com.demonwav.mcdev.util.SemanticVersion
 import com.intellij.ide.starters.local.GeneratorEmptyDirectory
 import com.intellij.ide.wizard.NewProjectWizardBaseData
 import com.intellij.ide.wizard.NewProjectWizardStep
@@ -65,8 +63,6 @@
     override val description = "Creating Gradle files"
 
     override fun setupAssets(project: Project) {
-        data.putUserData(GRADLE_VERSION_KEY, SemanticVersion.release(7, 4, 2))
-
         val buildSystemProps = findStep<BuildSystemPropertiesStep<*>>()
         val javaVersion = findStep<JdkProjectSetupFinalizer>().preferredJdk.ordinal
         val spongeVersion = data.getUserData(SpongeApiVersionStep.KEY) ?: return
Index: src/main/resources/fileTemplates/j2ee/sponge/Sponge 8+ build.gradle.kts.ft
===================================================================
--- src/main/resources/fileTemplates/j2ee/sponge/Sponge 8+ build.gradle.kts.ft	(revision 985ce0efb706f2c0168cb166640b673cbf6248d4)
+++ src/main/resources/fileTemplates/j2ee/sponge/Sponge 8+ build.gradle.kts.ft	(revision 91634e9484ae03fd4457a3db6682bc6a1fa85538)
@@ -3,7 +3,7 @@
 
 plugins {
     `java-library`
-    id("org.spongepowered.gradle.plugin") version "2.0.2"
+    id("org.spongepowered.gradle.plugin") version "2.1.1"
 }
 
 group = "${GROUP_ID}"