Delete old Gradle files and resolve deprecation warning
This commit is contained in:
embeddedt
parent
f06fb8c32e
commit
8cc41fa222
|
|
@ -1,3 +0,0 @@
|
||||||
plugins {
|
|
||||||
id 'groovy-gradle-plugin'
|
|
||||||
}
|
|
||||||
|
|
@ -1,127 +0,0 @@
|
||||||
plugins {
|
|
||||||
id 'java'
|
|
||||||
id 'architectury-plugin'
|
|
||||||
id 'maven-publish'
|
|
||||||
id 'com.diffplug.spotless'
|
|
||||||
}
|
|
||||||
|
|
||||||
spotless {
|
|
||||||
java {
|
|
||||||
removeUnusedImports()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
architectury {
|
|
||||||
compileOnly()
|
|
||||||
}
|
|
||||||
|
|
||||||
group = 'org.embeddedt'
|
|
||||||
// extract base version from tag, generate other metadata ourselves
|
|
||||||
def details = versionDetails()
|
|
||||||
def plusIndex = details.lastTag.indexOf("+")
|
|
||||||
if(plusIndex == -1) {
|
|
||||||
plusIndex = details.lastTag.length()
|
|
||||||
}
|
|
||||||
def baseVersion = details.lastTag.substring(0, plusIndex)
|
|
||||||
def dirtyMarker = grgit.status().clean ? "" : ".dirty"
|
|
||||||
def commitHashMarker = details.commitDistance > 0 ? ("." + details.gitHash.substring(0, Math.min(4, details.gitHash.length()))) : ""
|
|
||||||
def preMarker = (details.commitDistance > 0 || !details.isCleanTag) ? ("-beta." + details.commitDistance) : ""
|
|
||||||
if(preMarker.length() > 0) {
|
|
||||||
// bump to next patch release
|
|
||||||
def versionParts = baseVersion.tokenize(".")
|
|
||||||
baseVersion = "${versionParts[0]}.${versionParts[1]}.${versionParts[2].toInteger() + 1}"
|
|
||||||
}
|
|
||||||
def versionString = "${baseVersion}${preMarker}+mc${minecraft_version}${commitHashMarker}${dirtyMarker}"
|
|
||||||
version = versionString
|
|
||||||
archivesBaseName = rootProject.archives_base_name + '-' + project.name
|
|
||||||
|
|
||||||
sourceCompatibility = targetCompatibility = JavaVersion.VERSION_17
|
|
||||||
|
|
||||||
repositories {
|
|
||||||
exclusiveContent {
|
|
||||||
forRepository {
|
|
||||||
maven {
|
|
||||||
url "https://modmaven.dev"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
filter {
|
|
||||||
includeGroup "appeng"
|
|
||||||
includeGroup "vazkii.patchouli"
|
|
||||||
includeGroup "mezz.jei"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
exclusiveContent {
|
|
||||||
forRepository {
|
|
||||||
maven {
|
|
||||||
url "https://cursemaven.com"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
filter {
|
|
||||||
includeGroup "curse.maven"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
exclusiveContent {
|
|
||||||
forRepository {
|
|
||||||
maven {
|
|
||||||
name = 'ParchmentMC'
|
|
||||||
url = 'https://maven.parchmentmc.org'
|
|
||||||
}
|
|
||||||
}
|
|
||||||
filter {
|
|
||||||
includeGroup "org.parchmentmc.data"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
exclusiveContent {
|
|
||||||
forRepository {
|
|
||||||
maven {
|
|
||||||
url = 'https://maven.architectury.dev'
|
|
||||||
}
|
|
||||||
}
|
|
||||||
filter {
|
|
||||||
includeGroup "me.shedaniel"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
exclusiveContent {
|
|
||||||
forRepository {
|
|
||||||
maven {
|
|
||||||
url = 'https://maven.latvian.dev/releases'
|
|
||||||
}
|
|
||||||
}
|
|
||||||
filter {
|
|
||||||
includeGroup "dev.latvian.mods"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
exclusiveContent {
|
|
||||||
forRepository {
|
|
||||||
maven {
|
|
||||||
name = "Fuzs Mod Resources"
|
|
||||||
url = "https://raw.githubusercontent.com/Fuzss/modresources/main/maven/"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
filter {
|
|
||||||
includeGroup "fuzs"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
exclusiveContent {
|
|
||||||
forRepository {
|
|
||||||
maven {
|
|
||||||
name = "Fabric maven"
|
|
||||||
url = "https://maven.fabricmc.net/"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
filter {
|
|
||||||
includeGroup "net.fabricmc"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
exclusiveContent {
|
|
||||||
forRepository {
|
|
||||||
maven {
|
|
||||||
name = "Mod Menu"
|
|
||||||
url = "https://maven.terraformersmc.com/releases/"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
filter {
|
|
||||||
includeGroup "com.terraformersmc"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
@ -1,42 +0,0 @@
|
||||||
plugins {
|
|
||||||
id 'modernfix.common-conventions'
|
|
||||||
id 'dev.architectury.loom'
|
|
||||||
}
|
|
||||||
|
|
||||||
loom {
|
|
||||||
silentMojangMappingsLicense()
|
|
||||||
accessWidenerPath = file("${rootDir}/common/src/main/resources/modernfix.accesswidener")
|
|
||||||
mixin {
|
|
||||||
useLegacyMixinAp = true
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
dependencies {
|
|
||||||
minecraft "com.mojang:minecraft:${rootProject.minecraft_version}"
|
|
||||||
mappings loom.layered() {
|
|
||||||
officialMojangMappings()
|
|
||||||
if(rootProject.hasProperty("parchment_version")) {
|
|
||||||
parchment("org.parchmentmc.data:parchment-${minecraft_version}:${parchment_version}@zip")
|
|
||||||
}
|
|
||||||
}
|
|
||||||
implementation project(":annotations")
|
|
||||||
annotationProcessor project(path: ":annotation-processor", configuration: 'shadow')
|
|
||||||
}
|
|
||||||
|
|
||||||
project.sourceSets {
|
|
||||||
main.resources.srcDirs += [layout.buildDirectory.dir("generated/sources/annotationProcessor/java/main/resources")]
|
|
||||||
}
|
|
||||||
// hack to shut up gradle about the hack to include generated resources
|
|
||||||
tasks {
|
|
||||||
processResources {
|
|
||||||
dependsOn compileJava
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
tasks.withType(JavaCompile) {
|
|
||||||
configure(options) {
|
|
||||||
if (!name.toLowerCase().contains('test')) {
|
|
||||||
options.compilerArgs << "-ArootProject.name=${rootProject.name}" << "-Aproject.name=${project.name}"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
@ -1,69 +0,0 @@
|
||||||
plugins {
|
|
||||||
id 'com.matthewprenger.cursegradle'
|
|
||||||
id 'com.modrinth.minotaur'
|
|
||||||
}
|
|
||||||
|
|
||||||
loom {
|
|
||||||
mods {
|
|
||||||
main { // to match the default mod generated for Forge
|
|
||||||
sourceSet project.sourceSets.main
|
|
||||||
sourceSet project(':common').sourceSets.main
|
|
||||||
}
|
|
||||||
}
|
|
||||||
runs {
|
|
||||||
client {
|
|
||||||
vmArgs "-Xmx1G"
|
|
||||||
vmArgs "-Xms1G"
|
|
||||||
property("mixin.debug.export", "true")
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
def copyJarNameConsistent = tasks.register('copyJarNameConsistent', Copy) {
|
|
||||||
from remapJar // shortcut for createJar.outputs.files
|
|
||||||
into project.file("build/libs")
|
|
||||||
rename { name -> "modernfix-" + project.name + "-latest.jar" }
|
|
||||||
}
|
|
||||||
|
|
||||||
def copyJarToBin = tasks.register('copyJarToBin', Copy) {
|
|
||||||
from remapJar // shortcut for createJar.outputs.files
|
|
||||||
into rootProject.file("bin")
|
|
||||||
mustRunAfter "copyJarNameConsistent"
|
|
||||||
}
|
|
||||||
|
|
||||||
tasks.build.dependsOn(copyJarToBin, copyJarNameConsistent)
|
|
||||||
|
|
||||||
def isBeta = project.version.toString().contains("beta")
|
|
||||||
|
|
||||||
curseforge {
|
|
||||||
if (System.getenv("CURSEFORGE_TOKEN") != null) {
|
|
||||||
apiKey = System.getenv("CURSEFORGE_TOKEN")
|
|
||||||
project {
|
|
||||||
id = "790626"
|
|
||||||
changelog = file("${rootDir}/CHANGELOG.md")
|
|
||||||
changelogType = "markdown"
|
|
||||||
releaseType = isBeta ? "beta" : "release"
|
|
||||||
addGameVersion project.name.capitalize()
|
|
||||||
gameVersionStrings.addAll(supported_minecraft_versions.tokenize(","))
|
|
||||||
mainArtifact remapJar
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
modrinth {
|
|
||||||
token = System.getenv("MODRINTH_TOKEN")
|
|
||||||
projectId = "modernfix" // This can be the project ID or the slug. Either will work!
|
|
||||||
versionType = isBeta ? "beta" : "release" // This is the default -- can also be `beta` or `alpha`
|
|
||||||
uploadFile = remapJar
|
|
||||||
gameVersions = supported_minecraft_versions.tokenize(",")
|
|
||||||
loaders = [project.name]
|
|
||||||
changelog.set(provider { file("${rootDir}/CHANGELOG.md").getText('UTF-8') })
|
|
||||||
}
|
|
||||||
|
|
||||||
tasks.curseforge.dependsOn(rootProject.generateChangelog)
|
|
||||||
tasks.modrinth.dependsOn(rootProject.generateChangelog)
|
|
||||||
|
|
||||||
tasks.register('publishToModSites') {
|
|
||||||
publishToModSites.dependsOn(tasks.modrinth)
|
|
||||||
publishToModSites.dependsOn(tasks.curseforge)
|
|
||||||
}
|
|
||||||
|
|
@ -1,54 +0,0 @@
|
||||||
plugins {
|
|
||||||
id "modernfix.mod-common-conventions"
|
|
||||||
}
|
|
||||||
|
|
||||||
architectury {
|
|
||||||
common(rootProject.enabled_platforms.split(","))
|
|
||||||
}
|
|
||||||
|
|
||||||
ext.jei_minecraft_version = "1.20.1" /* temporary, till 1.20 releases */
|
|
||||||
|
|
||||||
dependencies {
|
|
||||||
// We depend on fabric loader here to use the fabric @Environment annotations and get the mixin dependencies
|
|
||||||
// Do NOT use other classes from fabric loader
|
|
||||||
modImplementation "net.fabricmc:fabric-loader:${rootProject.fabric_loader_version}"
|
|
||||||
implementation(annotationProcessor("io.github.llamalad7:mixinextras-common:${rootProject.mixinextras_version}"))
|
|
||||||
|
|
||||||
modCompileOnly("dev.latvian.mods:kubejs:${kubejs_version}") {
|
|
||||||
transitive = false
|
|
||||||
}
|
|
||||||
modApi("dev.latvian.mods:rhino:${rhino_version}") {
|
|
||||||
transitive = false
|
|
||||||
}
|
|
||||||
modApi("me.shedaniel:RoughlyEnoughItems-api:${rei_version}") {
|
|
||||||
transitive = false
|
|
||||||
}
|
|
||||||
modCompileOnly("me.shedaniel:RoughlyEnoughItems-fabric:${rei_version}") {
|
|
||||||
transitive = false
|
|
||||||
}
|
|
||||||
|
|
||||||
modCompileOnly "curse.maven:spark-361579:${rootProject.spark_version}"
|
|
||||||
// compile against the JEI API but do not include it at runtime
|
|
||||||
modCompileOnly("mezz.jei:jei-${jei_minecraft_version}-common:${jei_version}")
|
|
||||||
modCompileOnly("mezz.jei:jei-${jei_minecraft_version}-gui:${jei_version}")
|
|
||||||
modCompileOnly("mezz.jei:jei-${jei_minecraft_version}-lib:${jei_version}")
|
|
||||||
// Remove the next line if you don't want to depend on the API
|
|
||||||
// modApi "me.shedaniel:architectury:${rootProject.architectury_version}"
|
|
||||||
}
|
|
||||||
|
|
||||||
// don't need remapped common jar
|
|
||||||
tasks.named('remapJar') { enabled = false }
|
|
||||||
|
|
||||||
publishing {
|
|
||||||
publications {
|
|
||||||
mavenCommon(MavenPublication) {
|
|
||||||
artifactId = rootProject.archives_base_name
|
|
||||||
from components.java
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// See https://docs.gradle.org/current/userguide/publishing_maven.html for information on how to set up publishing.
|
|
||||||
repositories {
|
|
||||||
// Add repositories to publish to here.
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
@ -1,137 +0,0 @@
|
||||||
plugins {
|
|
||||||
id "com.github.johnrengelman.shadow"
|
|
||||||
id "modernfix.mod-common-conventions"
|
|
||||||
id "modernfix.platform-conventions"
|
|
||||||
}
|
|
||||||
|
|
||||||
architectury {
|
|
||||||
platformSetupLoomIde()
|
|
||||||
forge()
|
|
||||||
}
|
|
||||||
|
|
||||||
loom {
|
|
||||||
forge {
|
|
||||||
convertAccessWideners = true
|
|
||||||
extraAccessWideners.add loom.accessWidenerPath.get().asFile.name
|
|
||||||
|
|
||||||
mixinConfig "modernfix-common.mixins.json"
|
|
||||||
mixinConfig "modernfix-forge.mixins.json"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
configurations {
|
|
||||||
common
|
|
||||||
shadowCommon // Don't use shadow from the shadow plugin since it *excludes* files.
|
|
||||||
compileClasspath.extendsFrom common
|
|
||||||
runtimeClasspath.extendsFrom common
|
|
||||||
}
|
|
||||||
|
|
||||||
def extraModsDir = "extra-mods"
|
|
||||||
|
|
||||||
repositories {
|
|
||||||
exclusiveContent {
|
|
||||||
forRepository {
|
|
||||||
flatDir {
|
|
||||||
name "extra-mods"
|
|
||||||
dir file(extraModsDir)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
filter {
|
|
||||||
includeGroup "extra-mods"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
dependencies {
|
|
||||||
forge "net.minecraftforge:forge:${rootProject.forge_version}"
|
|
||||||
implementation(annotationProcessor("io.github.llamalad7:mixinextras-common:${rootProject.mixinextras_version}"))
|
|
||||||
implementation(include("io.github.llamalad7:mixinextras-forge:${rootProject.mixinextras_version}"))
|
|
||||||
// Remove the next line if you don't want to depend on the API
|
|
||||||
// modApi "me.shedaniel:architectury-forge:${rootProject.architectury_version}"
|
|
||||||
|
|
||||||
modCompileOnly("curse.maven:refinedstorage-243076:${refined_storage_version}")
|
|
||||||
|
|
||||||
modCompileOnly("curse.maven:jeresources-240630:3951643")
|
|
||||||
modCompileOnly("me.shedaniel:RoughlyEnoughItems-forge:${rei_version}") { transitive false }
|
|
||||||
modCompileOnly("dev.latvian.mods:kubejs-forge:${kubejs_version}")
|
|
||||||
//modRuntimeOnly("curse.maven:ferritecore-429235:4441949")
|
|
||||||
modCompileOnly("curse.maven:ctm-267602:${ctm_version}")
|
|
||||||
modCompileOnly("curse.maven:ldlib-626676:${ldlib_version}")
|
|
||||||
|
|
||||||
modCompileOnly("curse.maven:supermartijncore-454372:4455391")
|
|
||||||
modCompileOnly("vazkii.patchouli:Patchouli:1.19.2-77")
|
|
||||||
modCompileOnly("curse.maven:cofhcore-69162:5374122")
|
|
||||||
modCompileOnly("curse.maven:resourcefullib-570073:5659871")
|
|
||||||
|
|
||||||
// runtime remapping at home
|
|
||||||
for (extraModJar in fileTree(dir: extraModsDir, include: '*.jar')) {
|
|
||||||
def basename = extraModJar.name.substring(0, extraModJar.name.length() - ".jar".length())
|
|
||||||
def versionSep = basename.lastIndexOf('-')
|
|
||||||
assert versionSep != -1
|
|
||||||
def artifactId = basename.substring(0, versionSep)
|
|
||||||
def version = basename.substring(versionSep + 1)
|
|
||||||
modRuntimeOnly("extra-mods:$artifactId:$version")
|
|
||||||
}
|
|
||||||
|
|
||||||
common(project(path: ":common", configuration: "namedElements")) { transitive false }
|
|
||||||
shadowCommon(project(path: ":common", configuration: "transformProductionForge")) { transitive = false }
|
|
||||||
shadowCommon(project(path: ":annotations"))
|
|
||||||
forgeRuntimeLibrary(project(path: ":annotations"))
|
|
||||||
}
|
|
||||||
|
|
||||||
processResources {
|
|
||||||
inputs.property "version", project.version
|
|
||||||
|
|
||||||
filesMatching("META-INF/mods.toml") {
|
|
||||||
expand "version": project.version
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
shadowJar {
|
|
||||||
exclude "fabric.mod.json"
|
|
||||||
exclude "architectury.common.json"
|
|
||||||
|
|
||||||
configurations = [project.configurations.shadowCommon]
|
|
||||||
archiveClassifier.set("dev-shadow")
|
|
||||||
}
|
|
||||||
|
|
||||||
remapJar {
|
|
||||||
input.set shadowJar.archiveFile
|
|
||||||
dependsOn shadowJar
|
|
||||||
archiveClassifier.set(null)
|
|
||||||
}
|
|
||||||
|
|
||||||
jar {
|
|
||||||
archiveClassifier.set("dev")
|
|
||||||
manifest {
|
|
||||||
attributes([
|
|
||||||
"Specification-Title" : "modernfix",
|
|
||||||
"Operative-Class" : "org.embeddedt.modernfix.agent.Agent",
|
|
||||||
//"Specification-Vendor": "modernfix authors",
|
|
||||||
"Specification-Version" : "1", // We are version 1 of ourselves
|
|
||||||
"Implementation-Title" : project.name,
|
|
||||||
"Implementation-Version" : project.jar.archiveVersion
|
|
||||||
//"Implementation-Vendor": "modernfix authors",
|
|
||||||
])
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
components.java {
|
|
||||||
withVariantsFromConfiguration(project.configurations.shadowRuntimeElements) {
|
|
||||||
skip()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
publishing {
|
|
||||||
publications {
|
|
||||||
mavenForge(MavenPublication) {
|
|
||||||
artifactId = rootProject.archives_base_name + "-" + project.name
|
|
||||||
from components.java
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// See https://docs.gradle.org/current/userguide/publishing_maven.html for information on how to set up publishing.
|
|
||||||
repositories {
|
|
||||||
// Add repositories to publish to here.
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
@ -1 +0,0 @@
|
||||||
loom.platform=forge
|
|
||||||
|
|
@ -1,4 +1,8 @@
|
||||||
include("annotation-processor")
|
include("annotation-processor")
|
||||||
include("annotations")
|
include("annotations")
|
||||||
|
|
||||||
|
plugins {
|
||||||
|
id("org.gradle.toolchains.foojay-resolver-convention") version ("1.0.0")
|
||||||
|
}
|
||||||
|
|
||||||
rootProject.name = "modernfix"
|
rootProject.name = "modernfix"
|
||||||
Loading…
Reference in New Issue
Block a user