Skip to content

Commit 47fded9

Browse files
authored
Merge pull request #8 from Ahmedhamed77/master
Migrate to new Arch
2 parents 33a71ae + 7fa1654 commit 47fded9

17 files changed

+15694
-9796
lines changed

.gitignore

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,8 +60,21 @@ buck-out/
6060
android/app/libs
6161
android/keystores/debug.keystore
6262

63+
64+
# Yarn
65+
.yarn/*
66+
!.yarn/patches
67+
!.yarn/plugins
68+
!.yarn/releases
69+
!.yarn/sdks
70+
!.yarn/versions
71+
6372
# Expo
6473
.expo/*
6574

6675
# generated by bob
6776
lib/
77+
78+
# React Native Codegen
79+
ios/generated
80+
android/generated

.nvmrc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
v18

.yarn/plugins/@yarnpkg/plugin-interactive-tools.cjs

Lines changed: 541 additions & 0 deletions
Large diffs are not rendered by default.

.yarn/plugins/@yarnpkg/plugin-workspace-tools.cjs

Lines changed: 28 additions & 0 deletions
Large diffs are not rendered by default.

.yarn/releases/yarn-3.6.1.cjs

Lines changed: 874 additions & 0 deletions
Large diffs are not rendered by default.

.yarnrc

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

.yarnrc.yml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
nodeLinker: node-modules
2+
nmHoistingLimits: workspaces
3+
4+
plugins:
5+
- path: .yarn/plugins/@yarnpkg/plugin-interactive-tools.cjs
6+
spec: "@yarnpkg/plugin-interactive-tools"
7+
- path: .yarn/plugins/@yarnpkg/plugin-workspace-tools.cjs
8+
spec: "@yarnpkg/plugin-workspace-tools"
9+
10+
yarnPath: .yarn/releases/yarn-3.6.1.cjs

android/build.gradle

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,11 +51,24 @@ android {
5151
disable 'GradleCompatible'
5252
}
5353

54+
5455
compileOptions {
5556
sourceCompatibility JavaVersion.VERSION_1_8
5657
targetCompatibility JavaVersion.VERSION_1_8
5758
}
5859

60+
61+
sourceSets {
62+
main {
63+
if (isNewArchitectureEnabled()) {
64+
java.srcDirs += [
65+
"generated/java",
66+
"generated/jni"
67+
]
68+
}
69+
}
70+
}
71+
5972
}
6073

6174
repositories {
Lines changed: 27 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,36 @@
11
package com.mytracker
22

3-
import com.facebook.react.ReactPackage
43
import com.facebook.react.bridge.ReactApplicationContext
54
import com.facebook.react.bridge.NativeModule
6-
import com.facebook.react.uimanager.ViewManager
7-
import java.util.ArrayList
5+
import com.facebook.react.module.model.ReactModuleInfoProvider
86

9-
class MytrackerPackage : ReactPackage {
10-
override fun createNativeModules(reactContext: ReactApplicationContext): List<NativeModule> {
11-
val modules: MutableList<NativeModule> = ArrayList()
12-
modules.add(MytrackerModule(reactContext))
13-
return modules
7+
import com.facebook.react.TurboReactPackage
8+
import com.facebook.react.module.model.ReactModuleInfo
9+
import java.util.HashMap
10+
11+
class MytrackerPackage : TurboReactPackage() {
12+
13+
override fun getModule(name: String, reactContext: ReactApplicationContext): NativeModule? {
14+
return if (name == MytrackerModule.NAME) {
15+
MytrackerModule(reactContext)
16+
} else {
17+
null
1418
}
19+
}
1520

16-
override fun createViewManagers(reactContext: ReactApplicationContext): List<ViewManager<*, *>> {
17-
return emptyList()
21+
override fun getReactModuleInfoProvider(): ReactModuleInfoProvider {
22+
return ReactModuleInfoProvider {
23+
val moduleInfos: MutableMap<String, ReactModuleInfo> = HashMap()
24+
moduleInfos[MytrackerModule.NAME] = ReactModuleInfo(
25+
MytrackerModule.NAME,
26+
MytrackerModule.NAME,
27+
false, // canOverrideExistingModule
28+
false, // needsEagerInit
29+
true, // hasConstants
30+
false, // isCxxModule
31+
true // isTurboModule
32+
)
33+
moduleInfos
1834
}
35+
}
1936
}

babel.config.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
11
module.exports = {
2-
presets: ['module:metro-react-native-babel-preset'],
2+
presets: [
3+
['module:react-native-builder-bob/babel-preset', { modules: 'commonjs' }],
4+
],
35
};

0 commit comments

Comments
 (0)