Skip to content

Commit bf14331

Browse files
authored
update to central portal (#37)
1 parent 9664a05 commit bf14331

File tree

4 files changed

+19
-14
lines changed

4 files changed

+19
-14
lines changed

.github/workflows/build.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ jobs:
2222
build:
2323
runs-on: ubuntu-latest
2424
env:
25-
MAVEN_USERNAME: ${{ vars.MAVEN_USERNAME }}
26-
MAVEN_PASSWORD: ${{ secrets.MAVEN_PASSWORD }}
25+
ORG_GRADLE_PROJECT_MAVEN_USERNAME: ${{ secrets.MAVEN_USERNAME }}
26+
ORG_GRADLE_PROJECT_MAVEN_PASSWORD: ${{ secrets.MAVEN_PASSWORD }}
2727
ORG_GRADLE_PROJECT_mavenCentralPassword: ${{ secrets.ORG_GRADLE_PROJECT_MAVENCENTRALPASSWORD }}
2828
ORG_GRADLE_PROJECT_mavenCentralUsername: ${{ secrets.ORG_GRADLE_PROJECT_MAVENCENTRALUSERNAME }}
2929
ORG_GRADLE_PROJECT_signingInMemoryKey: ${{ secrets.ORG_GRADLE_PROJECT_SIGNINGINMEMORYKEY }}

.github/workflows/release.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,12 @@ jobs:
88
build:
99
uses: ./.github/workflows/build.yml
1010
secrets:
11-
MAVEN_USERNAME: ${{ vars.MAVEN_USERNAME }}
12-
MAVEN_PASSWORD: ${{ secrets.MAVEN_PASSWORD }}
13-
ORG_GRADLE_PROJECT_mavenCentralUsername: ${{ secrets.ORG_GRADLE_PROJECT_MAVENCENTRALUSERNAME }}
14-
ORG_GRADLE_PROJECT_mavenCentralPassword: ${{ secrets.ORG_GRADLE_PROJECT_MAVENCENTRALPASSWORD }}
15-
ORG_GRADLE_PROJECT_signingInMemoryKey: ${{ secrets.ORG_GRADLE_PROJECT_SIGNINGINMEMORYKEY }}
16-
ORG_GRADLE_PROJECT_signingInMemoryKeyPassword: ${{ secrets.ORG_GRADLE_PROJECT_SIGNINGINMEMORYKEYPASSWORD }}
11+
ORG_GRADLE_PROJECT_MAVEN_USERNAME: ${{ secrets.MAVEN_USERNAME }}
12+
ORG_GRADLE_PROJECT_MAVEN_PASSWORD: ${{ secrets.MAVEN_PASSWORD }}
13+
ORG_GRADLE_PROJECT_mavenCentralUsername: ${{ secrets.MAVEN_CENTRAL_USERNAME }}
14+
ORG_GRADLE_PROJECT_mavenCentralPassword: ${{ secrets.MAVEN_CENTRAL_PASSWORD }}
15+
ORG_GRADLE_PROJECT_signingInMemoryKey: ${{ secrets.SIGNING_IN_MEMORY_KEY }}
16+
ORG_GRADLE_PROJECT_signingInMemoryKeyPassword: ${{ secrets.SIGNING_IN_MEMORY_KEY_PASSWORD }}
1717

1818
release:
1919
needs: build

build.gradle.kts

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -140,6 +140,11 @@ tasks.withType<PublishToMavenRepository> {
140140
dependsOn(tasks.kotlinSourcesJar)
141141
}
142142

143+
tasks.withType<GenerateModuleMetadata> {
144+
dependsOn(sourcesJar)
145+
dependsOn(tasks.kotlinSourcesJar)
146+
}
147+
143148
kotlin {
144149
jvmToolchain(17)
145150
}
@@ -164,11 +169,11 @@ val mavenUrl: String
164169
publishing {
165170
repositories {
166171
maven {
167-
name = "arbjerg"
172+
name = "lavalink"
168173
url = uri(mavenUrl)
169174
credentials {
170-
username = System.getenv("MAVEN_USERNAME")
171-
password = System.getenv("MAVEN_PASSWORD")
175+
username = findProperty("MAVEN_USERNAME") as String?
176+
password = findProperty("MAVEN_PASSWORD") as String?
172177
}
173178
authentication {
174179
create<BasicAuthentication>("basic")
@@ -190,7 +195,7 @@ afterEvaluate {
190195
coordinates(group.toString(), project.the<BasePluginExtension>().archivesName.get(), version.toString())
191196

192197
if (findProperty("mavenCentralUsername") != null && findProperty("mavenCentralPassword") != null) {
193-
publishToMavenCentral(SonatypeHost.S01, false)
198+
publishToMavenCentral(SonatypeHost.CENTRAL_PORTAL, false)
194199
if (release) {
195200
signAllPublications()
196201
}
@@ -234,7 +239,7 @@ publish.apply {
234239
dependsOn(tasks.build)
235240

236241
onlyIf {
237-
System.getenv("MAVEN_USERNAME") != null && System.getenv("MAVEN_PASSWORD") != null
242+
findProperty("MAVEN_USERNAME") != null && findProperty("MAVEN_PASSWORD") != null
238243
}
239244
}
240245

settings.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ fun VersionCatalogBuilder.versionRefs() {
1919
version("kotlin", "1.9.21")
2020
version("dokka", "1.9.10")
2121
version("grgit", "5.2.0")
22-
version("maven-publish", "0.25.3")
22+
version("maven-publish", "0.32.0")
2323
version("lavalink", "4.0.3")
2424

2525
version("logger", "2.0.7")

0 commit comments

Comments
 (0)