Skip to content

Commit 9400f1a

Browse files
committed
Publish to plugin portal
1 parent 0b61648 commit 9400f1a

File tree

4 files changed

+54
-54
lines changed

4 files changed

+54
-54
lines changed
Lines changed: 22 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,25 @@
1-
name: Main Publish
1+
name: Publish
2+
23
on:
34
push:
4-
branches:
5-
- '**'
6-
- '!**-noci'
5+
branches: [ "master" ]
6+
7+
permissions:
8+
contents: read
9+
710
jobs:
8-
build-and-publish:
9-
runs-on: ubuntu-latest
10-
env:
11-
MAVEN_USER: ${{ secrets.MAVEN_USER }}
12-
MAVEN_PASSWORD: ${{ secrets.MAVEN_PASSWORD }}
13-
SIGN_KEY_ALIAS: ${{ secrets.SIGN_KEY_ALIAS }}
14-
SIGN_KEY_PASSWORD: ${{ secrets.SIGN_KEY_PASSWORD }}
15-
SIGN_KEYSTORE_PASSWORD: ${{ secrets.SIGN_KEYSTORE_PASSWORD }}
16-
SIGN_KEYSTORE_DATA: ${{ secrets.SIGN_KEYSTORE_DATA }}
17-
steps:
18-
- uses: actions/checkout@v3
19-
with:
20-
fetch-depth: 0
21-
- name: Set up JDK 8
22-
uses: actions/setup-java@v2
23-
with:
24-
java-version: 8
25-
distribution: 'adopt'
26-
cache: gradle
27-
- name: Build and Publish
28-
run: ./gradlew publish --stacktrace --no-daemon
11+
build:
12+
uses: MinecraftForge/SharedActions/.github/workflows/gradle.yml@main
13+
with:
14+
java: 8
15+
gradle_tasks: "publish publishPlugins"
16+
artifact_name: "gradlejarsigner"
17+
secrets:
18+
DISCORD_WEBHOOK: ${{ secrets.DISCORD_WEBHOOK }}
19+
PROMOTE_ARTIFACT_WEBHOOK: ${{ secrets.PROMOTE_ARTIFACT_WEBHOOK }}
20+
PROMOTE_ARTIFACT_USERNAME: ${{ secrets.PROMOTE_ARTIFACT_USERNAME }}
21+
PROMOTE_ARTIFACT_PASSWORD: ${{ secrets.PROMOTE_ARTIFACT_PASSWORD }}
22+
MAVEN_USER: ${{ secrets.MAVEN_USER }}
23+
MAVEN_PASSWORD: ${{ secrets.MAVEN_PASSWORD }}
24+
GRADLE_PUBLISH_KEY: ${{ secrets.GRADLE_PUBLISH_KEY }}
25+
GRADLE_PUBLISH_SECRET: ${{ secrets.GRADLE_PUBLISH_SECRET }}

build.gradle

Lines changed: 28 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@ plugins {
44
id 'java'
55
id 'java-gradle-plugin'
66
id 'eclipse'
7-
id 'net.minecraftforge.gradleutils' version '2.0.11'
7+
id 'net.minecraftforge.gradleutils' version '2.2.0'
8+
id 'com.gradle.plugin-publish' version '1.2.1'
89
}
910

1011
repositories {
@@ -17,18 +18,22 @@ java.withSourcesJar()
1718

1819
license {
1920
header project.file('LICENSE-header.txt')
20-
include 'net/minecraftforge/**/*.java'
2121
newLine false
2222
}
2323

2424
version = gradleutils.tagOffsetVersion
2525
println('Version: ' + version)
2626

2727
gradlePlugin {
28+
website = 'https://github.com/MinecraftForge/GradleJarSigner'
29+
vcsUrl = 'https://github.com/MinecraftForge/GradleJarSigner.git'
2830
plugins {
2931
gradlejarsigner {
3032
id = 'net.minecraftforge.gradlejarsigner'
3133
implementationClass = 'net.minecraftforge.gradlejarsigner.GradleJarSignerPlugin'
34+
displayName = 'Gradle Jar Signer'
35+
description = 'Wrapper for Ant signjar, allowing proper task caching'
36+
tags.set(['signing', 'java', 'signjar'])
3237
}
3338
}
3439
}
@@ -43,41 +48,35 @@ compileJava {
4348
jar {
4449
manifest {
4550
attributes([
46-
'Specification-Title': 'GradleJarSigner',
47-
'Specification-Vendor': 'Forge Development LLC',
48-
'Specification-Version': gradleutils.gitInfo.tag,
49-
'Implementation-Title': 'SimpleGradleJarSigner',
50-
'Implementation-Version': project.version,
51-
'Implementation-Vendor': 'Forge Development LLC'
51+
'Specification-Title': 'GradleJarSigner',
52+
'Specification-Vendor': 'Forge Development LLC',
53+
'Specification-Version': gradleutils.gitInfo.tag,
54+
'Implementation-Title': 'GradleJarSigner',
55+
'Implementation-Vendor': 'Forge Development LLC',
56+
'Implementation-Version': project.version
5257
] as LinkedHashMap, 'net/minecraftforge/gradlejarsigner/')
5358
}
5459
}
5560

61+
changelog {
62+
fromTag '1.0'
63+
publishAll = false
64+
}
65+
5666
publishing {
57-
publications {
58-
pluginMaven(MavenPublication) {
59-
pom {
60-
packaging = 'jar'
61-
description = 'Gradle Jar Signer Plugin'
62-
url = 'https://github.com/MinecraftForge/GradleJarSigner'
67+
publications.register('pluginMaven', MavenPublication) {
68+
changelog.publish(it)
69+
pom {
70+
packaging = 'jar'
71+
description = 'Gradle Jar Signer Plugin'
72+
url = 'https://github.com/MinecraftForge/GradleJarSigner'
6373

64-
scm {
65-
url = 'https://github.com/MinecraftForge/GradleJarSigner'
66-
connection = 'scm:git:git://github.com/MinecraftForge/GradleJarSigner.git'
67-
developerConnection = 'scm:git:git@github.com:MinecraftForge/GradleJarSigner.git'
68-
}
74+
gradleutils.pom.setGitHubDetails(pom, 'GradleJarSigner')
6975

70-
issueManagement {
71-
system = 'github'
72-
url = 'https://github.com/MinecraftForge/GradleJarSigner/issues'
73-
}
76+
license gradleutils.pom.licenses.LGPLv2_1
7477

75-
developers {
76-
developer {
77-
id = 'LexManos'
78-
name = 'Lex Manos'
79-
}
80-
}
78+
developers {
79+
developer gradleutils.pom.Developers.LexManos
8180
}
8281
}
8382
}

src/main/java/net/minecraftforge/gradlejarsigner/GradleJarSignerExtension.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,8 @@ public void setKeyPass(String value) {
6666
/**
6767
* A base64 encode string containing the keystore data.
6868
* This will be written to a temporary file and then deleted after the task is run.
69+
*
70+
* @param value Base64 encode keystore
6971
*/
7072
public void setKeyStoreData(String value) {
7173
this.keyStoreData = value;

src/main/java/net/minecraftforge/gradlejarsigner/SignTask.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -257,6 +257,8 @@ public void setKeyPass(String value) {
257257
/**
258258
* A base64 encode string containing the keystore data.
259259
* This will be written to a temporary file and then deleted after the task is run.
260+
*
261+
* @param value Base64 encode keystore
260262
*/
261263
public void setKeyStoreData(String value) {
262264
this.keyStoreData.set(value);

0 commit comments

Comments
 (0)