fastlane-plugin-match_keystore 0.1.11 → 0.1.16
Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: aaedb3d25e8614b96c43af4e88ddbc46f56e71a7a97a92d2336507afc3afded8
|
4
|
+
data.tar.gz: 741fc33e956879046126da3fec54cb6f939b34eb8859e22d27244de8a7e6f823
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: e0d3ef8b5d0b9c5a66fcc8bece867e8d230e9f44764b963774cbdfbe110b38f7ef2446bf9592fd913716da8267471ef1cb7d2b6d30a70e494ef8ae75d78c84a9
|
7
|
+
data.tar.gz: 37849dd986d716d6ce16ab7fe8af4f3d18d7b8c3a1840f6f7d4ccade7121b7ced9ac2085e486c8c4442da6f7bf76435ac7581267a730bb204619f5c41d8b558a
|
data/README.md
CHANGED
@@ -24,13 +24,18 @@ The keystore properties are encrypted with AES in order to secure sensitive data
|
|
24
24
|
|
25
25
|
```ruby
|
26
26
|
lane :release_and_sign do |options|
|
27
|
-
|
27
|
+
gradle(task: "clean")
|
28
28
|
gradle(task: 'assemble', build_type: 'Release')
|
29
29
|
|
30
30
|
signed_apk_path = match_keystore(
|
31
31
|
git_url: "https://github.com/<GITHUB_USERNAME>/keystores.git", # Please use a private Git repository !
|
32
32
|
package_name: "com.your.package.name",
|
33
33
|
apk_path: "/app/build/outputs/apk/app-release.apk" # Or path without APK: /app/build/outputs/apk/
|
34
|
+
# Optional:
|
35
|
+
match_secret: "A-very-str0ng-password!", # The secret use to encrypt/decrypt Keystore passwords on Git repo (for CI)
|
36
|
+
existing_keystore: "assets/existing-keystore.jks", # Optional, if needed to import an existing keystore
|
37
|
+
override_keystore: true, # Optional, override an existing Keystore on Git repo
|
38
|
+
keystore_data: "assets/keystore.json" # Optional, all data required to create a new Keystore (use to bypass prompt)
|
34
39
|
)
|
35
40
|
|
36
41
|
# Return the path of signed APK (useful for other lanes such as `publish_to_firebase`, `upload_to_play_store`)
|
@@ -15,11 +15,21 @@ module Fastlane
|
|
15
15
|
|
16
16
|
class MatchKeystoreAction < Action
|
17
17
|
|
18
|
+
def self.openssl_path
|
19
|
+
path = "/usr/local/opt/openssl@1.1/bin"
|
20
|
+
path
|
21
|
+
end
|
22
|
+
|
18
23
|
def self.to_md5(value)
|
19
24
|
hash_value = Digest::MD5.hexdigest value
|
20
25
|
hash_value
|
21
26
|
end
|
22
27
|
|
28
|
+
def self.sha512(value)
|
29
|
+
hash_value = Digest::SHA512.hexdigest value
|
30
|
+
hash_value
|
31
|
+
end
|
32
|
+
|
23
33
|
def self.load_json(json_path)
|
24
34
|
file = File.read(json_path)
|
25
35
|
data_hash = JSON.parse(file)
|
@@ -53,52 +63,208 @@ module Fastlane
|
|
53
63
|
android_home
|
54
64
|
end
|
55
65
|
|
56
|
-
def self.
|
66
|
+
def self.get_build_tools_version(targeted_version)
|
67
|
+
path = self.get_build_tools(targeted_version)
|
68
|
+
version = path.split('/').last
|
69
|
+
version
|
70
|
+
end
|
71
|
+
|
72
|
+
def self.get_build_tools(targeted_version)
|
57
73
|
android_home = self.get_android_home()
|
58
74
|
build_tools_root = File.join(android_home, '/build-tools')
|
59
75
|
|
60
|
-
|
61
|
-
|
62
|
-
|
63
|
-
build_tools_last_version = sub_dir
|
76
|
+
build_tools_path = ""
|
77
|
+
if !targeted_version.to_s.strip.empty?
|
78
|
+
build_tools_path = File.join(build_tools_root, "/#{targeted_version}/")
|
64
79
|
end
|
65
80
|
|
66
|
-
|
81
|
+
if !File.directory?(build_tools_path)
|
82
|
+
sub_dirs = Dir.glob(File.join(build_tools_root, '*', ''))
|
83
|
+
build_tools_last_version = ''
|
84
|
+
for sub_dir in sub_dirs
|
85
|
+
build_tools_last_version = sub_dir
|
86
|
+
end
|
87
|
+
build_tools_path = build_tools_last_version
|
88
|
+
end
|
89
|
+
|
90
|
+
build_tools_path
|
67
91
|
end
|
68
92
|
|
69
|
-
def self.
|
70
|
-
|
71
|
-
|
72
|
-
|
93
|
+
def self.check_ssl_version(forceOpenSSL)
|
94
|
+
libressl_min = '2.9'
|
95
|
+
openssl_min = '1.1.1'
|
96
|
+
|
97
|
+
openssl = self.openssl(forceOpenSSL)
|
98
|
+
output = `#{openssl} version`
|
99
|
+
if !output.start_with?("LibreSSL") && !output.start_with?("OpenSSL")
|
100
|
+
raise "Please install OpenSSL '#{openssl_min}' at least OR LibreSSL #{libressl_min}' at least"
|
73
101
|
end
|
74
|
-
UI.message("
|
102
|
+
UI.message("SSL/TLS protocol library: '#{output.strip!}'")
|
103
|
+
|
104
|
+
# Check minimum verion:
|
105
|
+
vesion = output.to_str.scan(/[0-9\.]{1,}/).first
|
106
|
+
UI.message("SSL/TLS protocol version: '#{vesion}'")
|
107
|
+
if self.is_libre_ssl(forceOpenSSL)
|
108
|
+
if Gem::Version.new(vesion) < Gem::Version.new(libressl_min)
|
109
|
+
raise "Minimum version for LibreSSL is '#{libressl_min}', please update it. Use homebrew is your are Mac user, and update ~/.bah_profile or ~/.zprofile"
|
110
|
+
end
|
111
|
+
else
|
112
|
+
if Gem::Version.new(vesion) > Gem::Version.new(openssl_min)
|
113
|
+
raise "Minimum version for OpenSSL is '#{openssl_min}' please update it. Use homebrew is your are Mac user, and update ~/.bah_profile or ~/.zprofile"
|
114
|
+
end
|
115
|
+
end
|
116
|
+
|
117
|
+
output.strip
|
118
|
+
end
|
119
|
+
|
120
|
+
def self.openssl(forceOpenSSL)
|
121
|
+
if forceOpenSSL
|
122
|
+
path = openssl_path
|
123
|
+
output = "#{path}/openssl"
|
124
|
+
else
|
125
|
+
output = "openssl"
|
126
|
+
end
|
127
|
+
output
|
128
|
+
end
|
129
|
+
|
130
|
+
def self.is_libre_ssl(forceOpenSSL)
|
131
|
+
result = false
|
132
|
+
openssl = self.openssl(forceOpenSSL)
|
133
|
+
output = `#{openssl} version`
|
134
|
+
if output.start_with?("LibreSSL")
|
135
|
+
result = true
|
136
|
+
end
|
137
|
+
result
|
75
138
|
end
|
76
139
|
|
77
140
|
def self.gen_key(key_path, password)
|
78
141
|
`rm -f '#{key_path}'`
|
79
|
-
|
142
|
+
shaValue = self.sha512(password)
|
143
|
+
`echo "#{shaValue}" > '#{key_path}'`
|
80
144
|
end
|
81
145
|
|
82
|
-
def self.encrypt_file(clear_file, encrypt_file, key_path)
|
146
|
+
def self.encrypt_file(clear_file, encrypt_file, key_path, forceOpenSSL)
|
83
147
|
`rm -f '#{encrypt_file}'`
|
84
|
-
|
148
|
+
libre_ssl = self.is_libre_ssl(forceOpenSSL)
|
149
|
+
openssl_bin = self.openssl(forceOpenSSL)
|
150
|
+
`#{openssl_bin} enc -aes-256-cbc -salt -pbkdf2 -in '#{clear_file}' -out '#{encrypt_file}' -pass file:'#{key_path}'`
|
85
151
|
end
|
86
152
|
|
87
|
-
def self.decrypt_file(encrypt_file, clear_file, key_path)
|
153
|
+
def self.decrypt_file(encrypt_file, clear_file, key_path, forceOpenSSL)
|
88
154
|
`rm -f '#{clear_file}'`
|
89
|
-
|
155
|
+
libre_ssl = self.is_libre_ssl(forceOpenSSL)
|
156
|
+
openssl_bin = self.openssl(forceOpenSSL)
|
157
|
+
`#{openssl_bin} enc -d -aes-256-cbc -pbkdf2 -in '#{encrypt_file}' -out '#{clear_file}' -pass file:'#{key_path}'`
|
158
|
+
end
|
159
|
+
|
160
|
+
def self.assert_equals(test_name, excepted, value)
|
161
|
+
puts "Unit Test: #{test_name}"
|
162
|
+
if value != excepted
|
163
|
+
puts " - Excepted: #{excepted}"
|
164
|
+
puts " - Returned: #{value}"
|
165
|
+
raise "Unit Test - #{test_name} error!"
|
166
|
+
else
|
167
|
+
puts " - OK"
|
168
|
+
end
|
90
169
|
end
|
91
170
|
|
92
|
-
def self.
|
171
|
+
def self.test_security
|
93
172
|
|
94
|
-
|
173
|
+
self.check_ssl_version(false)
|
174
|
+
|
175
|
+
# Clear temp files
|
176
|
+
temp_dir = File.join(Dir.pwd, '/temp/')
|
177
|
+
FileUtils.rm_rf(temp_dir)
|
178
|
+
Dir.mkdir(temp_dir)
|
179
|
+
|
180
|
+
fakeValue = "4esfsf4dsfds!efs5ZDOJF"
|
181
|
+
# Check MD5
|
182
|
+
md5value = self.to_md5(fakeValue)
|
183
|
+
excepted = "1c815cd208fe08076c9e7b6595d121d1"
|
184
|
+
self.assert_equals("MD5", excepted, md5value)
|
185
|
+
|
186
|
+
# Check SHA-512
|
187
|
+
shaValue = self.sha512(fakeValue)
|
188
|
+
excepted = "cc6a7b0d89cc61c053f7018a305672bdb82bc07e5015f64bb063d9662be4ec81ec8afa819b009de266482b6bd56b7068def2524c32f5b5d4d9db49ee4578499d"
|
189
|
+
self.assert_equals("SHA-512", excepted, shaValue)
|
190
|
+
|
191
|
+
# Check SHA-512-File
|
192
|
+
key_path = File.join(Dir.pwd, '/temp/key.txt')
|
193
|
+
self.gen_key(key_path, fakeValue)
|
194
|
+
shaValue = self.get_file_content(key_path).strip!
|
195
|
+
excepted = "cc6a7b0d89cc61c053f7018a305672bdb82bc07e5015f64bb063d9662be4ec81ec8afa819b009de266482b6bd56b7068def2524c32f5b5d4d9db49ee4578499d"
|
196
|
+
self.assert_equals("SHA-512-File", excepted, shaValue)
|
197
|
+
|
198
|
+
|
199
|
+
# Check LibreSSL
|
200
|
+
result = self.is_libre_ssl(false)
|
201
|
+
self.assert_equals("Is-LibreSSL", true, result)
|
202
|
+
result = self.is_libre_ssl(true)
|
203
|
+
self.assert_equals("Is-LibreSSL", false, result)
|
204
|
+
|
205
|
+
# Encrypt OpenSSL
|
206
|
+
clear_file = File.join(Dir.pwd, '/temp/clear.txt')
|
207
|
+
openssl_encrypt_file = File.join(Dir.pwd, '/temp/openssl_encrypted.txt')
|
208
|
+
self.content_to_file(clear_file, fakeValue)
|
209
|
+
self.encrypt_file(clear_file, openssl_encrypt_file, key_path, true)
|
210
|
+
result = File.file?(openssl_encrypt_file) && File.size(openssl_encrypt_file) > 10
|
211
|
+
self.assert_equals("Encrypt-OpenSSL", true, result)
|
212
|
+
|
213
|
+
# Encrypt LibreSSL
|
214
|
+
encrypt_file_libre = File.join(Dir.pwd, '/temp/libressl_encrypted.txt')
|
215
|
+
self.content_to_file(clear_file, fakeValue)
|
216
|
+
self.encrypt_file(clear_file, encrypt_file_libre, key_path, false)
|
217
|
+
result = File.file?(encrypt_file_libre) && File.size(encrypt_file_libre) > 10
|
218
|
+
self.assert_equals("Encrypt-LibreSSL", true, result)
|
219
|
+
|
220
|
+
# exit!
|
221
|
+
|
222
|
+
# Decrypt OpenSSL (from OpenSSL)
|
223
|
+
openssl_clear_file = File.join(Dir.pwd, '/temp/openssl_clear.txt')
|
224
|
+
self.decrypt_file(openssl_encrypt_file, openssl_clear_file, key_path, true)
|
225
|
+
decrypted = self.get_file_content(openssl_clear_file).strip!
|
226
|
+
self.assert_equals("Decrypt-OpenSSL", fakeValue, decrypted)
|
227
|
+
|
228
|
+
# Decrypt LibreSSL (from LibreSSL)
|
229
|
+
libressl_clear_file = File.join(Dir.pwd, '/temp/libressl_clear.txt')
|
230
|
+
self.decrypt_file(encrypt_file_libre, libressl_clear_file, key_path, false)
|
231
|
+
decrypted = self.get_file_content(libressl_clear_file).strip!
|
232
|
+
self.assert_equals("Decrypt-LibreSSL", fakeValue, decrypted)
|
233
|
+
|
234
|
+
# Decrypt LibreSSL (from OpenSSL)
|
235
|
+
libressl_clear_file = File.join(Dir.pwd, '/temp/libressl_from_openssl_clear.txt')
|
236
|
+
self.decrypt_file(openssl_encrypt_file, libressl_clear_file, key_path, false)
|
237
|
+
decrypted = self.get_file_content(libressl_clear_file).strip!
|
238
|
+
self.assert_equals("Decrypt-LibreSSL-from-OpenSSL", fakeValue, decrypted)
|
239
|
+
|
240
|
+
# Decrypt OpenSSL (from LibreSSL)
|
241
|
+
openssl_clear_file = File.join(Dir.pwd, '/temp/openssl_from_libressl_clear.txt')
|
242
|
+
self.decrypt_file(encrypt_file_libre, openssl_clear_file, key_path, true)
|
243
|
+
decrypted = self.get_file_content(openssl_clear_file).strip!
|
244
|
+
self.assert_equals("Decrypt-OpenSSL-from-LibreSSL", fakeValue, decrypted)
|
245
|
+
|
246
|
+
end
|
247
|
+
|
248
|
+
def self.sign_apk(apk_path, keystore_path, key_password, alias_name, alias_password, zip_align, version_targeted)
|
249
|
+
|
250
|
+
build_tools_path = self.get_build_tools(version_targeted)
|
251
|
+
UI.message("Build-tools path: #{build_tools_path}")
|
95
252
|
|
96
253
|
# https://developer.android.com/studio/command-line/zipalign
|
97
254
|
if zip_align == true
|
98
255
|
apk_path_aligned = apk_path.gsub(".apk", "-aligned.apk")
|
99
256
|
`rm -f '#{apk_path_aligned}'`
|
100
|
-
|
257
|
+
UI.message("Aligning APK (zipalign): #{apk_path}")
|
258
|
+
output = `#{build_tools_path}zipalign -v 4 '#{apk_path}' '#{apk_path_aligned}'`
|
259
|
+
puts ""
|
260
|
+
puts output
|
261
|
+
|
262
|
+
if !File.file?(apk_path_aligned)
|
263
|
+
raise "Aligned APK not exists!"
|
264
|
+
end
|
265
|
+
|
101
266
|
else
|
267
|
+
UI.message("No zip align!")
|
102
268
|
apk_path_aligned = apk_path
|
103
269
|
end
|
104
270
|
apk_path_signed = apk_path.gsub(".apk", "-signed.apk")
|
@@ -107,12 +273,42 @@ module Fastlane
|
|
107
273
|
|
108
274
|
# https://developer.android.com/studio/command-line/apksigner
|
109
275
|
`rm -f '#{apk_path_signed}'`
|
110
|
-
|
111
|
-
|
112
|
-
|
276
|
+
UI.message("Signing APK: #{apk_path_aligned}")
|
277
|
+
apksigner_opts = ""
|
278
|
+
build_tools_version = self.get_build_tools_version(version_targeted)
|
279
|
+
UI.message("Build-tools version: #{build_tools_version}")
|
280
|
+
if Gem::Version.new(build_tools_version) >= Gem::Version.new('30')
|
281
|
+
apksigner_opts = "--v4-signing-enabled false "
|
282
|
+
end
|
283
|
+
output = `#{build_tools_path}apksigner sign --ks '#{keystore_path}' --ks-key-alias '#{alias_name}' --ks-pass pass:'#{key_password}' --key-pass pass:'#{alias_password}' --v1-signing-enabled true --v2-signing-enabled true #{apksigner_opts}--out '#{apk_path_signed}' '#{apk_path_aligned}'`
|
284
|
+
puts ""
|
285
|
+
puts output
|
286
|
+
|
287
|
+
UI.message("Verifing APK signature: #{apk_path_signed}")
|
288
|
+
output = `#{build_tools_path}apksigner verify '#{apk_path_signed}'`
|
289
|
+
puts ""
|
290
|
+
puts output
|
113
291
|
`rm -f '#{apk_path_aligned}'`
|
114
292
|
|
115
293
|
apk_path_signed
|
294
|
+
end
|
295
|
+
|
296
|
+
def self.resolve_dir(path)
|
297
|
+
if !File.directory?(path)
|
298
|
+
path = File.join(Dir.pwd, path)
|
299
|
+
end
|
300
|
+
path
|
301
|
+
end
|
302
|
+
|
303
|
+
def self.resolve_file(path)
|
304
|
+
if !File.file?(path)
|
305
|
+
path = File.join(Dir.pwd, path)
|
306
|
+
end
|
307
|
+
path
|
308
|
+
end
|
309
|
+
|
310
|
+
def self.content_to_file(file_path, content)
|
311
|
+
`echo #{content} > #{file_path}`
|
116
312
|
end
|
117
313
|
|
118
314
|
def self.get_file_content(file_path)
|
@@ -129,9 +325,7 @@ module Fastlane
|
|
129
325
|
|
130
326
|
if !apk_path.to_s.end_with?(".apk")
|
131
327
|
|
132
|
-
|
133
|
-
apk_path = File.join(Dir.pwd, apk_path)
|
134
|
-
end
|
328
|
+
apk_path = self.resolve_dir(apk_path)
|
135
329
|
|
136
330
|
pattern = File.join(apk_path, '*.apk')
|
137
331
|
files = Dir[pattern]
|
@@ -144,11 +338,7 @@ module Fastlane
|
|
144
338
|
end
|
145
339
|
|
146
340
|
else
|
147
|
-
|
148
|
-
if !File.file?(apk_path)
|
149
|
-
apk_path = File.join(Dir.pwd, apk_path)
|
150
|
-
end
|
151
|
-
|
341
|
+
apk_path = self.resolve_file(apk_path)
|
152
342
|
end
|
153
343
|
|
154
344
|
apk_path
|
@@ -174,6 +364,15 @@ module Fastlane
|
|
174
364
|
match_secret = params[:match_secret]
|
175
365
|
override_keystore = params[:override_keystore]
|
176
366
|
keystore_data = params[:keystore_data]
|
367
|
+
clear_keystore = params[:clear_keystore]
|
368
|
+
unit_test = params[:unit_test]
|
369
|
+
build_tools_version = params[:build_tools_version]
|
370
|
+
|
371
|
+
# Test OpenSSL/LibreSSL
|
372
|
+
if unit_test
|
373
|
+
result_test = self.test_security
|
374
|
+
exit!
|
375
|
+
end
|
177
376
|
|
178
377
|
# Init constants:
|
179
378
|
keystore_name = 'keystore.jks'
|
@@ -189,7 +388,7 @@ module Fastlane
|
|
189
388
|
end
|
190
389
|
|
191
390
|
# Check OpenSSL:
|
192
|
-
self.
|
391
|
+
self.check_ssl_version(false)
|
193
392
|
|
194
393
|
# Init workign local directory:
|
195
394
|
dir_name = ENV['HOME'] + '/.match_keystore'
|
@@ -219,37 +418,44 @@ module Fastlane
|
|
219
418
|
raise "The security key '#{key_name}' is malformed, or not initialized!"
|
220
419
|
end
|
221
420
|
|
222
|
-
#
|
421
|
+
# Clear repo Keystore (local) - mostly for testing:
|
223
422
|
repo_dir = File.join(dir_name, self.to_md5(git_url))
|
224
|
-
|
423
|
+
if clear_keystore && File.directory?(repo_dir)
|
424
|
+
FileUtils.rm_rf(repo_dir)
|
425
|
+
UI.message("Local repo keystore (#{repo_dir}) directory deleted!")
|
426
|
+
end
|
427
|
+
|
428
|
+
# Create repo directory to sync remote Keystores repository:
|
225
429
|
unless File.directory?(repo_dir)
|
226
430
|
UI.message("Creating 'repo' directory...")
|
227
431
|
FileUtils.mkdir_p(repo_dir)
|
228
432
|
end
|
229
433
|
|
230
|
-
#
|
231
|
-
gitDir = File.join(repo_dir, '/.git')
|
232
|
-
unless File.directory?(gitDir)
|
233
|
-
UI.message("Cloning remote Keystores repository...")
|
234
|
-
puts ''
|
235
|
-
`git clone #{git_url} #{repo_dir}`
|
236
|
-
puts ''
|
237
|
-
end
|
238
|
-
|
239
|
-
# Create sub-directory for Android app:
|
434
|
+
# Check if package name defined:
|
240
435
|
if package_name.to_s.strip.empty?
|
241
436
|
raise "Package name is not defined!"
|
242
437
|
end
|
243
|
-
keystoreAppDir = File.join(repo_dir, package_name)
|
244
|
-
unless File.directory?(keystoreAppDir)
|
245
|
-
UI.message("Creating '#{package_name}' keystore directory...")
|
246
|
-
FileUtils.mkdir_p(keystoreAppDir)
|
247
|
-
end
|
248
438
|
|
439
|
+
# Define paths:
|
440
|
+
keystoreAppDir = File.join(repo_dir, package_name)
|
249
441
|
keystore_path = File.join(keystoreAppDir, keystore_name)
|
250
442
|
properties_path = File.join(keystoreAppDir, properties_name)
|
251
443
|
properties_encrypt_path = File.join(keystoreAppDir, properties_encrypt_name)
|
252
444
|
|
445
|
+
# Cloning/pulling GIT remote repository:
|
446
|
+
gitDir = File.join(repo_dir, '/.git')
|
447
|
+
if !File.directory?(gitDir)
|
448
|
+
UI.message("Cloning remote Keystores repository...")
|
449
|
+
puts ''
|
450
|
+
`git clone #{git_url} #{repo_dir}`
|
451
|
+
puts ''
|
452
|
+
else
|
453
|
+
UI.message("Pulling remote Keystores repository...")
|
454
|
+
puts ''
|
455
|
+
`cd #{repo_dir} && git pull`
|
456
|
+
puts ''
|
457
|
+
end
|
458
|
+
|
253
459
|
# Load parameters from JSON for CI or Unit Tests:
|
254
460
|
if keystore_data != nil && File.file?(keystore_data)
|
255
461
|
data_json = self.load_json(keystore_data)
|
@@ -266,6 +472,7 @@ module Fastlane
|
|
266
472
|
|
267
473
|
# Create keystore with command
|
268
474
|
override_keystore = !existing_keystore.to_s.strip.empty? && File.file?(existing_keystore)
|
475
|
+
UI.message("Existing Keystore: #{existing_keystore}")
|
269
476
|
if !File.file?(keystore_path) || override_keystore
|
270
477
|
|
271
478
|
if File.file?(keystore_path)
|
@@ -286,7 +493,7 @@ module Fastlane
|
|
286
493
|
end
|
287
494
|
|
288
495
|
# https://developer.android.com/studio/publish/app-signing
|
289
|
-
if !File.file?(existing_keystore)
|
496
|
+
if existing_keystore.to_s.strip.empty? || !File.file?(existing_keystore)
|
290
497
|
UI.message("Generating Android Keystore...")
|
291
498
|
|
292
499
|
full_name = self.prompt2(text: "Certificate First and Last Name: ", value: data_full_name)
|
@@ -327,7 +534,7 @@ module Fastlane
|
|
327
534
|
out_file.puts("aliasPassword=#{alias_password}")
|
328
535
|
out_file.close
|
329
536
|
|
330
|
-
self.encrypt_file(properties_path, properties_encrypt_path, key_path)
|
537
|
+
self.encrypt_file(properties_path, properties_encrypt_path, key_path, false)
|
331
538
|
File.delete(properties_path)
|
332
539
|
|
333
540
|
# Print Keystore data in repo:
|
@@ -344,7 +551,7 @@ module Fastlane
|
|
344
551
|
else
|
345
552
|
UI.message "Keystore file already exists, continue..."
|
346
553
|
|
347
|
-
self.decrypt_file(properties_encrypt_path, properties_path, key_path)
|
554
|
+
self.decrypt_file(properties_encrypt_path, properties_path, key_path, false)
|
348
555
|
|
349
556
|
properties = self.load_properties(properties_path)
|
350
557
|
key_password = properties['keyPassword']
|
@@ -372,7 +579,8 @@ module Fastlane
|
|
372
579
|
key_password,
|
373
580
|
alias_name,
|
374
581
|
alias_password,
|
375
|
-
true # Zip align
|
582
|
+
true, # Zip align
|
583
|
+
build_tools_version # Buil-tools version
|
376
584
|
)
|
377
585
|
puts ''
|
378
586
|
end
|
@@ -449,7 +657,22 @@ module Fastlane
|
|
449
657
|
env_name: "MATCH_KEYSTORE_JSON_PATH",
|
450
658
|
description: "Required data to import an existing keystore, or create a new one",
|
451
659
|
optional: true,
|
452
|
-
type: String)
|
660
|
+
type: String),
|
661
|
+
FastlaneCore::ConfigItem.new(key: :build_tools_version,
|
662
|
+
env_name: "MATCH_KEYSTORE_BUILD_TOOLS_VERSION",
|
663
|
+
description: "Set built-tools version (by default latest available on machine)",
|
664
|
+
optional: true,
|
665
|
+
type: String),
|
666
|
+
FastlaneCore::ConfigItem.new(key: :clear_keystore,
|
667
|
+
env_name: "MATCH_KEYSTORE_CLEAR",
|
668
|
+
description: "Clear the local keystore (false by default)",
|
669
|
+
optional: true,
|
670
|
+
type: Boolean),
|
671
|
+
FastlaneCore::ConfigItem.new(key: :unit_test,
|
672
|
+
env_name: "MATCH_KEYSTORE_UNIT_TESTS",
|
673
|
+
description: "launch Unit Tests (false by default)",
|
674
|
+
optional: true,
|
675
|
+
type: Boolean)
|
453
676
|
]
|
454
677
|
end
|
455
678
|
|
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: fastlane-plugin-match_keystore
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.1.
|
4
|
+
version: 0.1.16
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Christopher NEY
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2020-
|
11
|
+
date: 2020-09-08 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: pry
|
@@ -167,7 +167,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
167
167
|
- !ruby/object:Gem::Version
|
168
168
|
version: '0'
|
169
169
|
requirements: []
|
170
|
-
rubygems_version: 3.0.
|
170
|
+
rubygems_version: 3.0.3
|
171
171
|
signing_key:
|
172
172
|
specification_version: 4
|
173
173
|
summary: Easily sync your Android keystores across your team
|