Skip to content

Commit ad63e2f

Browse files
committed
Merge pull request #282 from kashike/feature/banner/2.0
Improve the displayed banner
2 parents 297c851 + c7681b4 commit ad63e2f

File tree

2 files changed

+19
-8
lines changed

2 files changed

+19
-8
lines changed

build.gradle

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -128,6 +128,7 @@ jar {
128128
attributes 'version':project.version
129129
attributes 'javaCompliance': project.targetCompatibility
130130
attributes 'group':project.group
131+
attributes 'Implementation-Version': project.version + getGitHash()
131132
}
132133
}
133134

@@ -280,3 +281,9 @@ uploadArchives {
280281
// write out version so its convenient for doc deployment
281282
file('build').mkdirs()
282283
file('build/version.txt').text = version;
284+
285+
def getGitHash() {
286+
def process = 'git rev-parse --short HEAD'.execute()
287+
process.waitFor()
288+
return '-' + (process.exitValue() ? 'unknown' : process.text.trim())
289+
}

src/main/java/net/minecraftforge/gradle/common/BasePlugin.java

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@
4040
import org.gradle.api.artifacts.dsl.DependencyHandler;
4141
import org.gradle.api.artifacts.repositories.FlatDirectoryArtifactRepository;
4242
import org.gradle.api.artifacts.repositories.MavenArtifactRepository;
43+
import org.gradle.api.logging.Logger;
4344
import org.gradle.api.plugins.ExtraPropertiesExtension;
4445
import org.gradle.api.tasks.Delete;
4546
import org.gradle.testfixtures.ProjectBuilder;
@@ -236,16 +237,19 @@ protected void afterEvaluate()
236237
if (!displayBanner)
237238
return;
238239

239-
project.getLogger().lifecycle("****************************");
240-
project.getLogger().lifecycle(" Powered By MCP: ");
241-
project.getLogger().lifecycle(" http://modcoderpack.com/ ");
242-
project.getLogger().lifecycle(" Searge, ProfMobius, Fesh0r, ");
243-
project.getLogger().lifecycle(" R4wk, ZeuX, IngisKahn, bspkrs");
244-
project.getLogger().lifecycle(" MCP Data version : " + getExtension().getMcpVersion());
245-
project.getLogger().lifecycle("****************************");
240+
Logger logger = this.project.getLogger();
241+
logger.lifecycle("#################################################");
242+
logger.lifecycle(" ForgeGradle {} ", this.getClass().getPackage().getImplementationVersion());
243+
logger.lifecycle(" https://github.com/MinecraftForge/ForgeGradle ");
244+
logger.lifecycle("#################################################");
245+
logger.lifecycle(" Powered by MCP {} ", this.getExtension().getMcpVersion());
246+
logger.lifecycle(" http://modcoderpack.com ");
247+
logger.lifecycle(" by: Searge, ProfMobius, Fesh0r, ");
248+
logger.lifecycle(" R4wk, ZeuX, IngisKahn, bspkrs ");
249+
logger.lifecycle("#################################################");
246250

247251
for (String str : lines)
248-
project.getLogger().lifecycle(str);
252+
logger.lifecycle(str);
249253

250254
displayBanner = false;
251255
}

0 commit comments

Comments
 (0)