Merge branch 'release'

Mihail Slavchev · Mihail Slavchev · commit 62b7d0e90a21 · 2016-03-09T11:38:37.000+02:00
diff --git a/build/project-template-gradle/build.gradle b/build/project-template-gradle/build.gradle
@@ -462,8 +462,9 @@ task buildMetadata (type: JavaExec) {
 			keyStorePath = keyStoreFile.getAbsolutePath()
 			alias = "androiddebugkey"
 		}
+		def jarSignerPath = new File(System.getenv("JAVA_HOME"), "bin/jarsigner").getAbsolutePath()
 
-		def cmdParams = new ArrayList<String>(["jarsigner", "-sigalg", "SHA1withRSA", "-digestalg", "SHA1", "-storepass", storePass, "-keypass", keyPass, "-keystore", keyStorePath, currentApk, alias])
+		def cmdParams = new ArrayList<String>([jarSignerPath, "-sigalg", "SHA1withRSA", "-digestalg", "SHA1", "-storepass", storePass, "-keypass", keyPass, "-keystore", keyStorePath, currentApk, alias])
 
 		if (isWinOs) {
 			cmdParams.add(0, "/c")

Original file line number	Diff line number	Diff line change
`@@ -462,8 +462,9 @@ task buildMetadata (type: JavaExec) {`
`462`	`462`	`keyStorePath = keyStoreFile.getAbsolutePath()`
`463`	`463`	`alias = "androiddebugkey"`
`464`	`464`	`}`
	`465`	`+ def jarSignerPath = new File(System.getenv("JAVA_HOME"), "bin/jarsigner").getAbsolutePath()`
`465`	`466`
`466`		`- def cmdParams = new ArrayList<String>(["jarsigner", "-sigalg", "SHA1withRSA", "-digestalg", "SHA1", "-storepass", storePass, "-keypass", keyPass, "-keystore", keyStorePath, currentApk, alias])`
	`467`	`+ def cmdParams = new ArrayList<String>([jarSignerPath, "-sigalg", "SHA1withRSA", "-digestalg", "SHA1", "-storepass", storePass, "-keypass", keyPass, "-keystore", keyStorePath, currentApk, alias])`
`467`	`468`
`468`	`469`	`if (isWinOs) {`
`469`	`470`	`cmdParams.add(0, "/c")`