From b349179d5cae20164ecac1f0df78102788433b4c Mon Sep 17 00:00:00 2001 From: Matyrobbrt Date: Tue, 25 Jun 2024 00:19:01 +0300 Subject: [PATCH 1/3] Bump NeoGradle to fix the patch baking issue --- settings.gradle | 30 +++++++++++++++++++++++++++++- 1 file changed, 29 insertions(+), 1 deletion(-) diff --git a/settings.gradle b/settings.gradle index 589f0b3ad1..9a4ab174e8 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,4 +1,32 @@ pluginManagement { + repositories { + maven { + name 'Maven for PR #217' // https://github.com/neoforged/NeoGradle/pull/217 + url 'https://prmaven.neoforged.net/NeoGradle/pr217' + content { + includeModule('net.neoforged.gradle', 'dsl-platform') + includeModule('net.neoforged.gradle.common', 'net.neoforged.gradle.common.gradle.plugin') + includeModule('net.neoforged.gradle', 'dsl-mixin') + includeModule('net.neoforged.gradle', 'common') + includeModule('net.neoforged.gradle', 'utils') + includeModule('net.neoforged.gradle.neoform', 'net.neoforged.gradle.neoform.gradle.plugin') + includeModule('net.neoforged.gradle', 'userdev') + includeModule('net.neoforged.gradle', 'dsl-neoform') + includeModule('net.neoforged.gradle', 'dsl-vanilla') + includeModule('net.neoforged.gradle', 'dsl-common') + includeModule('net.neoforged.gradle', 'mixin') + includeModule('net.neoforged.gradle.mixin', 'net.neoforged.gradle.mixin.gradle.plugin') + includeModule('net.neoforged.gradle', 'dsl-userdev') + includeModule('net.neoforged.gradle.userdev', 'net.neoforged.gradle.userdev.gradle.plugin') + includeModule('net.neoforged.gradle.platform', 'net.neoforged.gradle.platform.gradle.plugin') + includeModule('net.neoforged.gradle', 'platform') + includeModule('net.neoforged.gradle', 'test-utils') + includeModule('net.neoforged.gradle.vanilla', 'net.neoforged.gradle.vanilla.gradle.plugin') + includeModule('net.neoforged.gradle', 'vanilla') + includeModule('net.neoforged.gradle', 'neoform') + } + } + } repositories { gradlePluginPortal() mavenLocal() @@ -7,7 +35,7 @@ pluginManagement { } plugins { - id 'net.neoforged.gradle.platform' version '7.0.149' + id 'net.neoforged.gradle.platform' version '7.0.151-pr-217-bumpdiffpatch' } rootProject.name = rootDir.name From f190694b44f6d4f0b8677c89c4a614e5940564e4 Mon Sep 17 00:00:00 2001 From: Matyrobbrt <65940752+Matyrobbrt@users.noreply.github.com> Date: Tue, 25 Jun 2024 00:48:30 +0300 Subject: [PATCH 2/3] Update settings.gradle --- settings.gradle | 30 +----------------------------- 1 file changed, 1 insertion(+), 29 deletions(-) diff --git a/settings.gradle b/settings.gradle index 9a4ab174e8..8822b22b8a 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,32 +1,4 @@ pluginManagement { - repositories { - maven { - name 'Maven for PR #217' // https://github.com/neoforged/NeoGradle/pull/217 - url 'https://prmaven.neoforged.net/NeoGradle/pr217' - content { - includeModule('net.neoforged.gradle', 'dsl-platform') - includeModule('net.neoforged.gradle.common', 'net.neoforged.gradle.common.gradle.plugin') - includeModule('net.neoforged.gradle', 'dsl-mixin') - includeModule('net.neoforged.gradle', 'common') - includeModule('net.neoforged.gradle', 'utils') - includeModule('net.neoforged.gradle.neoform', 'net.neoforged.gradle.neoform.gradle.plugin') - includeModule('net.neoforged.gradle', 'userdev') - includeModule('net.neoforged.gradle', 'dsl-neoform') - includeModule('net.neoforged.gradle', 'dsl-vanilla') - includeModule('net.neoforged.gradle', 'dsl-common') - includeModule('net.neoforged.gradle', 'mixin') - includeModule('net.neoforged.gradle.mixin', 'net.neoforged.gradle.mixin.gradle.plugin') - includeModule('net.neoforged.gradle', 'dsl-userdev') - includeModule('net.neoforged.gradle.userdev', 'net.neoforged.gradle.userdev.gradle.plugin') - includeModule('net.neoforged.gradle.platform', 'net.neoforged.gradle.platform.gradle.plugin') - includeModule('net.neoforged.gradle', 'platform') - includeModule('net.neoforged.gradle', 'test-utils') - includeModule('net.neoforged.gradle.vanilla', 'net.neoforged.gradle.vanilla.gradle.plugin') - includeModule('net.neoforged.gradle', 'vanilla') - includeModule('net.neoforged.gradle', 'neoform') - } - } - } repositories { gradlePluginPortal() mavenLocal() @@ -35,7 +7,7 @@ pluginManagement { } plugins { - id 'net.neoforged.gradle.platform' version '7.0.151-pr-217-bumpdiffpatch' + id 'net.neoforged.gradle.platform' version '7.0.151' } rootProject.name = rootDir.name From 2ac6c38990415c25e3a72ab6d80fde86baa4ef56 Mon Sep 17 00:00:00 2001 From: Matyrobbrt <65940752+Matyrobbrt@users.noreply.github.com> Date: Tue, 25 Jun 2024 00:51:31 +0300 Subject: [PATCH 3/3] Update settings.gradle --- settings.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/settings.gradle b/settings.gradle index 8822b22b8a..33563e5350 100644 --- a/settings.gradle +++ b/settings.gradle @@ -7,7 +7,7 @@ pluginManagement { } plugins { - id 'net.neoforged.gradle.platform' version '7.0.151' + id 'net.neoforged.gradle.platform' version '7.0.150' } rootProject.name = rootDir.name