Skip to content
This repository was archived by the owner on May 7, 2022. It is now read-only.

Commit e7c6c8a

Browse files
committed
Update dependencies
1 parent ea3bf0d commit e7c6c8a

File tree

14 files changed

+2090
-1902
lines changed

14 files changed

+2090
-1902
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ build/
2929
.gradle
3030
local.properties
3131
*.iml
32+
*.hprof
3233
/android/gradlew
3334
/android/gradlew.bat
3435
/android/gradle/

android/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ buildscript {
1010

1111
dependencies {
1212
classpath 'com.android.tools.build:gradle:4.2.2'
13-
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:${safeExtGet('kotlinVersion', '1.5.30')}"
13+
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:${safeExtGet('kotlinVersion', '1.5.31')}"
1414
}
1515
}
1616

@@ -26,7 +26,7 @@ android {
2626
buildToolsVersion safeExtGet('buildToolsVersion', '30.0.2')
2727

2828
defaultConfig {
29-
minSdkVersion safeExtGet('minSdkVersion', 16)
29+
minSdkVersion safeExtGet('minSdkVersion', 21)
3030
targetSdkVersion safeExtGet('targetSdkVersion', 30)
3131
}
3232
}

example/.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ build/
2828
.gradle
2929
local.properties
3030
*.iml
31+
*.hprof
3132

3233
# node.js
3334
#

example/android/app/build.gradle

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -121,6 +121,11 @@ def jscFlavor = 'org.webkit:android-jsc:+'
121121
*/
122122
def enableHermes = project.ext.react.get('enableHermes', false);
123123

124+
/**
125+
* Architectures to build native code for in debug.
126+
*/
127+
def nativeArchitectures = project.getProperties().get("reactNativeDebugArchitectures")
128+
124129
android {
125130
ndkVersion rootProject.ext.ndkVersion
126131

@@ -152,6 +157,11 @@ android {
152157
buildTypes {
153158
debug {
154159
signingConfig signingConfigs.debug
160+
if (nativeArchitectures) {
161+
ndk {
162+
abiFilters nativeArchitectures.split(',')
163+
}
164+
}
155165
}
156166
release {
157167
// Caution! In production, you need to generate your own keystore file.

example/android/app/src/main/res/values/styles.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
<!-- Base application theme. -->
44
<style name="AppTheme" parent="Theme.AppCompat.DayNight.NoActionBar">
55
<!-- Customize your theme here. -->
6-
<item name="android:textColor">#000000</item>
76
</style>
87

98
</resources>

example/android/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ buildscript {
66
minSdkVersion = 21
77
compileSdkVersion = 30
88
targetSdkVersion = 30
9-
kotlinVersion = '1.5.30'
10-
ndkVersion = '23.0.7599858'
9+
kotlinVersion = '1.5.31'
10+
ndkVersion = '21.4.7075529'
1111
}
1212
repositories {
1313
google()

example/android/gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,4 +25,4 @@ android.useAndroidX=true
2525
android.enableJetifier=true
2626

2727
# Version of flipper SDK to use with React Native
28-
FLIPPER_VERSION=0.105.0
28+
FLIPPER_VERSION=0.99.0

example/ios/Podfile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,10 @@ target 'example' do
1616
#
1717
# Note that if you have use_frameworks! enabled, Flipper will not work and
1818
# you should disable the next line.
19-
use_flipper!({ 'Flipper' => '0.105.0' })
19+
use_flipper!()
2020

2121
post_install do |installer|
2222
react_native_post_install(installer)
23+
__apply_Xcode_12_5_M1_post_install_workaround(installer)
2324
end
2425
end

0 commit comments

Comments
 (0)