From 4139fa2c655f52775e2d19a9420070a7ecba9f83 Mon Sep 17 00:00:00 2001
From: Mattia Tommasone <raibaz@gmail.com>
Date: Mon, 22 Aug 2022 22:38:12 +0200
Subject: [PATCH] Update release process for sonatype and release v1.12.6

---
 MAINTAINING.md                                   |  7 +++----
 .../convention/mockk-publishing.gradle.kts       | 16 ++++++++++++++--
 gradle.properties                                |  2 +-
 3 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/MAINTAINING.md b/MAINTAINING.md
index ede229589..5033b3c1c 100644
--- a/MAINTAINING.md
+++ b/MAINTAINING.md
@@ -8,15 +8,14 @@
  - [ ] make sure all required PRs are merged
  - [ ] run test-suite in Gradle
  - [ ] run test-suite from Android Studio or IntelliJ from emulator (Android Instrumented tests)
- - [ ] release to local maven repo by running `gradle publish` with the `localrepo` gradle property set
+ - [ ] release to local maven repo by running `gradle publish` with the `localrepo` repository uncommented in `mockk-publishing.gradle.kts`
  - [ ] do quick testing with this local maven repo: basics, if documentation is loading, if all dependencies are fine
  - [ ] change version to RELEASE version (i.e. remove -SNAPSHOT from version)
  - [ ] bump if needed major or minor (resetting everything afterwards)
  - [ ] commit it
  - [ ] tag it
- - [ ] redirect release process to oss.sonatype by removing the `localrepo` property in gradle.properties
- - [ ] set `org.gradle.parallel=true` in `gradle.properties`: apparently, sonatype does not like parallel builds
- - [ ] release from Gradle with `gradle publish`
+ - [ ] redirect release process to oss.sonatype by uncommenting the sonatype repository in `mockk-publishing.gradle.kts`
+ - [ ] release from Gradle with `gradle publish -Dorg.gradle.parallel=false` (apparently, sonatype does not like parallel builds)
  - [ ] goto oss.sonatype
  - [ ] find io.mockk repo
  - [ ] check state of dependencies (are sizes okay), maybe download one
diff --git a/buildSrc/src/main/kotlin/buildsrc/convention/mockk-publishing.gradle.kts b/buildSrc/src/main/kotlin/buildsrc/convention/mockk-publishing.gradle.kts
index 75d084dc1..20e9f1d6a 100644
--- a/buildSrc/src/main/kotlin/buildsrc/convention/mockk-publishing.gradle.kts
+++ b/buildSrc/src/main/kotlin/buildsrc/convention/mockk-publishing.gradle.kts
@@ -14,9 +14,9 @@ val sonatypeRepositoryCredentials: Provider<Action<PasswordCredentials>> =
 
 val sonatypeRepositoryReleaseUrl: Provider<String> = provider {
     if (version.toString().endsWith("SNAPSHOT")) {
-        "https://s01.oss.sonatype.org/content/repositories/snapshots/"
+        "https://oss.sonatype.org/content/repositories/snapshots/"
     } else {
-        "https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/"
+        "https://oss.sonatype.org/service/local/staging/deploy/maven2/"
     }
 }
 
@@ -28,6 +28,10 @@ val signingPassword: Provider<String> =
     providers.gradleProperty("signing.password")
 val signingSecretKeyRingFile: Provider<String> =
     providers.gradleProperty("signing.secretKeyRingFile")
+val ossrhUsername: Provider<String> =
+    providers.gradleProperty("ossrhUsername")
+val ossrhPassword: Provider<String> =
+    providers.gradleProperty("ossrhPassword")
 
 
 tasks.withType<AbstractPublishToMaven>().configureEach {
@@ -51,6 +55,14 @@ publishing {
         maven(rootProject.layout.projectDirectory.dir(localrepo)) {
             name = "LocalRepo"
         }
+
+        /*maven {
+            url = uri(sonatypeRepositoryReleaseUrl)
+            credentials {
+                username = ossrhUsername.get()
+                password = ossrhPassword.get()
+            }
+        }*/
     }
     publications.withType<MavenPublication>().configureEach {
         createMockKPom {
diff --git a/gradle.properties b/gradle.properties
index 030492b47..53cea0ee0 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,4 +1,4 @@
-version=1.12.6-SNAPSHOT
+version=1.12.7-SNAPSHOT
 # Enable Gradle build cache https://docs.gradle.org/current/userguide/build_cache.html
 org.gradle.caching=true
 org.gradle.configureondemand=false