diff --git a/.github/workflows/matrix_includes.json b/.github/workflows/matrix_includes.json index 97111864..2969e3c5 100644 --- a/.github/workflows/matrix_includes.json +++ b/.github/workflows/matrix_includes.json @@ -1,4 +1,8 @@ [ + { + "branch": "1.14.4", + "cf_game_versions": "modloader:fabric,minecraft-1-14:1.14.4" + }, { "branch": "1.15.2", "cf_game_versions": "modloader:fabric,minecraft-1-15:1.15.2" diff --git a/build.gradle b/build.gradle index e3247f40..7b5b10f7 100644 --- a/build.gradle +++ b/build.gradle @@ -19,8 +19,18 @@ repositories { sourceCompatibility = JavaVersion.VERSION_1_8 targetCompatibility = JavaVersion.VERSION_1_8 +String versionSuffix = '' +if (System.getenv("BUILD_RELEASE") != "true") { + versionSuffix += '-SHAPSHOT' +} +String buildNumber = System.getenv("BUILD_ID") +if (buildNumber != null) { + versionSuffix += '+build.' + buildNumber +} +String fullModVersion = project.mod_version + versionSuffix + archivesBaseName = project.archives_base_name -version = 'mc' + project.minecraft_version + '-v' + project.mod_version +version = 'mc' + project.minecraft_version + '-v' + fullModVersion group = project.maven_group dependencies { @@ -40,7 +50,7 @@ dependencies { // https://www.curseforge.com/minecraft/mc-mods/item-scroller/files modImplementation "curse.maven:item-scroller-242064:2880360" // itemscroller-fabric-1.15.2-0.15.0-dev.20200212.183513.jar - // https://www.curseforge.com/minecraft/mc-mods/litematica/files/2957593 + // https://www.curseforge.com/minecraft/mc-mods/litematica/files modImplementation "curse.maven:litematica-308892:2957593" // litematica-fabric-1.15.2-0.0.0-dev.20200515.184506.jar @@ -52,10 +62,10 @@ dependencies { } processResources { - inputs.property "version", project.version + inputs.property "version", fullModVersion filesMatching("fabric.mod.json") { - expand "version": project.mod_version + expand "version": fullModVersion } }