Adjust maven deployment configuration

developernotes · developernotes · commit ebf41e3e76e1 · 2017-12-22T08:07:17.000-06:00
diff --git a/android-database-sqlcipher/maven.gradle b/android-database-sqlcipher/maven.gradle
@@ -7,12 +7,8 @@ def isReleaseBuild() {
 }
 
 def getReleaseRepositoryUrl() {
-  if(hasProperty('mavenLocalRepositoryPrefix')) {
-    return "${mavenLocalRepositoryPrefix}${buildDir}/${mavenReleaseRepositoryUrl}"
-  } else {
-    return hasProperty('mavenReleaseRepositoryUrl') ? mavenReleaseRepositoryUrl
-    : "https://oss.sonatype.org/service/local/staging/deploy/maven2/"
-  }
+  return hasProperty('mavenReleaseRepositoryUrl') ? mavenReleaseRepositoryUrl
+  : "https://oss.sonatype.org/service/local/staging/deploy/maven2/"
 }
 
 def getSnapshotRepositoryUrl() {
diff --git a/build.gradle b/build.gradle
@@ -25,6 +25,7 @@ ext {
     mavenSnapshotRepositoryUrl = "outputs/snapshot"
     mavenReleaseRepositoryUrl = "outputs/release"
   } else {
+    mavenLocalRepositoryPrefix = ""
     mavenSnapshotRepositoryUrl = "https://oss.sonatype.org/content/repositories/snapshots"
     mavenReleaseRepositoryUrl = "https://oss.sonatype.org/service/local/staging/deploy/maven2"
   }

Original file line number	Diff line number	Diff line change
`@@ -7,12 +7,8 @@ def isReleaseBuild() {`
`7`	`7`	`}`
`8`	`8`
`9`	`9`	`def getReleaseRepositoryUrl() {`
`10`		`- if(hasProperty('mavenLocalRepositoryPrefix')) {`
`11`		`- return "${mavenLocalRepositoryPrefix}${buildDir}/${mavenReleaseRepositoryUrl}"`
`12`		`- } else {`
`13`		`- return hasProperty('mavenReleaseRepositoryUrl') ? mavenReleaseRepositoryUrl`
`14`		`- : "https://oss.sonatype.org/service/local/staging/deploy/maven2/"`
`15`		`- }`
	`10`	`+ return hasProperty('mavenReleaseRepositoryUrl') ? mavenReleaseRepositoryUrl`
	`11`	`+ : "https://oss.sonatype.org/service/local/staging/deploy/maven2/"`
`16`	`12`	`}`
`17`	`13`
`18`	`14`	`def getSnapshotRepositoryUrl() {`
Original file line number	Diff line number	Diff line change
`@@ -25,6 +25,7 @@ ext {`
`25`	`25`	`mavenSnapshotRepositoryUrl = "outputs/snapshot"`
`26`	`26`	`mavenReleaseRepositoryUrl = "outputs/release"`
`27`	`27`	`} else {`
	`28`	`+ mavenLocalRepositoryPrefix = ""`
`28`	`29`	`mavenSnapshotRepositoryUrl = "https://oss.sonatype.org/content/repositories/snapshots"`
`29`	`30`	`mavenReleaseRepositoryUrl = "https://oss.sonatype.org/service/local/staging/deploy/maven2"`
`30`	`31`	`}`