浏览代码

fix build signing

Andrey Filipenkov 2 年之前
父节点
当前提交
3c2fd7f1b8
共有 3 个文件被更改,包括 11 次插入6 次删除
  1. 4 0
      CI/android/signing.properties
  2. 二进制
      CI/android/vcmi-travis.jks
  3. 7 6
      android/vcmi-app/build.gradle

+ 4 - 0
CI/android/signing.properties

@@ -0,0 +1,4 @@
+STORE_FILE=vcmi-travis.jks
+STORE_PASSWORD=traviskey
+KEY_ALIAS=vcmitraviskey
+KEY_PASSWORD=traviskey

二进制
CI/android/vcmi-travis.jks


+ 7 - 6
android/vcmi-app/build.gradle

@@ -17,7 +17,7 @@ android {
 
 	signingConfigs {
 		releaseSigning
-		LoadSigningConfig(PROJECT_PATH_BASE)
+		LoadSigningConfig()
 	}
 
 	buildTypes {
@@ -119,16 +119,17 @@ def ResolveGitInfo() {
 }
 
 def SigningPropertiesPath(final basePath) {
-	return file(basePath + "/.github/CI/signing.properties")
+	return file("${basePath}/signing.properties")
 }
 
 def SigningKeystorePath(final basePath, final keystoreFileName) {
-	return file(basePath + "/.github/CI/" + keystoreFileName)
+	return file("${basePath}/${keystoreFileName}")
 }
 
-def LoadSigningConfig(final basePath) {
+def LoadSigningConfig() {
+	final def projectRoot = "${project.projectDir}/../../CI/android"
 	final def props = new Properties()
-	final def propFile = SigningPropertiesPath(basePath)
+	final def propFile = SigningPropertiesPath(projectRoot)
 	if (propFile.canRead()) {
 		props.load(new FileInputStream(propFile))
 
@@ -138,7 +139,7 @@ def LoadSigningConfig(final basePath) {
 			&& props.containsKey('KEY_ALIAS')
 			&& props.containsKey('KEY_PASSWORD')) {
 
-			android.signingConfigs.releaseSigning.storeFile = SigningKeystorePath(basePath, props['STORE_FILE'])
+			android.signingConfigs.releaseSigning.storeFile = SigningKeystorePath(projectRoot, props['STORE_FILE'])
 			android.signingConfigs.releaseSigning.storePassword = props['STORE_PASSWORD']
 			android.signingConfigs.releaseSigning.keyAlias = props['KEY_ALIAS']
 			android.signingConfigs.releaseSigning.keyPassword = props['KEY_PASSWORD']