Skip to content

Commit 5214e4d

Browse files
JonathingJonathing
committed
Update workspace and move to GitHub Actions
- Gradle 7.5.1 -> 8.13 - GradleUtils 2.2.0 -> 2.4.4 - Licenser upstream 0.6.1 -> downstream 1.1.1 - Shadow 2.0.4 -> 8.3.6
1 parent 145d5c1 commit 5214e4d

File tree

10 files changed

+144
-270
lines changed

10 files changed

+144
-270
lines changed

‎.github/workflows/publish.yml‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
name: Publish
2+
3+
on:
4+
push:
5+
branches: [ "master" ]
6+
paths-ignore:
7+
- '.github/workflows/**'
8+
9+
permissions:
10+
contents: read
11+
12+
jobs:
13+
build:
14+
uses: MinecraftForge/SharedActions/.github/workflows/gradle.yml@main
15+
with:
16+
java: 17
17+
gradle_tasks: 'check publish'
18+
artifact_name: 'mapping-verifier'
19+
secrets:
20+
DISCORD_WEBHOOK: ${{ secrets.DISCORD_WEBHOOK }}
21+
PROMOTE_ARTIFACT_WEBHOOK: ${{ secrets.PROMOTE_ARTIFACT_WEBHOOK }}
22+
PROMOTE_ARTIFACT_USERNAME: ${{ secrets.PROMOTE_ARTIFACT_USERNAME }}
23+
PROMOTE_ARTIFACT_PASSWORD: ${{ secrets.PROMOTE_ARTIFACT_PASSWORD }}
24+
MAVEN_USER: ${{ secrets.MAVEN_USER }}
25+
MAVEN_PASSWORD: ${{ secrets.MAVEN_PASSWORD }}

‎.teamcity/pom.xml‎

Lines changed: 0 additions & 104 deletions
This file was deleted.

‎.teamcity/settings.kts‎

Lines changed: 0 additions & 69 deletions
This file was deleted.

‎build.gradle‎

Lines changed: 57 additions & 68 deletions
Original file line numberDiff line numberDiff line change
@@ -1,103 +1,92 @@
11
plugins {
2-
id 'java'
2+
id 'java-library'
3+
id 'idea'
34
id 'eclipse'
45
id 'maven-publish'
5-
id 'org.cadixdev.licenser' version '0.6.1'
6-
id 'net.minecraftforge.gradleutils' version '2.2.0'
7-
id 'com.github.johnrengelman.shadow' version '2.0.4'
6+
id 'net.minecraftforge.licenser' version '1.1.1'
7+
id 'net.minecraftforge.gradleutils' version '2.4.4'
8+
id 'com.gradleup.shadow' version '8.3.6'
89
}
910

1011
group = 'net.minecraftforge'
11-
version = gradleutils.getTagOffsetVersion()
12-
logger.lifecycle('Version: ' + version)
13-
java.toolchain.languageVersion = JavaLanguageVersion.of(8)
12+
version = gitversion.version.tagOffset
13+
println "Version: $version"
14+
15+
java {
16+
toolchain.languageVersion = JavaLanguageVersion.of(8)
17+
withSourcesJar()
18+
}
1419

1520
repositories {
21+
maven gradleutils.forgeMaven
1622
mavenCentral()
1723
}
1824

25+
dependencies {
26+
implementation libs.bundles.asm
27+
implementation libs.jopt
28+
//Because tons of projects all paarsing SRG files is annoying
29+
api libs.srgutils
30+
}
31+
1932
changelog {
20-
fromTag '2.0'
33+
from '2.0'
2134
}
2235

2336
license {
24-
header project.file('LICENSE-header.txt')
25-
include '**/*.java'
26-
newLine false
37+
header project.file('LICENSE-header.txt')
38+
include '**/*.java'
39+
newLine false
2740
}
2841

2942
jar {
30-
manifest.attributes('Main-Class': 'net.minecraftforge.mappingverifier.Main')
31-
manifest.attributes('Implementation-Version': project.version)
32-
}
33-
shadowJar {
34-
classifier 'fatjar'
35-
manifest.attributes('Main-Class': 'net.minecraftforge.mappingverifier.Main')
36-
manifest.attributes('Implementation-Version': project.version)
43+
manifest {
44+
// TODO [MappingVerifier] Make Main class fatjar only in 3.0?
45+
attributes(['Main-Class': 'net.minecraftforge.mappingverifier.Main'] as LinkedHashMap)
46+
47+
attributes([
48+
'Specification-Title' : 'Mapping Verifier',
49+
'Specification-Vendor' : 'Forge Development LLC',
50+
'Specification-Version' : gitversion.version.info.tag,
51+
'Implementation-Title' : 'Mapping Verifier',
52+
'Implementation-Vendor' : 'Forge Development LLC',
53+
'Implementation-Version': project.version
54+
] as LinkedHashMap, 'net/minecraftforge/mappingverifier')
55+
}
3756
}
3857

39-
task sourcesJar(type: Jar) {
40-
archiveClassifier = 'sources'
41-
from sourceSets.main.allSource
58+
tasks.named('shadowJar', com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar).configure {
59+
archiveClassifier = 'fatjar'
4260
}
4361

4462
artifacts {
45-
archives jar
4663
archives shadowJar
4764
}
4865

66+
publishing {
67+
publications.register('mavenJava', MavenPublication) {
68+
from components.java
4969

50-
repositories {
51-
maven { url = 'https://maven.minecraftforge.net/' }
52-
mavenCentral()
53-
}
70+
artifactId = 'mapping-verifier'
71+
changelog.publish(it)
5472

55-
dependencies {
56-
implementation 'org.ow2.asm:asm:9.3'
57-
implementation 'org.ow2.asm:asm-tree:9.3'
58-
implementation 'org.ow2.asm:asm-util:9.3'
59-
implementation 'net.sf.jopt-simple:jopt-simple:5.0.4'
60-
//Because tons of projects all paarsing SRG files is annoying
61-
implementation 'net.minecraftforge:srgutils:0.4.+'
62-
}
73+
pom {
74+
name = 'MappingVerifier'
75+
description = 'Utility to verify mapping files do not mess up bytecode access/layout.'
6376

64-
publishing {
65-
publications {
66-
mavenJava(MavenPublication) {
67-
artifact jar
68-
artifact sourcesJar
69-
artifact shadowJar
70-
pom {
71-
name = 'MappingVerifier'
72-
description = 'Utility to verify mapping files do not mess up bytecode access/layout.'
73-
url = 'https://github.com/MinecraftForge/MappingVerifier'
74-
scm {
75-
url = 'https://github.com/MinecraftForge/MappingVerifier'
76-
connection = 'scm:git:git://github.com/MinecraftForge/MappingVerifier.git'
77-
developerConnection = 'scm:git:git@github.com:MinecraftForge/MappingVerifier.git'
78-
}
79-
issueManagement {
80-
system = 'github'
81-
url = 'https://github.com/MinecraftForge/MappingVerifier/issues'
82-
}
83-
84-
licenses {
85-
license {
86-
name = 'LGPLv2.1'
87-
url = 'https://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt'
88-
}
89-
}
90-
91-
developers {
92-
developer {
93-
id = 'LexManos'
94-
name = 'LexManos'
95-
}
96-
}
77+
gradleutils.pom.gitHubDetails = pom
78+
79+
license gradleutils.pom.licenses.LGPLv2_1
80+
81+
developers {
82+
gradleutils.pom.Developers.LexManos
9783
}
9884
}
9985
}
86+
10087
repositories {
101-
maven gradleutils.getPublishingForgeMaven()
88+
maven gradleutils.publishingForgeMaven
10289
}
10390
}
91+
92+
idea.module { downloadSources = downloadJavadoc = true }

‎gradle.properties‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
org.gradle.caching=true
2+
org.gradle.parallel=true
3+
org.gradle.configureondemand=true

‎gradle/wrapper/gradle-wrapper.jar‎

-16.8 KB
Binary file not shown.

‎gradle/wrapper/gradle-wrapper.properties‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
4+
networkTimeout=10000
5+
validateDistributionUrl=true
46
zipStoreBase=GRADLE_USER_HOME
57
zipStorePath=wrapper/dists

0 commit comments

Comments
 (0)