Merge branch 'update-metadata-scripts'
This commit is contained in:
commit
e554df223b
16
Gemfile.lock
16
Gemfile.lock
|
@ -14,7 +14,7 @@ GEM
|
||||||
json (>= 1.5.1)
|
json (>= 1.5.1)
|
||||||
atomos (0.1.3)
|
atomos (0.1.3)
|
||||||
aws-eventstream (1.1.0)
|
aws-eventstream (1.1.0)
|
||||||
aws-partitions (1.296.0)
|
aws-partitions (1.300.0)
|
||||||
aws-sdk-core (3.94.0)
|
aws-sdk-core (3.94.0)
|
||||||
aws-eventstream (~> 1, >= 1.0.2)
|
aws-eventstream (~> 1, >= 1.0.2)
|
||||||
aws-partitions (~> 1, >= 1.239.0)
|
aws-partitions (~> 1, >= 1.239.0)
|
||||||
|
@ -23,11 +23,11 @@ GEM
|
||||||
aws-sdk-kms (1.30.0)
|
aws-sdk-kms (1.30.0)
|
||||||
aws-sdk-core (~> 3, >= 3.71.0)
|
aws-sdk-core (~> 3, >= 3.71.0)
|
||||||
aws-sigv4 (~> 1.1)
|
aws-sigv4 (~> 1.1)
|
||||||
aws-sdk-s3 (1.61.2)
|
aws-sdk-s3 (1.62.0)
|
||||||
aws-sdk-core (~> 3, >= 3.83.0)
|
aws-sdk-core (~> 3, >= 3.83.0)
|
||||||
aws-sdk-kms (~> 1)
|
aws-sdk-kms (~> 1)
|
||||||
aws-sigv4 (~> 1.1)
|
aws-sigv4 (~> 1.1)
|
||||||
aws-sigv4 (1.1.1)
|
aws-sigv4 (1.1.2)
|
||||||
aws-eventstream (~> 1.0, >= 1.0.2)
|
aws-eventstream (~> 1.0, >= 1.0.2)
|
||||||
babosa (1.0.3)
|
babosa (1.0.3)
|
||||||
claide (1.0.3)
|
claide (1.0.3)
|
||||||
|
@ -67,7 +67,7 @@ GEM
|
||||||
cocoapods-trunk (1.4.1)
|
cocoapods-trunk (1.4.1)
|
||||||
nap (>= 0.8, < 2.0)
|
nap (>= 0.8, < 2.0)
|
||||||
netrc (~> 0.11)
|
netrc (~> 0.11)
|
||||||
cocoapods-try (1.1.0)
|
cocoapods-try (1.2.0)
|
||||||
colored (1.2)
|
colored (1.2)
|
||||||
colored2 (3.1.2)
|
colored2 (3.1.2)
|
||||||
commander-fastlane (4.4.6)
|
commander-fastlane (4.4.6)
|
||||||
|
@ -92,7 +92,7 @@ GEM
|
||||||
faraday_middleware (0.13.1)
|
faraday_middleware (0.13.1)
|
||||||
faraday (>= 0.7.4, < 1.0)
|
faraday (>= 0.7.4, < 1.0)
|
||||||
fastimage (2.1.7)
|
fastimage (2.1.7)
|
||||||
fastlane (2.145.0)
|
fastlane (2.146.0)
|
||||||
CFPropertyList (>= 2.3, < 4.0.0)
|
CFPropertyList (>= 2.3, < 4.0.0)
|
||||||
addressable (>= 2.3, < 3.0.0)
|
addressable (>= 2.3, < 3.0.0)
|
||||||
aws-sdk-s3 (~> 1.0)
|
aws-sdk-s3 (~> 1.0)
|
||||||
|
@ -156,13 +156,13 @@ GEM
|
||||||
google-cloud-core (~> 1.2)
|
google-cloud-core (~> 1.2)
|
||||||
googleauth (~> 0.9)
|
googleauth (~> 0.9)
|
||||||
mini_mime (~> 1.0)
|
mini_mime (~> 1.0)
|
||||||
googleauth (0.11.0)
|
googleauth (0.12.0)
|
||||||
faraday (>= 0.17.3, < 2.0)
|
faraday (>= 0.17.3, < 2.0)
|
||||||
jwt (>= 1.4, < 3.0)
|
jwt (>= 1.4, < 3.0)
|
||||||
memoist (~> 0.16)
|
memoist (~> 0.16)
|
||||||
multi_json (~> 1.11)
|
multi_json (~> 1.11)
|
||||||
os (>= 0.9, < 2.0)
|
os (>= 0.9, < 2.0)
|
||||||
signet (~> 0.12)
|
signet (~> 0.14)
|
||||||
highline (1.7.10)
|
highline (1.7.10)
|
||||||
http-cookie (1.0.3)
|
http-cookie (1.0.3)
|
||||||
domain_name (~> 0.5)
|
domain_name (~> 0.5)
|
||||||
|
@ -223,7 +223,7 @@ GEM
|
||||||
unf_ext (0.0.7.7)
|
unf_ext (0.0.7.7)
|
||||||
unicode-display_width (1.7.0)
|
unicode-display_width (1.7.0)
|
||||||
word_wrap (1.0.0)
|
word_wrap (1.0.0)
|
||||||
xcodeproj (1.15.0)
|
xcodeproj (1.16.0)
|
||||||
CFPropertyList (>= 2.3.3, < 4.0)
|
CFPropertyList (>= 2.3.3, < 4.0)
|
||||||
atomos (~> 0.1.3)
|
atomos (~> 0.1.3)
|
||||||
claide (>= 1.0.2, < 2.0)
|
claide (>= 1.0.2, < 2.0)
|
||||||
|
|
2
Podfile
2
Podfile
|
@ -8,7 +8,7 @@ $tunnelkit_name = 'TunnelKit'
|
||||||
$tunnelkit_specs = ['Protocols/OpenVPN', 'Extra/LZO']
|
$tunnelkit_specs = ['Protocols/OpenVPN', 'Extra/LZO']
|
||||||
|
|
||||||
def shared_pods
|
def shared_pods
|
||||||
pod_version $tunnelkit_name, $tunnelkit_specs, '~> 2.2.2'
|
pod_version $tunnelkit_name, $tunnelkit_specs, '~> 2.2.3'
|
||||||
#pod_git $tunnelkit_name, $tunnelkit_specs, '735c1fd'
|
#pod_git $tunnelkit_name, $tunnelkit_specs, '735c1fd'
|
||||||
#pod_path $tunnelkit_name, $tunnelkit_specs, '..'
|
#pod_path $tunnelkit_name, $tunnelkit_specs, '..'
|
||||||
pod 'SSZipArchive'
|
pod 'SSZipArchive'
|
||||||
|
|
22
Podfile.lock
22
Podfile.lock
|
@ -21,17 +21,17 @@ PODS:
|
||||||
- Kvitto/Core (1.0.3):
|
- Kvitto/Core (1.0.3):
|
||||||
- DTFoundation/DTASN1 (~> 1.7.13)
|
- DTFoundation/DTASN1 (~> 1.7.13)
|
||||||
- MBProgressHUD (1.2.0)
|
- MBProgressHUD (1.2.0)
|
||||||
- OpenSSL-Apple (1.1.1f.6)
|
- OpenSSL-Apple (1.1.1g.6)
|
||||||
- SSZipArchive (2.2.2)
|
- SSZipArchive (2.2.2)
|
||||||
- SwiftyBeaver (1.9.1)
|
- SwiftyBeaver (1.9.1)
|
||||||
- TunnelKit/AppExtension (2.2.2):
|
- TunnelKit/AppExtension (2.2.3):
|
||||||
- SwiftyBeaver
|
- SwiftyBeaver
|
||||||
- TunnelKit/Core
|
- TunnelKit/Core
|
||||||
- TunnelKit/Core (2.2.2):
|
- TunnelKit/Core (2.2.3):
|
||||||
- SwiftyBeaver
|
- SwiftyBeaver
|
||||||
- TunnelKit/Extra/LZO (2.2.2)
|
- TunnelKit/Extra/LZO (2.2.3)
|
||||||
- TunnelKit/Protocols/OpenVPN (2.2.2):
|
- TunnelKit/Protocols/OpenVPN (2.2.3):
|
||||||
- OpenSSL-Apple (~> 1.1.1f.6)
|
- OpenSSL-Apple (~> 1.1.1g.6)
|
||||||
- TunnelKit/AppExtension
|
- TunnelKit/AppExtension
|
||||||
- TunnelKit/Core
|
- TunnelKit/Core
|
||||||
|
|
||||||
|
@ -49,8 +49,8 @@ DEPENDENCIES:
|
||||||
- Kvitto
|
- Kvitto
|
||||||
- MBProgressHUD
|
- MBProgressHUD
|
||||||
- SSZipArchive
|
- SSZipArchive
|
||||||
- TunnelKit/Extra/LZO (~> 2.2.2)
|
- TunnelKit/Extra/LZO (~> 2.2.3)
|
||||||
- TunnelKit/Protocols/OpenVPN (~> 2.2.2)
|
- TunnelKit/Protocols/OpenVPN (~> 2.2.3)
|
||||||
|
|
||||||
SPEC REPOS:
|
SPEC REPOS:
|
||||||
https://github.com/cocoapods/specs.git:
|
https://github.com/cocoapods/specs.git:
|
||||||
|
@ -77,11 +77,11 @@ SPEC CHECKSUMS:
|
||||||
DTFoundation: 25aa19bb7c6e225b1dfae195604fb8cf1da0ab4c
|
DTFoundation: 25aa19bb7c6e225b1dfae195604fb8cf1da0ab4c
|
||||||
Kvitto: d451f893f84ad669850b7cb7d3f8781363e14232
|
Kvitto: d451f893f84ad669850b7cb7d3f8781363e14232
|
||||||
MBProgressHUD: 3ee5efcc380f6a79a7cc9b363dd669c5e1ae7406
|
MBProgressHUD: 3ee5efcc380f6a79a7cc9b363dd669c5e1ae7406
|
||||||
OpenSSL-Apple: 07d3f68add280b474278320232fb89625dd29fe9
|
OpenSSL-Apple: c9c1b9c5b2b1fc4e1758fc5f0836b58ae7fd8183
|
||||||
SSZipArchive: fa16b8cc4cdeceb698e5e5d9f67e9558532fbf23
|
SSZipArchive: fa16b8cc4cdeceb698e5e5d9f67e9558532fbf23
|
||||||
SwiftyBeaver: a1f5691458561414bcfab51874b2b7445451602b
|
SwiftyBeaver: a1f5691458561414bcfab51874b2b7445451602b
|
||||||
TunnelKit: 3b5756c750d9e4ef81d42df758680a70863db798
|
TunnelKit: 45fa5cf7ca17cce5590232465ad73508ab6e295e
|
||||||
|
|
||||||
PODFILE CHECKSUM: 00aec24437900c7e6f297063b24cc8f35ec1f484
|
PODFILE CHECKSUM: 0a4ea172e132cd9da361698c69c042bb04121162
|
||||||
|
|
||||||
COCOAPODS: 1.9.1
|
COCOAPODS: 1.9.1
|
||||||
|
|
|
@ -1 +1 @@
|
||||||
Subproject commit 32ca59c999c0540923ce06ce80e940ac9dc4884f
|
Subproject commit 51556e474ee477aa4226d5f138b103e9b3c82d37
|
|
@ -1 +1 @@
|
||||||
Subproject commit 4225491c306b3c6f047124a52bad701be029c13d
|
Subproject commit 96d5f0c5d5417a097367d7b65b3aeb1294df91b2
|
|
@ -1 +0,0 @@
|
||||||
../Submodules/Core/scripts/copy-release-notes.sh
|
|
Loading…
Reference in New Issue