Continue making the build look more like upstream. (#830)

* continue making the build look more like upstream.

* add url setting back -- may be important for publishing 2.0.0-SNAPSHOT-alpha style versions.

* Revert "add url setting back -- may be important for publishing 2.0.0-SNAPSHOT-alpha style versions."

This reverts commit 0809774.

Author: breedx-splk

.gitlab-ci.yml

@@ -42,8 +42,6 @@ build:
   extends: .prepare-android-environment
   script:
     - touch local.properties
-    - export SONATYPE_USER="$SONATYPE_USERNAME"
-    - export SONATYPE_KEY="$SONATYPE_PASSWORD"
     - ./gradlew build publish
 
 sast-scan:
@@ -76,6 +74,4 @@ release:
     - touch local.properties
     - export ORG_GRADLE_PROJECT_signingKey=$GPG_SECRET_KEY
     - export ORG_GRADLE_PROJECT_signingPassword=$GPG_PASSWORD
-    - export SONATYPE_USER="$SONATYPE_USERNAME"
-    - export SONATYPE_KEY="$SONATYPE_PASSWORD"
     - ./gradlew -Prelease=true --no-build-cache --no-daemon --rerun-tasks build signMavenPublication publishToSonatype closeAndReleaseSonatypeStagingRepository

build.gradle.kts

@@ -19,9 +19,6 @@ allprojects {
     repositories {
         google()
         mavenCentral()
-        maven {
-            url = uri("https://oss.sonatype.org/content/repositories/snapshots")
-        }
     }
     if (findProperty("release") != "true") {
         version = "$version-SNAPSHOT"
@@ -34,7 +31,7 @@ subprojects {
 
 nexusPublishing.repositories {
     sonatype {
-        username.set(System.getenv("SONATYPE_USER"))
-        password.set(System.getenv("SONATYPE_KEY"))
+        username.set(System.getenv("SONATYPE_USERNAME"))
+        password.set(System.getenv("SONATYPE_PASSWORD"))
     }
 }

buildSrc/src/main/kotlin/splunk.android-library-conventions.gradle.kts

@@ -44,17 +44,6 @@ afterEvaluate {
         }
     }
     publishing {
-        repositories {
-            maven {
-                val releasesRepoUrl = URI("https://oss.sonatype.org/service/local/staging/deploy/maven2")
-                val snapshotsRepoUrl = URI("https://oss.sonatype.org/content/repositories/snapshots/")
-                url = if (project.findProperty("release") == "true") releasesRepoUrl else snapshotsRepoUrl
-                credentials {
-                    username = findProperty("mavenCentralUsername") as String?
-                    password = findProperty("mavenCentralPassword") as String?
-                }
-            }
-        }
         publications {
             create<MavenPublication>("maven") {
                 from(components.findByName(variantToPublish))