Skip to content

Commit

Permalink
Update dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
demchenkoalex committed Oct 24, 2021
1 parent a7f77db commit 242a30a
Show file tree
Hide file tree
Showing 19 changed files with 1,663 additions and 1,433 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
- name: Setup Node.js environment
uses: actions/setup-node@v1
with:
node-version: 14.x
node-version: 16.x

- name: Restore cache
id: cache
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ build/
.gradle
local.properties
*.iml
*.hprof
/android/gradlew
/android/gradlew.bat
/android/gradle/
Expand Down
8 changes: 4 additions & 4 deletions docs/advanced-usage.md
Original file line number Diff line number Diff line change
Expand Up @@ -86,9 +86,9 @@ const App = () => {
author: user,
createdAt: Date.now(),
id: uuidv4(),
mimeType: response.type,
mimeType: response.type ?? undefined,
name: response.name,
size: response.size,
size: response.size ?? 0,
type: 'file',
uri: response.uri,
}
Expand Down Expand Up @@ -247,9 +247,9 @@ const App = () => {
author: user,
createdAt: Date.now(),
id: uuidv4(),
mimeType: response.type,
mimeType: response.type ?? undefined,
name: response.name,
size: response.size,
size: response.size ?? 0,
type: 'file',
uri: response.uri,
}
Expand Down
1 change: 1 addition & 0 deletions example/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ build/
.gradle
local.properties
*.iml
*.hprof

# node.js
#
Expand Down
10 changes: 10 additions & 0 deletions example/android/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,11 @@ def jscFlavor = 'org.webkit:android-jsc:+'
*/
def enableHermes = project.ext.react.get('enableHermes', false);

/**
* Architectures to build native code for in debug.
*/
def nativeArchitectures = project.getProperties().get("reactNativeDebugArchitectures")

android {
ndkVersion rootProject.ext.ndkVersion

Expand Down Expand Up @@ -152,6 +157,11 @@ android {
buildTypes {
debug {
signingConfig signingConfigs.debug
if (nativeArchitectures) {
ndk {
abiFilters nativeArchitectures.split(',')
}
}
}
release {
// Caution! In production, you need to generate your own keystore file.
Expand Down
1 change: 0 additions & 1 deletion example/android/app/src/main/res/values/styles.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
<!-- Base application theme. -->
<style name="AppTheme" parent="Theme.AppCompat.DayNight.NoActionBar">
<!-- Customize your theme here. -->
<item name="android:textColor">#000000</item>
</style>

</resources>
4 changes: 2 additions & 2 deletions example/android/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ buildscript {
minSdkVersion = 21
compileSdkVersion = 30
targetSdkVersion = 30
kotlinVersion = '1.5.30'
ndkVersion = '23.0.7599858'
kotlinVersion = '1.5.31'
ndkVersion = '21.4.7075529'
}
repositories {
google()
Expand Down
2 changes: 1 addition & 1 deletion example/android/gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -25,4 +25,4 @@ android.useAndroidX=true
android.enableJetifier=true

# Version of flipper SDK to use with React Native
FLIPPER_VERSION=0.105.0
FLIPPER_VERSION=0.99.0
3 changes: 2 additions & 1 deletion example/ios/Podfile
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,10 @@ target 'example' do
#
# Note that if you have use_frameworks! enabled, Flipper will not work and
# you should disable the next line.
use_flipper!({ 'Flipper' => '0.105.0' })
use_flipper!()

post_install do |installer|
react_native_post_install(installer)
__apply_Xcode_12_5_M1_post_install_workaround(installer)
end
end
Loading

0 comments on commit 242a30a

Please sign in to comment.