Skip to content

Commit

Permalink
Upgrade gradle, kotlin, depends, remove flipper
Browse files Browse the repository at this point in the history
  • Loading branch information
bruce-glazier committed Apr 3, 2024
1 parent f0c4197 commit 7720a1d
Show file tree
Hide file tree
Showing 8 changed files with 25 additions and 95 deletions.
1 change: 1 addition & 0 deletions example/android/app/build.gradle
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
apply plugin: "com.android.application"
apply plugin: "com.facebook.react"
apply plugin: 'kotlin-android'

import com.android.build.OutputFile

Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,5 @@ public void onCreate() {
// If you opted-in for the New Architecture, we load the native entry point for this app.
DefaultNewArchitectureEntryPoint.load();
}
ReactNativeFlipper.initializeFlipper(this, getReactNativeHost().getReactInstanceManager());
}
}
5 changes: 3 additions & 2 deletions example/android/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@

buildscript {
ext {
buildToolsVersion = "33.0.0"
minSdkVersion = 21
compileSdkVersion = 33
targetSdkVersion = 33
kotlinVersion = '1.7.20'

// We use NDK 23 which has both M1 support and is the side-by-side NDK version from AGP.
ndkVersion = "23.1.7779620"
Expand All @@ -15,8 +15,9 @@ buildscript {
mavenCentral()
}
dependencies {
classpath("com.android.tools.build:gradle:7.3.1")
classpath 'com.android.tools.build:gradle:8.3.1'
classpath("com.facebook.react:react-native-gradle-plugin")
classpath("com.google.gms:google-services:4.3.2")
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion"
}
}
3 changes: 2 additions & 1 deletion example/android/gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
#Wed Apr 03 15:23:39 EDT 2024
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
15 changes: 9 additions & 6 deletions example/ios/Podfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -1146,7 +1146,9 @@ PODS:
- React-Core
- RNDeviceInfo (10.5.1):
- React-Core
- RNGestureHandler (2.13.1):
- RNGestureHandler (2.16.0):
- glog
- RCT-Folly (= 2022.05.16.00)
- React-Core
- RNKeychain (8.1.1):
- React-Core
Expand All @@ -1155,9 +1157,10 @@ PODS:
- RCT-Folly (= 2022.05.16.00)
- React-Core
- ReactCommon/turbomodule/core
- RNScreens (3.20.0):
- RNScreens (3.30.1):
- glog
- RCT-Folly (= 2022.05.16.00)
- React-Core
- React-RCTImage
- RNShare (9.2.2):
- React-Core
- RNSVG (13.10.0):
Expand Down Expand Up @@ -1479,15 +1482,15 @@ SPEC CHECKSUMS:
RNCAsyncStorage: b90b71f45b8b97be43bc4284e71a6af48ac9f547
RNCPicker: 567de6dc0c6735cf249700d940c80b90b090e4db
RNDeviceInfo: fb81318c9cd5ebe30ebf12bcd046d818c87f9b53
RNGestureHandler: 38aa38413896620338948fbb5c90579a7b1c3fde
RNGestureHandler: bc2cdb2dc42facdf34992ae364b8a728e19a3686
RNKeychain: ff836453cba46938e0e9e4c22e43d43fa2c90333
RNReanimated: 8a4d86eb951a4a99d8e86266dc71d7735c0c30a9
RNScreens: 218801c16a2782546d30bd2026bb625c0302d70f
RNScreens: b6b64d956af3715adbfe84808694ae82d3fec74f
RNShare: c9981876caa44c46be70eed8a9ccac38828a3572
RNSVG: 80584470ff1ffc7994923ea135a3e5ad825546b9
SocketRocket: f32cd54efbe0f095c4d7594881e52619cfe80b17
Yoga: d17d2cc8105eed528474683b42e2ea310e1daf61

PODFILE CHECKSUM: b59c5d30790e67e3f1aa2deca72bba907b97b4bc

COCOAPODS: 1.11.3
COCOAPODS: 1.15.2
4 changes: 2 additions & 2 deletions example/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -37,15 +37,15 @@
"react-native-app-auth": "7.1.3",
"react-native-device-info": "^10.3.0",
"react-native-draggable-flatlist": "^4.0.1",
"react-native-gesture-handler": "^2.13.1",
"react-native-gesture-handler": "^2.16.0",
"react-native-gifted-chat": "^2.4.0",
"react-native-keychain": "^8.1.1",
"react-native-markdown-display": "^6.1.6",
"react-native-mmkv": "2.11.0",
"react-native-notifications": "^4.3.3",
"react-native-reanimated": "^3.8.1",
"react-native-safe-area-context": "^4.5.0",
"react-native-screens": "^3.19.0",
"react-native-screens": "^3.30.1",
"react-native-share": "^9.2.2",
"react-native-svg": "^13.8.0",
"react-native-toast-message": "^2.1.6",
Expand Down
16 changes: 8 additions & 8 deletions example/yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -10941,10 +10941,10 @@ react-native-flipper@^0.164.0:
resolved "https://registry.yarnpkg.com/react-native-flipper/-/react-native-flipper-0.164.0.tgz#64f6269a86a13a72e30f53ba9f5281d2073a7697"
integrity sha512-iJhIe3rqx6okuzBp4AJsTa2b8VRAOGzoLRFx/4HGbaGvu8AurZjz8TTQkhJsRma8dsHN2b6KKZPvGGW3wdWzvA==

react-native-gesture-handler@^2.13.1:
version "2.13.1"
resolved "https://registry.yarnpkg.com/react-native-gesture-handler/-/react-native-gesture-handler-2.13.1.tgz#bad89caacd62c4560b9953b02f85f37ee42d5d4c"
integrity sha512-hW454X7sjuiBN+lobqw63pmT3boAmTl5OP6zQLq83iEe4T6PcHZ9lxzgCrebtgmutY8cJfq9rM2dOUVh9WBcww==
react-native-gesture-handler@^2.16.0:
version "2.16.0"
resolved "https://registry.yarnpkg.com/react-native-gesture-handler/-/react-native-gesture-handler-2.16.0.tgz#45a00b5988e74ebc58f130c8d1443319c8e678db"
integrity sha512-1hFkx7RIfeJSyTQQ0Nkv4icFVZ5+XjQkd47OgZMBFzoB7ecL+nFSz8KLi3OCWOhq+nbHpSPlSG5VF3CQNCJpWA==
dependencies:
"@egjs/hammerjs" "^2.0.17"
hoist-non-react-statics "^3.3.0"
Expand Down Expand Up @@ -11052,10 +11052,10 @@ react-native-safe-area-context@^4.5.0:
resolved "https://registry.yarnpkg.com/react-native-safe-area-context/-/react-native-safe-area-context-4.5.0.tgz#9208313236e8f49e1920ac1e2a2c975f03aed284"
integrity sha512-0WORnk9SkREGUg2V7jHZbuN5x4vcxj/1B0QOcXJjdYWrzZHgLcUzYWWIUecUPJh747Mwjt/42RZDOaFn3L8kPQ==

react-native-screens@^3.19.0:
version "3.20.0"
resolved "https://registry.yarnpkg.com/react-native-screens/-/react-native-screens-3.20.0.tgz#4d154177395e5541387d9a05bc2e12e54d2fb5b1"
integrity sha512-joWUKWAVHxymP3mL9gYApFHAsbd9L6ZcmpoZa6Sl3W/82bvvNVMqcfP7MeNqVCg73qZ8yL4fW+J/syusHleUgg==
react-native-screens@^3.30.1:
version "3.30.1"
resolved "https://registry.yarnpkg.com/react-native-screens/-/react-native-screens-3.30.1.tgz#254f5cbbeed649492da112756f85ecae3ccf313e"
integrity sha512-/muEvjocCtFb+j5J3YmLvB25+f4rIU8hnnxgGTkXcAf2omPBY8uhPjJaaFUlvj64VEoEzJcRpugbXWsjfPPIFg==
dependencies:
react-freeze "^1.0.0"
warn-once "^0.1.0"
Expand Down

0 comments on commit 7720a1d

Please sign in to comment.