Declare our old artifact name and update some dependencies

MinecraftForge · Mar 18, 2024 · df858a5 · df858a5
1 parent 663cfc0
commit df858a5
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 11 deletions.
diff --git a/build.gradle b/build.gradle
@@ -1,13 +1,13 @@
 import net.minecraftforge.gradleutils.PomUtils
 
 plugins {
- id 'org.cadixdev.licenser' version '0.6.1'
  id 'java-library'
  id 'eclipse'
- id 'net.minecraftforge.gradleutils' version '2.+'
+ id 'maven-publish'
+ id 'net.minecraftforge.gradleutils' version '[2.3,2.4)'
+ id 'net.minecraftforge.licenser' version '1.0.1'
  id 'org.gradlex.extra-java-module-info' version '1.5'
  id 'com.github.ben-manes.versions' version '0.49.0'
- id 'maven-publish'
 }
 
 java {
@@ -38,6 +38,14 @@ dependencies {
  annotationProcessor(libs.log4j.core)
 }
 
+configurations.all {
+ outgoing {
+ capability("net.minecraftforge:modlauncher:$version")
+ capability("net.minecraftforge:ModLauncher:$version") // Stupid case sensitivity when using project deps
+ capability("cpw.mods:modlauncher:$version")
+ }
+}
+
 extraJavaModuleInfo {
  failOnMissingModuleInfo = false
  automaticModule('net.sf.jopt-simple:jopt-simple', 'jopt.simple')
@@ -84,6 +92,9 @@ compileJava {
 
 publishing {
  publications.register('mavenJava', MavenPublication) {
+ configurations.all {
+ suppressPomMetadataWarningsFor(it.name)
+ }
  from components.java
  artifactId = 'modlauncher'
  pom {

diff --git a/ml-jmh/build.gradle b/ml-jmh/build.gradle
@@ -1,10 +1,10 @@
 plugins {
- id 'org.cadixdev.licenser' version '0.6.1'
  id 'eclipse'
  id 'java-library'
  id 'org.gradlex.extra-java-module-info' version '1.5'
  id 'com.github.ben-manes.versions' version '0.49.0'
- id 'net.minecraftforge.gradleutils' version '2.+'
+ id 'net.minecraftforge.gradleutils' version '[2.3,2.4)'
+ id 'net.minecraftforge.licenser' version '1.0.1'
  id 'com.diffplug.eclipse.apt' version '3.43.0'
 }
 
@@ -20,6 +20,7 @@ java {
 license {
  header = rootProject.file("LICENSE-header.txt")
 }
+
 dependencies {
  implementation(rootProject)
  implementation(libs.securemodules)

diff --git a/ml-test-jar/build.gradle b/ml-test-jar/build.gradle
@@ -1,8 +1,8 @@
 plugins {
- id 'org.cadixdev.licenser' version '0.6.1'
  id 'eclipse'
  id 'java-library'
- id 'net.minecraftforge.gradleutils' version '2.+'
+ id 'net.minecraftforge.gradleutils' version '[2.3,2.4)'
+ id 'net.minecraftforge.licenser' version '1.0.1'
 }
 
 repositories {

diff --git a/ml-test/build.gradle b/ml-test/build.gradle
@@ -1,10 +1,10 @@
 plugins {
- id 'org.cadixdev.licenser' version '0.6.1'
  id 'java-library'
  id 'eclipse'
  id 'org.gradlex.extra-java-module-info' version '1.5'
  id 'com.github.ben-manes.versions' version '0.49.0'
- id 'net.minecraftforge.gradleutils' version '2.+'
+ id 'net.minecraftforge.gradleutils' version '[2.3,2.4)'
+ id 'net.minecraftforge.licenser' version '1.0.1'
 }
 
 repositories {

diff --git a/settings.gradle b/settings.gradle
@@ -26,7 +26,7 @@ dependencyResolutionManagement {
 
  library('nulls', 'org.jetbrains:annotations:23.0.0')
  library('unsafe', 'net.minecraftforge:unsafe:0.9.2')
- library('securemodules', 'net.minecraftforge:securemodules:2.2.6')
+ library('securemodules', 'net.minecraftforge:securemodules:2.2.13')
  library('jopt-simple', 'net.sf.jopt-simple:jopt-simple:5.0.4')
  library('bootstrap-api', 'net.minecraftforge:bootstrap-api:2.0.0')
 
@@ -39,7 +39,7 @@ dependencyResolutionManagement {
  library('powermock-core', 'org.powermock', 'powermock-core').versionRef('powermock')
  library('powermock-reflect', 'org.powermock', 'powermock-reflect').versionRef('powermock')
  bundle('powermock', ['powermock-core', 'powermock-reflect'])
- 
+
  version('jmh', '1.37')
  library('jmh-core', 'org.openjdk.jmh', 'jmh-core').versionRef('jmh')
  library('jmh-ap', 'org.openjdk.jmh', 'jmh-generator-annprocess').versionRef('jmh')