Skip to content

Commit 16d9fcb

Browse files
authored
feat: Upgrade everything (RN 0.73) (#29)
* feat: Upgrade everything (RN 0.73) * Update Podfile.lock * fix: Fix iOS and Android build errors * Fix Android build * Update Podfile.lock * Remove `bundle` * Update build-ios.yml
1 parent c1fb6da commit 16d9fcb

File tree

22 files changed

+2415
-1473
lines changed

22 files changed

+2415
-1473
lines changed

.github/workflows/build-android.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,11 @@ jobs:
2727
steps:
2828
- uses: actions/checkout@v4
2929

30-
- name: Setup JDK 11
30+
- name: Setup JDK 17
3131
uses: actions/setup-java@v2
3232
with:
3333
distribution: 'zulu'
34-
java-version: 11
34+
java-version: 17
3535
java-package: jdk
3636

3737
- name: Get yarn cache directory path

.github/workflows/build-ios.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -54,17 +54,17 @@ jobs:
5454
working-directory: example/ios
5555

5656
- name: Restore Pods cache
57-
uses: actions/cache@v3
57+
uses: actions/cache@v4
5858
with:
5959
path: |
6060
example/ios/Pods
6161
~/Library/Caches/CocoaPods
6262
~/.cocoapods
63-
key: ${{ runner.os }}-pods-${{ hashFiles('**/Podfile.lock') }}
63+
key: ${{ runner.os }}-cocoapods-${{ hashFiles('**/Podfile.lock') }}
6464
restore-keys: |
65-
${{ runner.os }}-pods-
65+
${{ runner.os }}-cocoapods-
6666
- name: Install Pods
67-
run: bundle exec pod install
67+
run: pod install
6868
- name: Install xcpretty
6969
run: gem install xcpretty
7070
- name: Build App

example/android/app/build.gradle

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,7 @@ def jscFlavor = 'org.webkit:android-jsc:+'
7171
android {
7272
ndkVersion rootProject.ext.ndkVersion
7373

74+
buildToolsVersion rootProject.ext.buildToolsVersion
7475
compileSdkVersion rootProject.ext.compileSdkVersion
7576

7677
namespace "com.tfliteexample"
@@ -107,12 +108,6 @@ dependencies {
107108
// The version of react-native is set by the React Native Gradle Plugin
108109
implementation("com.facebook.react:react-android")
109110

110-
debugImplementation("com.facebook.flipper:flipper:${FLIPPER_VERSION}")
111-
debugImplementation("com.facebook.flipper:flipper-network-plugin:${FLIPPER_VERSION}") {
112-
exclude group:'com.squareup.okhttp3', module:'okhttp'
113-
}
114-
115-
debugImplementation("com.facebook.flipper:flipper-fresco-plugin:${FLIPPER_VERSION}")
116111
if (hermesEnabled.toBoolean()) {
117112
implementation("com.facebook.react:hermes-android")
118113
} else {

example/android/app/src/debug/AndroidManifest.xml

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,8 @@
22
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
33
xmlns:tools="http://schemas.android.com/tools">
44

5-
<uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW"/>
6-
75
<application
86
android:usesCleartextTraffic="true"
97
tools:targetApi="28"
10-
tools:ignore="GoogleAppIndexingWarning">
11-
<activity android:name="com.facebook.react.devsupport.DevSettingsActivity" android:exported="false" />
12-
</application>
8+
tools:ignore="GoogleAppIndexingWarning" />
139
</manifest>

example/android/app/src/debug/java/com/tfliteexample/ReactNativeFlipper.java

Lines changed: 0 additions & 75 deletions
This file was deleted.

example/android/app/src/main/java/com/tfliteexample/MainApplication.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,5 @@ public void onCreate() {
5757
// If you opted-in for the New Architecture, we load the native entry point for this app.
5858
DefaultNewArchitectureEntryPoint.load();
5959
}
60-
ReactNativeFlipper.initializeFlipper(this, getReactNativeHost().getReactInstanceManager());
6160
}
6261
}

example/android/app/src/release/java/com/tfliteexample/ReactNativeFlipper.java

Lines changed: 0 additions & 20 deletions
This file was deleted.

example/android/build.gradle

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,12 @@
22

33
buildscript {
44
ext {
5-
buildToolsVersion = "33.0.0"
5+
buildToolsVersion = "34.0.0"
66
minSdkVersion = 21
7-
compileSdkVersion = 33
8-
targetSdkVersion = 33
9-
10-
// We use NDK 23 which has both M1 support and is the side-by-side NDK version from AGP.
11-
ndkVersion = "23.1.7779620"
7+
compileSdkVersion = 34
8+
targetSdkVersion = 34
9+
ndkVersion = "25.1.8937393"
10+
kotlinVersion = "1.8.0"
1211
}
1312
repositories {
1413
google()
@@ -17,5 +16,8 @@ buildscript {
1716
dependencies {
1817
classpath("com.android.tools.build:gradle")
1918
classpath("com.facebook.react:react-native-gradle-plugin")
19+
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin")
2020
}
2121
}
22+
23+
apply plugin: "com.facebook.react.rootproject"

example/android/gradle.properties

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,6 @@ android.useAndroidX=true
2424
# Automatically convert third-party libraries to use AndroidX
2525
android.enableJetifier=true
2626

27-
# Version of flipper SDK to use with React Native
28-
FLIPPER_VERSION=0.182.0
29-
3027
# Use this property to specify which architecture you want to build.
3128
# You can also override it from the CLI using
3229
# ./gradlew <task> -PreactNativeArchitectures=x86_64
Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.1-all.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-all.zip
44
networkTimeout=10000
5+
validateDistributionUrl=true
56
zipStoreBase=GRADLE_USER_HOME
67
zipStorePath=wrapper/dists

0 commit comments

Comments
 (0)