From 6f6cee9674208bd2958d7b8417e1b38eddb2d09d Mon Sep 17 00:00:00 2001 From: Mumfrey Date: Fri, 10 Jan 2020 20:56:46 +0000 Subject: [PATCH] Mixin 0.8 RELEASE --- build.gradle | 106 ++++++++++++++++++++++++---------------------- gradle.properties | 2 +- 2 files changed, 56 insertions(+), 52 deletions(-) diff --git a/build.gradle b/build.gradle index 91a8252b0..0e6445545 100644 --- a/build.gradle +++ b/build.gradle @@ -366,66 +366,70 @@ ext.excludePomDeps = [ 'gson', ] -uploadArchives { - repositories { +ext.mavenPom = { + groupId = project.group + version = project.version + artifactId = project.archivesBaseName + project { + name project.archivesBaseName + packaging project.packaging + description project.projectName + url 'http://www.spongepowered.org/' + + scm { + url 'https://github.com/SpongePowered/Mixin' + connection 'scm:git:git://github.com/SpongePowered/Mixin.git' + developerConnection 'scm:git:git@github.com:SpongePowered/Mixin.git' + } - mavenDeployer { - configuration = configurations.deployerJars + issueManagement { + system 'GitHub Issues' + url 'https://github.com/SpongePowered/Mixin/issues' + } + + licenses { + license { + name 'MIT license' + url 'http://opensource.org/licenses/MIT' + distribution 'repo' + } + } + } + whenConfigured { + dependencies = dependencies.findAll { + !it.artifactId.matches(excludePomDeps.join('|')) + } + } +} - if (buildType == 'RELEASE' && project.hasProperty("releaseRepo")) { +uploadArchives { + repositories { + // Push releases to release repo + if (buildType == 'RELEASE' && project.hasProperty("releaseRepo")) { + mavenDeployer { + name = "release" + configuration = configurations.deployerJars + pom mavenPom repository(url: project.releaseRepo) { authentication(userName: project.releaseRepoUsername, password: project.releaseRepoPassword) } - } else if (buildType == 'SNAPSHOT' && project.hasProperty("snapshotRepo")) { - repository(url: project.snapshotRepo) { - authentication(userName: project.snapshotRepoUsername, password: project.snapshotRepoPassword) - } } - - pom { - groupId = project.group - version = project.version - artifactId = project.archivesBaseName - project { - name project.archivesBaseName - packaging project.packaging - description project.projectName - url 'http://www.spongepowered.org/' - - scm { - url 'https://github.com/SpongePowered/Mixin' - connection 'scm:git:git://github.com/SpongePowered/Mixin.git' - developerConnection 'scm:git:git@github.com:SpongePowered/Mixin.git' - } - - issueManagement { - system 'GitHub Issues' - url 'https://github.com/SpongePowered/Mixin/issues' - } - - licenses { - license { - name 'MIT license' - url 'http://opensource.org/licenses/MIT' - distribution 'repo' - } - } - } - whenConfigured { - dependencies = dependencies.findAll { - !it.artifactId.matches(excludePomDeps.join('|')) - } + } + + // Push everything to sponge repo + if (project.hasProperty("spongeRepo")) { + mavenDeployer { + name = "sponge" + configuration = configurations.deployerJars + pom mavenPom + repository(url: project.spongeRepo) { + authentication(userName: project.spongeUsername, password: project.spongePassword) } } } } } -install.repositories.mavenInstaller.pom { - whenConfigured { - dependencies = dependencies.findAll { - !it.artifactId.matches(excludePomDeps.join('|')) - } - } -} - \ No newline at end of file +install.repositories.mavenInstaller { + pom mavenPom +} \ No newline at end of file diff --git a/gradle.properties b/gradle.properties index fa2b8b0e4..c8bf6003c 100644 --- a/gradle.properties +++ b/gradle.properties @@ -5,7 +5,7 @@ description=Mixin url=https://www.spongepowered.org organization=SpongePowered buildVersion=0.8 -buildType=SNAPSHOT +buildType=RELEASE asmVersion=6.2 legacyForgeAsmVersion=5.0.3 modlauncherAsmVersion=6.2