Change property names to be compatible with gradle install plugin.

nitzanj · Amir Tocker · commit cccce91492ba · 2017-06-11T13:55:45.000+03:00
diff --git a/build.gradle b/build.gradle
@@ -9,6 +9,8 @@ allprojects {
         jcenter()
         mavenCentral()
     }
+
+    project.ext.set("publishGroupId", group)
 }
 
 subprojects {
diff --git a/cloudinary-android/build.gradle b/cloudinary-android/build.gradle
@@ -83,7 +83,7 @@ uploadArchives {
                 name 'Cloudinary Android Library'
                 description publishDescription
                 packaging 'aar'
-                version projectVersion
+                version version
 
                 url githubUrl
 
@@ -113,7 +113,7 @@ uploadArchives {
                 pom.dependencies.forEach { dep ->
                     if (dep.getVersion() == "unspecified") {
                         dep.setGroupId(publishGroupId)
-                        dep.setVersion(projectVersion)
+                        dep.setVersion(version)
                     }
                 }
             }
diff --git a/cloudinary-core/build.gradle b/cloudinary-core/build.gradle
@@ -28,7 +28,7 @@ uploadArchives {
                 name 'Cloudinary Core Library'
                 description publishDescription
                 packaging jar
-                version projectVersion
+                version version
 
                 url githubUrl
 
diff --git a/cloudinary-http42/build.gradle b/cloudinary-http42/build.gradle
@@ -37,7 +37,7 @@ uploadArchives {
                 name 'Cloudinary Apache HTTP 4.2 Library'
                 description publishDescription
                 packaging jar
-                version projectVersion
+                version version
 
                 url githubUrl
 
@@ -67,7 +67,7 @@ uploadArchives {
                 pom.dependencies.forEach { dep ->
                     if (dep.getVersion() == "unspecified") {
                         dep.setGroupId(publishGroupId)
-                        dep.setVersion(projectVersion)
+                        dep.setVersion(version)
                     }
                 }
             }
diff --git a/cloudinary-http43/build.gradle b/cloudinary-http43/build.gradle
@@ -36,7 +36,7 @@ uploadArchives {
                 name 'Cloudinary Apache HTTP 4.3 Library'
                 description publishDescription
                 packaging jar
-                version projectVersion
+                version version
 
                 url githubUrl
 
@@ -66,7 +66,7 @@ uploadArchives {
                 pom.dependencies.forEach { dep ->
                     if (dep.getVersion() == "unspecified") {
                         dep.setGroupId(publishGroupId)
-                        dep.setVersion(projectVersion)
+                        dep.setVersion(version)
                     }
                 }
             }
diff --git a/cloudinary-http44/build.gradle b/cloudinary-http44/build.gradle
@@ -36,7 +36,7 @@ uploadArchives {
                 name 'Cloudinary Apache HTTP 4.4 Library'
                 description publishDescription
                 packaging jar
-                version projectVersion
+                version version
 
                 url githubUrl
 
@@ -66,7 +66,7 @@ uploadArchives {
                 pom.dependencies.forEach { dep ->
                     if (dep.getVersion() == "unspecified") {
                         dep.setGroupId(publishGroupId)
-                        dep.setVersion(projectVersion)
+                        dep.setVersion(version)
                     }
                 }
             }
diff --git a/cloudinary-taglib/build.gradle b/cloudinary-taglib/build.gradle
@@ -32,7 +32,7 @@ uploadArchives {
                 name 'Cloudinary Taglib Library'
                 description publishDescription
                 packaging jar
-                version projectVersion
+                version version
 
                 url githubUrl
 
@@ -62,7 +62,7 @@ uploadArchives {
                 pom.dependencies.forEach { dep ->
                     if (dep.getVersion() == "unspecified") {
                         dep.setGroupId(publishGroupId)
-                        dep.setVersion(projectVersion)
+                        dep.setVersion(version)
                     }
                 }
             }
diff --git a/cloudinary-test-common/build.gradle b/cloudinary-test-common/build.gradle
@@ -26,7 +26,7 @@ uploadArchives {
                 name 'Cloudinary Apache HTTP 4.3 Library'
                 description publishDescription
                 packaging jar
-                version projectVersion
+                version version
 
                 url githubUrl
 
@@ -56,7 +56,7 @@ uploadArchives {
                 pom.dependencies.forEach { dep ->
                     if (dep.getVersion() == "unspecified") {
                         dep.setGroupId(publishGroupId)
-                        dep.setVersion(projectVersion)
+                        dep.setVersion(version)
                     }
                 }
             }
diff --git a/gradle.properties b/gradle.properties
@@ -1,8 +1,6 @@
 publishRepo=https://oss.sonatype.org/service/local/staging/deploy/maven2/
 snapshotRepo=https://oss.sonatype.org/content/repositories/snapshots/
-publishGroupId=com.cloudinary
 publishDescription=Cloudinary is a cloud service that offers a solution to a web application's entire image management pipeline. Upload images to the cloud. Automatically perform smart image resizing, cropping and conversion without installing any complex software. Integrate Facebook or Twitter profile image extraction in a snap, in any dimension and style to match your website’s graphics requirements. Images are seamlessly delivered through a fast CDN, and much much more. This Java library allows to easily integrate with Cloudinary in Java applications.
-projectVersion=1.12.1-SNAPSHOT
 githubUrl=http://github.com/cloudinary/cloudinary_java
 scmConnection=scm:git:git://github.com/cloudinary/cloudinary_java.git
 scmDeveloperConnection=scm:git:git@github.com:cloudinary/cloudinary_java.git'
@@ -11,4 +9,8 @@ licenseName=MIT
 licenseUrl=http://opensource.org/licenses/MIT
 developerId=cloudinary
 developerName=Cloudinary
-developerEmail=info@cloudinary.com
+developerEmail=info@cloudinary.com
+
+# These two properties must use these exact names to be compatible with 'gradle install' plugin.
+group=com.cloudinary
+version=1.12.1-SNAPSHOT

Original file line number	Diff line number	Diff line change
`@@ -9,6 +9,8 @@ allprojects {`
`9`	`9`	`jcenter()`
`10`	`10`	`mavenCentral()`
`11`	`11`	`}`
	`12`	`+`
	`13`	`+ project.ext.set("publishGroupId", group)`
`12`	`14`	`}`
`13`	`15`
`14`	`16`	`subprojects {`
Original file line number	Diff line number	Diff line change
`@@ -83,7 +83,7 @@ uploadArchives {`
`83`	`83`	`name 'Cloudinary Android Library'`
`84`	`84`	`description publishDescription`
`85`	`85`	`packaging 'aar'`
`86`		`- version projectVersion`
	`86`	`+ version version`
`87`	`87`
`88`	`88`	`url githubUrl`
`89`	`89`
`@@ -113,7 +113,7 @@ uploadArchives {`
`113`	`113`	`pom.dependencies.forEach { dep ->`
`114`	`114`	`if (dep.getVersion() == "unspecified") {`
`115`	`115`	`dep.setGroupId(publishGroupId)`
`116`		`- dep.setVersion(projectVersion)`
	`116`	`+ dep.setVersion(version)`
`117`	`117`	`}`
`118`	`118`	`}`
`119`	`119`	`}`
Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ uploadArchives {`
`37`	`37`	`name 'Cloudinary Apache HTTP 4.2 Library'`
`38`	`38`	`description publishDescription`
`39`	`39`	`packaging jar`
`40`		`- version projectVersion`
	`40`	`+ version version`
`41`	`41`
`42`	`42`	`url githubUrl`
`43`	`43`
`@@ -67,7 +67,7 @@ uploadArchives {`
`67`	`67`	`pom.dependencies.forEach { dep ->`
`68`	`68`	`if (dep.getVersion() == "unspecified") {`
`69`	`69`	`dep.setGroupId(publishGroupId)`
`70`		`- dep.setVersion(projectVersion)`
	`70`	`+ dep.setVersion(version)`
`71`	`71`	`}`
`72`	`72`	`}`
`73`	`73`	`}`
Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ uploadArchives {`
`36`	`36`	`name 'Cloudinary Apache HTTP 4.3 Library'`
`37`	`37`	`description publishDescription`
`38`	`38`	`packaging jar`
`39`		`- version projectVersion`
	`39`	`+ version version`
`40`	`40`
`41`	`41`	`url githubUrl`
`42`	`42`
`@@ -66,7 +66,7 @@ uploadArchives {`
`66`	`66`	`pom.dependencies.forEach { dep ->`
`67`	`67`	`if (dep.getVersion() == "unspecified") {`
`68`	`68`	`dep.setGroupId(publishGroupId)`
`69`		`- dep.setVersion(projectVersion)`
	`69`	`+ dep.setVersion(version)`
`70`	`70`	`}`
`71`	`71`	`}`
`72`	`72`	`}`
Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ uploadArchives {`
`32`	`32`	`name 'Cloudinary Taglib Library'`
`33`	`33`	`description publishDescription`
`34`	`34`	`packaging jar`
`35`		`- version projectVersion`
	`35`	`+ version version`
`36`	`36`
`37`	`37`	`url githubUrl`
`38`	`38`
`@@ -62,7 +62,7 @@ uploadArchives {`
`62`	`62`	`pom.dependencies.forEach { dep ->`
`63`	`63`	`if (dep.getVersion() == "unspecified") {`
`64`	`64`	`dep.setGroupId(publishGroupId)`
`65`		`- dep.setVersion(projectVersion)`
	`65`	`+ dep.setVersion(version)`
`66`	`66`	`}`
`67`	`67`	`}`
`68`	`68`	`}`
Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ uploadArchives {`
`26`	`26`	`name 'Cloudinary Apache HTTP 4.3 Library'`
`27`	`27`	`description publishDescription`
`28`	`28`	`packaging jar`
`29`		`- version projectVersion`
	`29`	`+ version version`
`30`	`30`
`31`	`31`	`url githubUrl`
`32`	`32`
`@@ -56,7 +56,7 @@ uploadArchives {`
`56`	`56`	`pom.dependencies.forEach { dep ->`
`57`	`57`	`if (dep.getVersion() == "unspecified") {`
`58`	`58`	`dep.setGroupId(publishGroupId)`
`59`		`- dep.setVersion(projectVersion)`
	`59`	`+ dep.setVersion(version)`
`60`	`60`	`}`
`61`	`61`	`}`
`62`	`62`	`}`