From ae057df66fce0e1577ad840e9da3a83a44eb5d78 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Thu, 2 Jul 2020 10:39:31 -0500 Subject: [PATCH] Bump version to 1.16, fix maven publishing and clean up gradle more --- build.gradle | 43 ++++++++++++++++++------------------------- build.properties | 2 +- 2 files changed, 19 insertions(+), 26 deletions(-) diff --git a/build.gradle b/build.gradle index df2204eb8..c35ffc8c2 100644 --- a/build.gradle +++ b/build.gradle @@ -18,9 +18,8 @@ plugins { apply plugin: 'net.minecraftforge.gradle' apply plugin: 'eclipse' -apply plugin: 'maven' +apply plugin: 'maven-publish' apply plugin: 'pmd' -// apply plugin: 'com.matthewprenger.cursegradle' ext.configFile = file('build.properties') ext.config = parseConfig(configFile) @@ -256,35 +255,29 @@ def parseConfig(File config) { } } -/* -curseforge { - if(priv == null){ - return - } - apiKey = priv.cfkey - project { - id = "225643" - changelog = """ - See http://botaniamod.net/changelog.php#${version} - """ - releaseType = "release" - addGameVersion "${mc_version}" - relations { - requiredLibrary 'curios' - optionalLibrary 'quark' - optionalLibrary 'albedo' +publishing { + tasks.publish.dependsOn build + publications { + mavenJava(MavenPublication) { + groupId project.group + artifactId project.archivesBaseName + version project.version + from components.java + artifact srcJar + artifact apiJar + pom.withXml { + def node = asNode() + if(node.dependencies.size() > 0) + node.remove(node.dependencies) // Remove deps, as they are all mappings-dependent and/or forge + } } } -} -*/ -uploadArchives { repositories { - mavenDeployer { - repository(url: "file://" + (System.getenv("local_maven") != null ? System.getenv("local_maven") : System.getenv("bamboo_local_maven"))) + maven { + url "file://" + System.getenv("local_maven") } } } -// tasks.uploadArchives.dependsOn reobfJar defaultTasks 'clean', 'checkSyntax', 'build' diff --git a/build.properties b/build.properties index 59389f3c8..4f2ccbbc7 100644 --- a/build.properties +++ b/build.properties @@ -1,6 +1,6 @@ # #Wed Jun 17 08:32:24 CDT 2020 -version=r1.15 +version=r1.16 dir_output=../Build Output/Botania/ dir_repo=./ build_number=387