Skip to content

Commit f513f4e

Browse files
author
Matthieu Gicquel
authored
Add support for Expo SDK 50 / RN 0.73 (#2)
- switch to gitignored ios/android folder for example app - update example app to Expo SDK 50 - fix android build on RN 0.73
1 parent c003322 commit f513f4e

File tree

73 files changed

+1006
-3623
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

73 files changed

+1006
-3623
lines changed

android/build.gradle

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -51,21 +51,24 @@ afterEvaluate {
5151
}
5252

5353
android {
54-
compileSdkVersion safeExtGet("compileSdkVersion", 33)
54+
compileSdkVersion safeExtGet("compileSdkVersion", 34)
5555

56-
compileOptions {
57-
sourceCompatibility JavaVersion.VERSION_11
58-
targetCompatibility JavaVersion.VERSION_11
59-
}
56+
def agpVersion = com.android.Version.ANDROID_GRADLE_PLUGIN_VERSION
57+
if (agpVersion.tokenize('.')[0].toInteger() < 8) {
58+
compileOptions {
59+
sourceCompatibility JavaVersion.VERSION_11
60+
targetCompatibility JavaVersion.VERSION_11
61+
}
6062

61-
kotlinOptions {
62-
jvmTarget = JavaVersion.VERSION_11.majorVersion
63+
kotlinOptions {
64+
jvmTarget = JavaVersion.VERSION_11.majorVersion
65+
}
6366
}
6467

6568
namespace "tech.bam.rnas"
6669
defaultConfig {
6770
minSdkVersion safeExtGet("minSdkVersion", 21)
68-
targetSdkVersion safeExtGet("targetSdkVersion", 33)
71+
targetSdkVersion safeExtGet("targetSdkVersion", 34)
6972
versionCode 1
7073
versionName "0.1.0"
7174

example/.gitignore

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,3 +33,7 @@ yarn-error.*
3333

3434
# typescript
3535
*.tsbuildinfo
36+
37+
# Expo managed workflow
38+
/ios
39+
/android

example/android/.gitignore

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

example/android/app/build.gradle

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

example/android/app/debug.keystore

-2.2 KB
Binary file not shown.

example/android/app/proguard-rules.pro

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

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

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

example/android/app/src/debug/java/tech/bam/rnas/example/ReactNativeFlipper.java

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

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

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

0 commit comments

Comments
 (0)