Skip to content

Commit

Permalink
Merge pull request #3308 from aeddi/fix/aeddi/remove-jcenter-deps
Browse files Browse the repository at this point in the history
  • Loading branch information
aeddi committed May 6, 2021
2 parents 44e722c + 8204e67 commit 7925402
Show file tree
Hide file tree
Showing 6 changed files with 79 additions and 67 deletions.
2 changes: 1 addition & 1 deletion js/android/build.gradle
Expand Up @@ -9,7 +9,7 @@ buildscript {
}
repositories {
google()
jcenter()
mavenCentral()
}
dependencies {
classpath('com.android.tools.build:gradle:4.1.3')
Expand Down
4 changes: 2 additions & 2 deletions js/ios/OpenSSL-Universal-Override.podspec
@@ -1,11 +1,11 @@
Pod::Spec.new do |s|
s.name = "OpenSSL-Universal"
s.version = "1.0.2.20"
s.version = "1.1.180"
s.summary = "OpenSSL for iOS"
s.description = "OpenSSL is an SSL/TLS and Crypto toolkit. Supports iOS 64 bits archs including Simulator (arm64,armv64e,x86_64)."
s.homepage = "https://github.com/krzyzanowskim/OpenSSL"
s.license = { :type => 'OpenSSL (OpenSSL/SSLeay)' }
s.source = { :git => "https://github.com/krzyzanowskim/OpenSSL.git", :tag => "1.0.220" }
s.source = { :git => "https://github.com/krzyzanowskim/OpenSSL.git", :tag => "1.1.180" }

s.authors = {'Mark J. Cox' => 'mark@openssl.org',
'Ralf S. Engelschall' => 'rse@openssl.org',
Expand Down
3 changes: 2 additions & 1 deletion js/ios/Podfile
Expand Up @@ -24,7 +24,8 @@ target 'Berty' do
#
# Note that if you have use_frameworks! enabled, Flipper will not work and
# you should disable these next few lines.
use_flipper!
# FIX see: https://github.com/facebook/flipper/issues/2215#issuecomment-829102757
use_flipper!({ 'Flipper-Folly' => '2.5.3', 'Flipper' => '0.87.0', 'Flipper-RSocket' => '1.3.1' })

post_install do |installer|
flipper_post_install(installer)
Expand Down
127 changes: 69 additions & 58 deletions js/ios/Podfile.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion js/package.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions js/yarn.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 7925402

Please sign in to comment.