diff --git a/README.md b/README.md
index bf4e75cf..d2365d56 100644
--- a/README.md
+++ b/README.md
@@ -315,7 +315,7 @@ See also the [full License text](LICENSE).
[junit5gh]: https://github.com/junit-team/junit5
[junit5ug]: https://junit.org/junit5/docs/current/user-guide
[circleci]: https://circleci.com/gh/mannodermaus/android-junit5
- [sonatyperepo]: https://oss.sonatype.org/content/repositories/snapshots
+ [sonatyperepo]: https://central.sonatype.com/repository/maven-snapshots
[sampletests]: instrumentation/sample
[wiki-home]: https://github.com/mannodermaus/android-junit5/wiki
[wiki-dsl]: https://github.com/mannodermaus/android-junit5/wiki/Configuration
diff --git a/README.md.template b/README.md.template
index 33c73973..46d1ac7f 100644
--- a/README.md.template
+++ b/README.md.template
@@ -310,7 +310,7 @@ See also the [full License text](LICENSE).
[junit5gh]: https://github.com/junit-team/junit5
[junit5ug]: https://junit.org/junit5/docs/current/user-guide
[circleci]: https://circleci.com/gh/mannodermaus/android-junit5
- [sonatyperepo]: https://oss.sonatype.org/content/repositories/snapshots
+ [sonatyperepo]: https://central.sonatype.com/repository/maven-snapshots
[sampletests]: instrumentation/sample
[wiki-home]: https://github.com/mannodermaus/android-junit5/wiki
[wiki-dsl]: https://github.com/mannodermaus/android-junit5/wiki/Configuration
diff --git a/build-logic/src/main/kotlin/Deployment.kt b/build-logic/src/main/kotlin/Deployment.kt
index a66027a2..46b48323 100644
--- a/build-logic/src/main/kotlin/Deployment.kt
+++ b/build-logic/src/main/kotlin/Deployment.kt
@@ -150,11 +150,11 @@ private fun Project.configureRootDeployment(deployConfig: Deployed, credentials:
group = deployConfig.groupId
version = deployConfig.currentVersion
- nexusPublishing(
- packageGroup = deployConfig.groupId,
- stagingProfileId = credentials.sonatypeStagingProfileId,
- sonatypeUsername = credentials.ossrhUsername,
- sonatypePassword = credentials.ossrhPassword
+ centralPublishing(
+ packageGroup = deployConfig.groupId,
+ stagingProfileId = credentials.sonatypeStagingProfileId,
+ username = credentials.centralUsername,
+ password = credentials.centralPassword
)
}
@@ -348,11 +348,11 @@ private fun Project.signing(action: SigningExtension.() -> Unit) {
// Nexus Staging & Publishing Plugins facade
-private fun Project.nexusPublishing(
- packageGroup: String,
- stagingProfileId: String?,
- sonatypeUsername: String?,
- sonatypePassword: String?
+private fun Project.centralPublishing(
+ packageGroup: String,
+ stagingProfileId: String?,
+ username: String?,
+ password: String?
) {
extensions.getByName("nexusPublishing").withGroovyBuilder {
setProperty("packageGroup", packageGroup)
@@ -368,11 +368,19 @@ private fun Project.nexusPublishing(
cls.getDeclaredMethod("setUsername", Any::class.java)
.also { it.isAccessible = true }
- .invoke(delegate, sonatypeUsername)
+ .invoke(delegate, username)
cls.getDeclaredMethod("setPassword", Any::class.java)
.also { it.isAccessible = true }
- .invoke(delegate, sonatypePassword)
+ .invoke(delegate, password)
+
+ cls.getDeclaredMethod("setNexusUrl", Any::class.java)
+ .also { it.isAccessible = true }
+ .invoke(delegate, uri("https://ossrh-staging-api.central.sonatype.com/service/local/"))
+
+ cls.getDeclaredMethod("setSnapshotRepositoryUrl", Any::class.java)
+ .also { it.isAccessible = true }
+ .invoke(delegate, uri("https://central.sonatype.com/repository/maven-snapshots/"))
}
}
}
diff --git a/build-logic/src/main/kotlin/Environment.kt b/build-logic/src/main/kotlin/Environment.kt
index 10eac031..1363f9e4 100644
--- a/build-logic/src/main/kotlin/Environment.kt
+++ b/build-logic/src/main/kotlin/Environment.kt
@@ -149,8 +149,8 @@ class DeployedCredentials(private val project: Project) {
var signingKeyId: String?
var signingPassword: String?
var signingKeyRingFile: String?
- var ossrhUsername: String?
- var ossrhPassword: String?
+ var centralUsername: String?
+ var centralPassword: String?
var sonatypeStagingProfileId: String?
init {
@@ -171,8 +171,8 @@ class DeployedCredentials(private val project: Project) {
this.signingKeyId = properties.getOrEnvvar("SIGNING_KEY_ID")
this.signingPassword = properties.getOrEnvvar("SIGNING_PASSWORD")
this.signingKeyRingFile = properties.getOrEnvvar("SIGNING_KEY_RING_FILE")
- this.ossrhUsername = properties.getOrEnvvar("OSSRH_USERNAME")
- this.ossrhPassword = properties.getOrEnvvar("OSSRH_PASSWORD")
+ this.centralUsername = properties.getOrEnvvar("CENTRAL_USERNAME")
+ this.centralPassword = properties.getOrEnvvar("CENTRAL_PASSWORD")
this.sonatypeStagingProfileId = properties.getOrEnvvar("SONATYPE_STAGING_PROFILE_ID")
}
diff --git a/instrumentation/.idea/runConfigurations/Instrumentation__Publish_Release_Manually.xml b/instrumentation/.idea/runConfigurations/Instrumentation__Publish_Release_Manually.xml
index 66758c3a..27cd0301 100644
--- a/instrumentation/.idea/runConfigurations/Instrumentation__Publish_Release_Manually.xml
+++ b/instrumentation/.idea/runConfigurations/Instrumentation__Publish_Release_Manually.xml
@@ -4,7 +4,7 @@
-
+
@@ -18,7 +18,12 @@
true
true
+
+ false
+ false
+
false
+ false
\ No newline at end of file
diff --git a/plugin/.idea/runConfigurations/Plugin__Publish_Release_Manually.xml b/plugin/.idea/runConfigurations/Plugin__Publish_Release_Manually.xml
index a590066e..c56b79ee 100644
--- a/plugin/.idea/runConfigurations/Plugin__Publish_Release_Manually.xml
+++ b/plugin/.idea/runConfigurations/Plugin__Publish_Release_Manually.xml
@@ -4,7 +4,7 @@
-
+
@@ -19,6 +19,7 @@
true
true
false
+ false
\ No newline at end of file
diff --git a/plugin/.idea/runConfigurations/Plugin__Run_Unit_Tests.xml b/plugin/.idea/runConfigurations/Plugin__Run_Unit_Tests.xml
index 739c2592..ead6cf07 100644
--- a/plugin/.idea/runConfigurations/Plugin__Run_Unit_Tests.xml
+++ b/plugin/.idea/runConfigurations/Plugin__Run_Unit_Tests.xml
@@ -9,7 +9,7 @@
-
+
@@ -20,7 +20,10 @@
- true
+ true
+ true
+ false
+ false
\ No newline at end of file