Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ jobs:
build:
runs-on: ubuntu-latest
env:
MAVEN_USERNAME: ${{ vars.MAVEN_USERNAME }}
MAVEN_PASSWORD: ${{ secrets.MAVEN_PASSWORD }}
ORG_GRADLE_PROJECT_MAVEN_USERNAME: ${{ secrets.MAVEN_USERNAME }}
ORG_GRADLE_PROJECT_MAVEN_PASSWORD: ${{ secrets.MAVEN_PASSWORD }}
ORG_GRADLE_PROJECT_mavenCentralPassword: ${{ secrets.ORG_GRADLE_PROJECT_MAVENCENTRALPASSWORD }}
ORG_GRADLE_PROJECT_mavenCentralUsername: ${{ secrets.ORG_GRADLE_PROJECT_MAVENCENTRALUSERNAME }}
ORG_GRADLE_PROJECT_signingInMemoryKey: ${{ secrets.ORG_GRADLE_PROJECT_SIGNINGINMEMORYKEY }}
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,12 @@ jobs:
build:
uses: ./.github/workflows/build.yml
secrets:
MAVEN_USERNAME: ${{ vars.MAVEN_USERNAME }}
MAVEN_PASSWORD: ${{ secrets.MAVEN_PASSWORD }}
ORG_GRADLE_PROJECT_mavenCentralUsername: ${{ secrets.ORG_GRADLE_PROJECT_MAVENCENTRALUSERNAME }}
ORG_GRADLE_PROJECT_mavenCentralPassword: ${{ secrets.ORG_GRADLE_PROJECT_MAVENCENTRALPASSWORD }}
ORG_GRADLE_PROJECT_signingInMemoryKey: ${{ secrets.ORG_GRADLE_PROJECT_SIGNINGINMEMORYKEY }}
ORG_GRADLE_PROJECT_signingInMemoryKeyPassword: ${{ secrets.ORG_GRADLE_PROJECT_SIGNINGINMEMORYKEYPASSWORD }}
ORG_GRADLE_PROJECT_MAVEN_USERNAME: ${{ secrets.MAVEN_USERNAME }}
ORG_GRADLE_PROJECT_MAVEN_PASSWORD: ${{ secrets.MAVEN_PASSWORD }}
ORG_GRADLE_PROJECT_mavenCentralUsername: ${{ secrets.MAVEN_CENTRAL_USERNAME }}
ORG_GRADLE_PROJECT_mavenCentralPassword: ${{ secrets.MAVEN_CENTRAL_PASSWORD }}
ORG_GRADLE_PROJECT_signingInMemoryKey: ${{ secrets.SIGNING_IN_MEMORY_KEY }}
ORG_GRADLE_PROJECT_signingInMemoryKeyPassword: ${{ secrets.SIGNING_IN_MEMORY_KEY_PASSWORD }}

release:
needs: build
Expand Down
15 changes: 10 additions & 5 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -140,6 +140,11 @@ tasks.withType<PublishToMavenRepository> {
dependsOn(tasks.kotlinSourcesJar)
}

tasks.withType<GenerateModuleMetadata> {
dependsOn(sourcesJar)
dependsOn(tasks.kotlinSourcesJar)
}

kotlin {
jvmToolchain(17)
}
Expand All @@ -164,11 +169,11 @@ val mavenUrl: String
publishing {
repositories {
maven {
name = "arbjerg"
name = "lavalink"
url = uri(mavenUrl)
credentials {
username = System.getenv("MAVEN_USERNAME")
password = System.getenv("MAVEN_PASSWORD")
username = findProperty("MAVEN_USERNAME") as String?
password = findProperty("MAVEN_PASSWORD") as String?
}
authentication {
create<BasicAuthentication>("basic")
Expand All @@ -190,7 +195,7 @@ afterEvaluate {
coordinates(group.toString(), project.the<BasePluginExtension>().archivesName.get(), version.toString())

if (findProperty("mavenCentralUsername") != null && findProperty("mavenCentralPassword") != null) {
publishToMavenCentral(SonatypeHost.S01, false)
publishToMavenCentral(SonatypeHost.CENTRAL_PORTAL, false)
if (release) {
signAllPublications()
}
Expand Down Expand Up @@ -234,7 +239,7 @@ publish.apply {
dependsOn(tasks.build)

onlyIf {
System.getenv("MAVEN_USERNAME") != null && System.getenv("MAVEN_PASSWORD") != null
findProperty("MAVEN_USERNAME") != null && findProperty("MAVEN_PASSWORD") != null
}
}

Expand Down
2 changes: 1 addition & 1 deletion settings.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ fun VersionCatalogBuilder.versionRefs() {
version("kotlin", "1.9.21")
version("dokka", "1.9.10")
version("grgit", "5.2.0")
version("maven-publish", "0.25.3")
version("maven-publish", "0.32.0")
version("lavalink", "4.0.3")

version("logger", "2.0.7")
Expand Down
Loading