Update example maven version to 1.18.2 and use a variable to specify …

…java version so that we can easily mark it on curseforge as cursegradle doesn't support auto-detecting modern java versions
mekanism · Apr 10, 2022 · b7917fb · b7917fb
1 parent 436dbf2
commit b7917fb
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 3 deletions.
diff --git a/README.md b/README.md
@@ -59,7 +59,7 @@ dependencies {
 Add the following to your `gradle.properties` file (see [Maven](https://modmaven.dev/mekanism/Mekanism/) for the list of available versions):
 
 ```properties
-mekanism_version=1.16.5-10.1.0.455
+mekanism_version=1.18.2-10.2.0.459
 ```
 
 # Credits #

diff --git a/annotation-processor/build.gradle b/annotation-processor/build.gradle
@@ -4,7 +4,7 @@ plugins {
 
 group 'mekanism.annotation-processor'
 version '1.1.1'
-java.toolchain.languageVersion = JavaLanguageVersion.of(17)
+java.toolchain.languageVersion = JavaLanguageVersion.of("${java_version}")
 
 repositories {
     maven {

diff --git a/build.gradle b/build.gradle
@@ -192,7 +192,7 @@ def createReplaceResourcesTask(String output, SourceSet sourceSet) {
 group = "mekanism"
 version = "${minecraft_version}-${mod_version}." + (System.env.BUILD_NUMBER ?: "homebaked")
 archivesBaseName = "Mekanism"
-java.toolchain.languageVersion = JavaLanguageVersion.of(17)
+java.toolchain.languageVersion = JavaLanguageVersion.of("${java_version}")
 
 minecraft {
     mappings channel: "${mappings_channel}", version: "${mappings_version}"
@@ -848,6 +848,7 @@ if (System.getenv("CURSEFORGE_KEY") != null || project.hasProperty('curseforgeKe
                 }
             }
             addArtifact apiJar
+            addGameVersion "Java ${java_version}"
             addGameVersion "${minecraft_version}"
         }
 
@@ -862,6 +863,7 @@ if (System.getenv("CURSEFORGE_KEY") != null || project.hasProperty('curseforgeKe
                     requiredDependency "mekanism"
                 }
             }
+            addGameVersion "Java ${java_version}"
             addGameVersion "${minecraft_version}"
         }
 
@@ -876,6 +878,7 @@ if (System.getenv("CURSEFORGE_KEY") != null || project.hasProperty('curseforgeKe
                     requiredDependency "mekanism"
                 }
             }
+            addGameVersion "Java ${java_version}"
             addGameVersion "${minecraft_version}"
         }*/
 
@@ -890,6 +893,7 @@ if (System.getenv("CURSEFORGE_KEY") != null || project.hasProperty('curseforgeKe
                     requiredDependency "mekanism"
                 }
             }
+            addGameVersion "Java ${java_version}"
             addGameVersion "${minecraft_version}"
         }
 
@@ -904,6 +908,7 @@ if (System.getenv("CURSEFORGE_KEY") != null || project.hasProperty('curseforgeKe
                     requiredDependency "mekanism"
                 }
             }
+            addGameVersion "Java ${java_version}"
             addGameVersion "${minecraft_version}"
         }
     }

diff --git a/gradle.properties b/gradle.properties
@@ -2,6 +2,7 @@
 # This is required to provide enough memory for the Minecraft decompilation process.
 org.gradle.jvmargs=-Xmx3G
 
+java_version=17
 minecraft_version=1.18.2
 mappings_version=2022.03.13-1.18.2
 mappings_channel=parchment