Skip to content

Commit 98d0f85

Browse files
committed
Update buildscript
- Removed `io.freefair.javadoc-links` as it is not reliable in builds. - Migrated Gradle API artifacts to the Forge maven. - Apply GradleUtils to the project, but declare repositories in a settings.gradle action. - Workaround for https://youtrack.jetbrains.com/issue/IDEA-332061/Gradle-Missing-Code-Completion-Suggestions-for-Settings-Plugins-in-Groovy-DSL
1 parent 42d996a commit 98d0f85

File tree

2 files changed

+23
-17
lines changed

2 files changed

+23
-17
lines changed

build.gradle

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,7 @@ plugins {
55
id 'idea'
66
id 'eclipse'
77
id 'maven-publish'
8-
//id 'io.freefair.javadoc-links'
9-
id 'net.minecraftforge.gradleutils'
8+
alias libs.plugins.gradleutils
109
alias libs.plugins.gitversion
1110
alias libs.plugins.changelog
1211
alias libs.plugins.licenser

settings.gradle

Lines changed: 22 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,34 @@
11
plugins {
22
id 'org.gradle.toolchains.foojay-resolver-convention' version '1.0.0'
3-
id 'io.freefair.javadoc-links' version '8.14' apply false
4-
id 'net.minecraftforge.gradleutils' version '3.3.13'
53
}
64

75
rootProject.name = 'forgegradle'
86

9-
dependencyResolutionManagement {
10-
repositories {
11-
mavenCentral()
12-
gradlePluginPortal()
13-
maven gradleutils.forgeMaven
14-
maven { url = 'https://maven.moddinglegacy.com/maven' } // Gradle API
15-
//mavenLocal()
7+
// Applying plugins causes them to not have any IDE support when also applied to any build.gradle files
8+
// The workaround for now is to use this listener here so that it can stay in settings.gradle
9+
// See: https://youtrack.jetbrains.com/issue/IDEA-332061/Gradle-Missing-Code-Completion-Suggestions-for-Settings-Plugins-in-Groovy-DSL
10+
gradle.beforeProject { Project project ->
11+
project.pluginManager.withPlugin('net.minecraftforge.gradleutils') {
12+
project.repositories {
13+
mavenCentral()
14+
gradlePluginPortal()
15+
maven project.gradleutils.forgeMaven
16+
//mavenLocal()
17+
}
1618
}
19+
}
1720

21+
dependencyResolutionManagement {
1822
//@formatter:off
1923
versionCatalogs.register('libs') {
20-
plugin 'licenser', 'net.minecraftforge.licenser' version '1.2.0' // https://plugins.gradle.org/plugin/net.minecraftforge.licenser
21-
plugin 'gitversion', 'net.minecraftforge.gitversion' version '3.1.1' // https://plugins.gradle.org/plugin/net.minecraftforge.changelog
22-
plugin 'changelog', 'net.minecraftforge.changelog' version '3.1.2' // https://plugins.gradle.org/plugin/net.minecraftforge.changelog
23-
plugin 'plugin-publish', 'com.gradle.plugin-publish' version '2.0.0' // https://plugins.gradle.org/plugin/com.gradle.plugin-publish
24-
plugin 'shadow', 'com.gradleup.shadow' version '9.2.2' // https://plugins.gradle.org/plugin/com.gradleup.shadow
24+
version 'gradleutils', '3.3.18'
25+
26+
plugin 'licenser', 'net.minecraftforge.licenser' version '1.2.0' // https://plugins.gradle.org/plugin/net.minecraftforge.licenser
27+
plugin 'gradleutils', 'net.minecraftforge.gradleutils' versionRef 'gradleutils'
28+
plugin 'gitversion', 'net.minecraftforge.gitversion' version '3.1.1' // https://plugins.gradle.org/plugin/net.minecraftforge.changelog
29+
plugin 'changelog', 'net.minecraftforge.changelog' version '3.1.2' // https://plugins.gradle.org/plugin/net.minecraftforge.changelog
30+
plugin 'plugin-publish', 'com.gradle.plugin-publish' version '2.0.0' // https://plugins.gradle.org/plugin/com.gradle.plugin-publish
31+
plugin 'shadow', 'com.gradleup.shadow' version '9.2.2' // https://plugins.gradle.org/plugin/com.gradleup.shadow
2532

2633
// Static Analysis
2734
library 'nulls', 'org.jetbrains', 'annotations' version '26.0.2'
@@ -33,7 +40,7 @@ dependencyResolutionManagement {
3340
library 'gradle', 'name.remal.gradle-api', 'gradle-api' versionRef 'gradle'
3441

3542
// GradleUtils Shared Base
36-
library 'gradleutils-shared', 'net.minecraftforge', 'gradleutils-shared' version '3.3.13'
43+
library 'gradleutils-shared', 'net.minecraftforge', 'gradleutils-shared' versionRef 'gradleutils'
3744

3845
// AccessTransformers Gradle Plugin
3946
// https://plugins.gradle.org/plugin/net.minecraftforge.accesstransformers

0 commit comments

Comments
 (0)