Skip to content

Commit 928d2e0

Browse files
author
ThibaultBee
committed
chore(build): remove jcenter as a dependency repository and update dependencies
1 parent bf2067b commit 928d2e0

File tree

16 files changed

+2435
-2256
lines changed

16 files changed

+2435
-2256
lines changed

‎android/build.gradle‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@ buildscript {
44

55
repositories {
66
google()
7-
jcenter()
7+
mavenCentral()
88
}
99

1010
dependencies {
11-
classpath 'com.android.tools.build:gradle:3.2.1'
11+
classpath 'com.android.tools.build:gradle:4.2.2'
1212
// noinspection DifferentKotlinGradleVersion
1313
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
1414
}
@@ -53,7 +53,6 @@ android {
5353
repositories {
5454
mavenCentral()
5555
mavenLocal()
56-
jcenter()
5756
google()
5857

5958
def found = false

‎android/gradle.properties‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
ApiVideoUploader_kotlinVersion=1.3.50
2-
ApiVideoUploader_compileSdkVersion=29
3-
ApiVideoUploader_buildToolsVersion=29.0.2
4-
ApiVideoUploader_targetSdkVersion=29
2+
ApiVideoUploader_compileSdkVersion=31
3+
ApiVideoUploader_buildToolsVersion=30.0.2
4+
ApiVideoUploader_targetSdkVersion=31
5+
android.useAndroidX=true

‎example/android/app/src/main/AndroidManifest.xml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,8 @@
1818
android:label="@string/app_name"
1919
android:configChanges="keyboard|keyboardHidden|orientation|screenSize|uiMode"
2020
android:launchMode="singleTask"
21-
android:windowSoftInputMode="adjustResize">
21+
android:windowSoftInputMode="adjustResize"
22+
android:exported="true">
2223
<intent-filter>
2324
<action android:name="android.intent.action.MAIN" />
2425
<category android:name="android.intent.category.LAUNCHER" />

‎example/android/build.gradle‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,18 @@
22

33
buildscript {
44
ext {
5-
buildToolsVersion = "29.0.2"
5+
buildToolsVersion = "30.0.2"
66
minSdkVersion = 24
7-
compileSdkVersion = 29
8-
targetSdkVersion = 29
9-
ndkVersion = "21.4.7075529"
7+
compileSdkVersion = 31
8+
targetSdkVersion = 31
9+
ndkVersion = "23.1.7779620"
1010
}
1111
repositories {
1212
google()
13-
jcenter()
13+
mavenCentral()
1414
}
1515
dependencies {
16-
classpath("com.android.tools.build:gradle:3.5.3")
16+
classpath("com.android.tools.build:gradle:4.2.2")
1717

1818
// NOTE: Do not place your application dependencies here; they belong
1919
// in the individual module build.gradle files
@@ -33,7 +33,7 @@ allprojects {
3333
}
3434

3535
google()
36-
jcenter()
36+
mavenCentral()
3737
maven { url 'https://www.jitpack.io' }
3838
}
3939
}

‎example/android/gradle.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,4 +19,4 @@
1919

2020
android.useAndroidX=true
2121
android.enableJetifier=true
22-
FLIPPER_VERSION=0.54.0
22+
FLIPPER_VERSION=0.126.0

‎example/android/gradle/wrapper/gradle-wrapper.properties‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
1+
#Mon Jan 17 13:13:56 CET 2022
12
distributionBase=GRADLE_USER_HOME
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-bin.zip
24
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-6.2-all.zip
4-
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6+
zipStoreBase=GRADLE_USER_HOME

‎example/ios/Example.xcodeproj/project.pbxproj‎

Lines changed: 37 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -11,22 +11,20 @@
1111
213D7CFF27848C1700E90784 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 213D7CFA27848C1700E90784 /* main.m */; };
1212
213D7D0027848C1700E90784 /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 213D7CFB27848C1700E90784 /* Images.xcassets */; };
1313
213D7D0127848C1700E90784 /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 213D7CFC27848C1700E90784 /* AppDelegate.m */; };
14-
FFB7EC1FC4B5C69C4A0F0DA9 /* libPods-Example.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 6726E55E0B45191A080FBAD4 /* libPods-Example.a */; };
14+
C74C047FAB7EE5B445C0851B /* libPods-Example.a in Frameworks */ = {isa = PBXBuildFile; fileRef = C8D1615293777F3E32AB7898 /* libPods-Example.a */; };
1515
/* End PBXBuildFile section */
1616

1717
/* Begin PBXFileReference section */
18-
0533BAA30F3AE25D0B1C8C8C /* Pods-Example.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Example.debug.xcconfig"; path = "Target Support Files/Pods-Example/Pods-Example.debug.xcconfig"; sourceTree = "<group>"; };
1918
13B07F961A680F5B00A75B9A /* Example.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Example.app; sourceTree = BUILT_PRODUCTS_DIR; };
2019
213D7CF827848C1700E90784 /* LaunchScreen.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = LaunchScreen.storyboard; sourceTree = "<group>"; };
2120
213D7CF927848C1700E90784 /* AppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = "<group>"; };
2221
213D7CFA27848C1700E90784 /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = "<group>"; };
2322
213D7CFB27848C1700E90784 /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Images.xcassets; sourceTree = "<group>"; };
2423
213D7CFC27848C1700E90784 /* AppDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AppDelegate.m; sourceTree = "<group>"; };
2524
213D7CFD27848C1700E90784 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
26-
37BEA2C1EC7717483484C488 /* Pods-Example.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Example.release.xcconfig"; path = "Target Support Files/Pods-Example/Pods-Example.release.xcconfig"; sourceTree = "<group>"; };
27-
47F7ED3B7971BE374F7B8635 /* Pods-Example.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Example.debug.xcconfig"; path = "Target Support Files/Pods-Example/Pods-Example.debug.xcconfig"; sourceTree = "<group>"; };
28-
6726E55E0B45191A080FBAD4 /* libPods-Example.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-Example.a"; sourceTree = BUILT_PRODUCTS_DIR; };
29-
E00ACF0FDA8BF921659E2F9A /* Pods-Example.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Example.release.xcconfig"; path = "Target Support Files/Pods-Example/Pods-Example.release.xcconfig"; sourceTree = "<group>"; };
25+
45C0FD4D04A41006A4EE7BE5 /* Pods-Example.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Example.release.xcconfig"; path = "Target Support Files/Pods-Example/Pods-Example.release.xcconfig"; sourceTree = "<group>"; };
26+
5DB827C33DA8F2ACC3910EDC /* Pods-Example.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Example.debug.xcconfig"; path = "Target Support Files/Pods-Example/Pods-Example.debug.xcconfig"; sourceTree = "<group>"; };
27+
C8D1615293777F3E32AB7898 /* libPods-Example.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-Example.a"; sourceTree = BUILT_PRODUCTS_DIR; };
3028
ED297162215061F000B7C4FE /* JavaScriptCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = JavaScriptCore.framework; path = System/Library/Frameworks/JavaScriptCore.framework; sourceTree = SDKROOT; };
3129
ED2971642150620600B7C4FE /* JavaScriptCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = JavaScriptCore.framework; path = Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS12.0.sdk/System/Library/Frameworks/JavaScriptCore.framework; sourceTree = DEVELOPER_DIR; };
3230
/* End PBXFileReference section */
@@ -36,7 +34,7 @@
3634
isa = PBXFrameworksBuildPhase;
3735
buildActionMask = 2147483647;
3836
files = (
39-
FFB7EC1FC4B5C69C4A0F0DA9 /* libPods-Example.a in Frameworks */,
37+
C74C047FAB7EE5B445C0851B /* libPods-Example.a in Frameworks */,
4038
);
4139
runOnlyForDeploymentPostprocessing = 0;
4240
};
@@ -61,18 +59,16 @@
6159
children = (
6260
ED297162215061F000B7C4FE /* JavaScriptCore.framework */,
6361
ED2971642150620600B7C4FE /* JavaScriptCore.framework */,
64-
6726E55E0B45191A080FBAD4 /* libPods-Example.a */,
62+
C8D1615293777F3E32AB7898 /* libPods-Example.a */,
6563
);
6664
name = Frameworks;
6765
sourceTree = "<group>";
6866
};
6967
6B9684456A2045ADE5A6E47E /* Pods */ = {
7068
isa = PBXGroup;
7169
children = (
72-
47F7ED3B7971BE374F7B8635 /* Pods-Example.debug.xcconfig */,
73-
E00ACF0FDA8BF921659E2F9A /* Pods-Example.release.xcconfig */,
74-
0533BAA30F3AE25D0B1C8C8C /* Pods-Example.debug.xcconfig */,
75-
37BEA2C1EC7717483484C488 /* Pods-Example.release.xcconfig */,
70+
5DB827C33DA8F2ACC3910EDC /* Pods-Example.debug.xcconfig */,
71+
45C0FD4D04A41006A4EE7BE5 /* Pods-Example.release.xcconfig */,
7672
);
7773
path = Pods;
7874
sourceTree = "<group>";
@@ -113,14 +109,14 @@
113109
isa = PBXNativeTarget;
114110
buildConfigurationList = 13B07F931A680F5B00A75B9A /* Build configuration list for PBXNativeTarget "Example" */;
115111
buildPhases = (
116-
4F0A6FC082772762E3E4C96C /* [CP] Check Pods Manifest.lock */,
112+
89FED513BCDA112B6203BF50 /* [CP] Check Pods Manifest.lock */,
117113
FD10A7F022414F080027D42C /* Start Packager */,
118114
13B07F871A680F5B00A75B9A /* Sources */,
119115
13B07F8C1A680F5B00A75B9A /* Frameworks */,
120116
13B07F8E1A680F5B00A75B9A /* Resources */,
121117
00DD1BFF1BD5951E006B06BC /* Bundle React Native code and images */,
122-
C1D60D28B925C94BD88E79D7 /* [CP] Copy Pods Resources */,
123-
5CA0A07F4CA8E4B285D1F823 /* [CP] Embed Pods Frameworks */,
118+
1015C8070AC34BA44C9439E4 /* [CP] Embed Pods Frameworks */,
119+
8C141554434AB10B523A5315 /* [CP] Copy Pods Resources */,
124120
);
125121
buildRules = (
126122
);
@@ -188,49 +184,51 @@
188184
);
189185
runOnlyForDeploymentPostprocessing = 0;
190186
shellPath = /bin/sh;
191-
shellScript = "export NODE_BINARY=node\n../node_modules/react-native/scripts/react-native-xcode.sh\n";
187+
shellScript = "export NODE_BINARY=node\n../node_modules/react-native/scripts/react-native-xcode.sh index.tsx\n";
192188
};
193-
4F0A6FC082772762E3E4C96C /* [CP] Check Pods Manifest.lock */ = {
189+
1015C8070AC34BA44C9439E4 /* [CP] Embed Pods Frameworks */ = {
194190
isa = PBXShellScriptBuildPhase;
195191
buildActionMask = 2147483647;
196192
files = (
197193
);
198-
inputFileListPaths = (
199-
);
200194
inputPaths = (
201-
"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
202-
"${PODS_ROOT}/Manifest.lock",
203-
);
204-
name = "[CP] Check Pods Manifest.lock";
205-
outputFileListPaths = (
195+
"${PODS_ROOT}/Target Support Files/Pods-Example/Pods-Example-frameworks.sh",
196+
"${PODS_XCFRAMEWORKS_BUILD_DIR}/Flipper-DoubleConversion/double-conversion.framework/double-conversion",
197+
"${PODS_XCFRAMEWORKS_BUILD_DIR}/OpenSSL-Universal/OpenSSL.framework/OpenSSL",
206198
);
199+
name = "[CP] Embed Pods Frameworks";
207200
outputPaths = (
208-
"$(DERIVED_FILE_DIR)/Pods-Example-checkManifestLockResult.txt",
201+
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/double-conversion.framework",
202+
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/OpenSSL.framework",
209203
);
210204
runOnlyForDeploymentPostprocessing = 0;
211205
shellPath = /bin/sh;
212-
shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
206+
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Example/Pods-Example-frameworks.sh\"\n";
213207
showEnvVarsInLog = 0;
214208
};
215-
5CA0A07F4CA8E4B285D1F823 /* [CP] Embed Pods Frameworks */ = {
209+
89FED513BCDA112B6203BF50 /* [CP] Check Pods Manifest.lock */ = {
216210
isa = PBXShellScriptBuildPhase;
217211
buildActionMask = 2147483647;
218212
files = (
219213
);
214+
inputFileListPaths = (
215+
);
220216
inputPaths = (
221-
"${PODS_ROOT}/Target Support Files/Pods-Example/Pods-Example-frameworks.sh",
222-
"${PODS_XCFRAMEWORKS_BUILD_DIR}/OpenSSL-Universal/OpenSSL.framework/OpenSSL",
217+
"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
218+
"${PODS_ROOT}/Manifest.lock",
219+
);
220+
name = "[CP] Check Pods Manifest.lock";
221+
outputFileListPaths = (
223222
);
224-
name = "[CP] Embed Pods Frameworks";
225223
outputPaths = (
226-
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/OpenSSL.framework",
224+
"$(DERIVED_FILE_DIR)/Pods-Example-checkManifestLockResult.txt",
227225
);
228226
runOnlyForDeploymentPostprocessing = 0;
229227
shellPath = /bin/sh;
230-
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Example/Pods-Example-frameworks.sh\"\n";
228+
shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
231229
showEnvVarsInLog = 0;
232230
};
233-
C1D60D28B925C94BD88E79D7 /* [CP] Copy Pods Resources */ = {
231+
8C141554434AB10B523A5315 /* [CP] Copy Pods Resources */ = {
234232
isa = PBXShellScriptBuildPhase;
235233
buildActionMask = 2147483647;
236234
files = (
@@ -284,14 +282,15 @@
284282
/* Begin XCBuildConfiguration section */
285283
13B07F941A680F5B00A75B9A /* Debug */ = {
286284
isa = XCBuildConfiguration;
287-
baseConfigurationReference = 0533BAA30F3AE25D0B1C8C8C /* Pods-Example.debug.xcconfig */;
285+
baseConfigurationReference = 5DB827C33DA8F2ACC3910EDC /* Pods-Example.debug.xcconfig */;
288286
buildSettings = {
289287
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
290288
CLANG_ENABLE_MODULES = YES;
291289
CURRENT_PROJECT_VERSION = 1;
292290
DEVELOPMENT_TEAM = GBC36KP98K;
293291
ENABLE_BITCODE = NO;
294292
INFOPLIST_FILE = "$(SRCROOT)/Example/Info.plist";
293+
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
295294
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
296295
OTHER_LDFLAGS = (
297296
"$(inherited)",
@@ -308,13 +307,14 @@
308307
};
309308
13B07F951A680F5B00A75B9A /* Release */ = {
310309
isa = XCBuildConfiguration;
311-
baseConfigurationReference = 37BEA2C1EC7717483484C488 /* Pods-Example.release.xcconfig */;
310+
baseConfigurationReference = 45C0FD4D04A41006A4EE7BE5 /* Pods-Example.release.xcconfig */;
312311
buildSettings = {
313312
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
314313
CLANG_ENABLE_MODULES = YES;
315314
CURRENT_PROJECT_VERSION = 1;
316315
DEVELOPMENT_TEAM = GBC36KP98K;
317316
INFOPLIST_FILE = "$(SRCROOT)/Example/Info.plist";
317+
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
318318
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
319319
OTHER_LDFLAGS = (
320320
"$(inherited)",
@@ -375,7 +375,7 @@
375375
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
376376
GCC_WARN_UNUSED_FUNCTION = YES;
377377
GCC_WARN_UNUSED_VARIABLE = YES;
378-
IPHONEOS_DEPLOYMENT_TARGET = 10.0;
378+
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
379379
LD_RUNPATH_SEARCH_PATHS = "/usr/lib/swift $(inherited)";
380380
LIBRARY_SEARCH_PATHS = (
381381
"\"$(TOOLCHAIN_DIR)/usr/lib/swift/$(PLATFORM_NAME)\"",
@@ -428,7 +428,7 @@
428428
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
429429
GCC_WARN_UNUSED_FUNCTION = YES;
430430
GCC_WARN_UNUSED_VARIABLE = YES;
431-
IPHONEOS_DEPLOYMENT_TARGET = 10.0;
431+
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
432432
LD_RUNPATH_SEARCH_PATHS = "/usr/lib/swift $(inherited)";
433433
LIBRARY_SEARCH_PATHS = (
434434
"\"$(TOOLCHAIN_DIR)/usr/lib/swift/$(PLATFORM_NAME)\"",

‎example/ios/Podfile‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,21 @@
11
require_relative '../node_modules/react-native/scripts/react_native_pods'
22
require_relative '../node_modules/@react-native-community/cli-platform-ios/native_modules'
33

4-
platform :ios, '10.0'
4+
platform :ios, '11.0'
55

66
target 'Example' do
77
config = use_native_modules!
88

99
use_react_native!(:path => config["reactNativePath"])
1010

1111
pod 'react-native-video-uploader', :path => '../..'
12-
pod 'rn-fetch-blob', :path => '../node_modules/rn-fetch-blob'
12+
pod 'react-native-blob-util', :path => '../node_modules/react-native-blob-util'
1313

1414
# Enables Flipper.
1515
#
1616
# Note that if you have use_frameworks! enabled, Flipper will not work and
1717
# you should disable these next few lines.
18-
use_flipper!({ 'Flipper-Folly' => '2.5.3', 'Flipper' => '0.87.0', 'Flipper-RSocket' => '1.3.1' })
18+
use_flipper!({ 'Flipper' => '0.126.0' })
1919

2020
post_install do |installer|
2121
flipper_post_install(installer)

0 commit comments

Comments
 (0)