Skip to content

Commit 975ffb1

Browse files
committed
build: Publish to new repo
1 parent 18df672 commit 975ffb1

File tree

4 files changed

+7
-13
lines changed

4 files changed

+7
-13
lines changed

.github/workflows/build-and-deploy.yaml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,10 +49,9 @@ jobs:
4949
env:
5050
GITHUB_USERNAME: ${{ github.actor }}
5151
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
52-
ORG_GRADLE_PROJECT_spongeRepo: ${{ secrets.SPONGE_INDEXER_URL }}
5352
ORG_GRADLE_PROJECT_spongeSnapshotRepo: ${{ secrets.SPONGE_MAVEN_SNAPSHOT_REPO_URL }}
5453
ORG_GRADLE_PROJECT_spongeReleaseRepo: ${{ secrets.SPONGE_MAVEN_RELEASE_REPO_URL }}
55-
ORG_GRADLE_PROJECT_spongeUsername: ${{ secrets.SPONGE_INDEXER_USERNAME }}
56-
ORG_GRADLE_PROJECT_spongePassword: ${{ secrets.SPONGE_INDEXER_PASSWORD }}
54+
ORG_GRADLE_PROJECT_spongeUsername: ${{ secrets.SPONGE_MAVEN_REPO_USER }}
55+
ORG_GRADLE_PROJECT_spongePassword: ${{ secrets.SPONGE_MAVEN_REPO_PASSWORD }}
5756

5857

build.gradle

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,7 @@
11
// Gradle plugins
22
buildscript {
33
repositories {
4-
maven { url = 'https://repo.spongepowered.org/maven' }
5-
maven {
6-
name = 'gradle-plugins'
7-
url = 'https://plugins.gradle.org/m2'
8-
}
4+
maven { url = 'https://repo.spongepowered.org/repository/maven-public/' }
95
}
106

117
dependencies {

gradle/deploy.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ uploadArchives {
1414
repositories {
1515
mavenDeployer {
1616
// This is set by the build server when deploying to the repo
17-
if (project.hasProperty('spongeRepo')) {
18-
repository(url: project.spongeRepo) {
17+
if (project.hasProperty('spongeSnapshotRepo') && project.hasProperty('spongeReleaseRepo')) {
18+
repository(url: project.version.endsWith("SNAPSHOT") ? project.spongeSnapshotRepo : project.spongeReleaseRepo) {
1919
if (project.hasProperty('spongeUsername') && project.hasProperty('spongePassword')) {
2020
authentication(userName: project.spongeUsername, password: project.spongePassword)
2121
}

gradle/sponge.gradle

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,9 @@ sourceCompatibility = '1.8'
1717
targetCompatibility = '1.8'
1818

1919
repositories {
20-
mavenCentral()
2120
maven {
2221
name = 'sponge'
23-
url = 'https://repo.spongepowered.org/maven'
22+
url = 'https://repo.spongepowered.org/maven/'
2423
}
2524
}
2625

@@ -86,7 +85,7 @@ javadoc {
8685
'http://www.slf4j.org/apidocs/',
8786
'https://google.github.io/guava/releases/21.0/api/docs/',
8887
'https://google.github.io/guice/api-docs/4.1/javadoc/',
89-
'https://configurate.aoeu.xyz/3.7.2/apidocs/',
88+
'https://configurate.aoeu.xyz/3.7.2/apidocs/',
9089
'https://flow.github.io/math/',
9190
'https://flow.github.io/noise/',
9291
'http://asm.ow2.org/asm50/javadoc/user/',

0 commit comments

Comments
 (0)