Skip to content

Commit 7519acc

Browse files
authored
refactor: remove on load turbo module android (#120)
* fix: remove on load module * chore: add .vscode/settings.json for formatting * refactor: remove RNNitroSQLitePackage and add HybridObject entry point on Android * feat: implement android onLoad spec * fix: move files to kotlin folder * chore: remove codegen code * bump android kotlin/ndk version * fix: add back package file * fix: move package kotlin file * add codegen files * fix: impors and kotlin errors * fix: android * fix: noop onload hybridobject on iOS
1 parent 3517559 commit 7519acc

26 files changed

+338
-164
lines changed

.gitignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@
66
.expo/
77

88
# VSCode
9-
.vscode/
9+
.vscode/*
10+
!.vscode/settings.json
1011
jsconfig.json
1112

1213
# Xcode

.vscode/settings.json

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
{
2+
"[javascript]": {
3+
"editor.defaultFormatter": "dbaeumer.vscode-eslint"
4+
},
5+
"[javascriptreact]": {
6+
"editor.defaultFormatter": "dbaeumer.vscode-eslint"
7+
},
8+
"[typescript]": {
9+
"editor.defaultFormatter": "dbaeumer.vscode-eslint"
10+
},
11+
"[typescriptreact]": {
12+
"editor.defaultFormatter": "dbaeumer.vscode-eslint"
13+
}
14+
}

package/RNNitroSQLite.podspec

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,6 @@ Pod::Spec.new do |s|
4949
"OTHER_CPLUSPLUSFLAGS" => "-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1",
5050
"CLANG_CXX_LANGUAGE_STANDARD" => "c++17"
5151
}
52-
s.dependency "React-Codegen"
5352
s.dependency "RCT-Folly"
5453
s.dependency "RCTRequired"
5554
s.dependency "RCTTypeSafety"

package/android/build.gradle

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -145,13 +145,12 @@ android {
145145

146146
sourceSets {
147147
main {
148+
java.srcDirs += [
149+
"src/main/kotlin"
150+
]
151+
148152
if (isNewArchitectureEnabled()) {
149-
java.srcDirs += [
150-
"src/newarch",
151-
// Codegen specs
152-
"generated/java",
153-
"generated/jni"
154-
]
153+
java.srcDirs += ["src/newarch"]
155154
} else {
156155
java.srcDirs += ["src/oldarch"]
157156
}
@@ -194,6 +193,5 @@ if (isNewArchitectureEnabled()) {
194193
react {
195194
jsRootDir = file("../src/")
196195
libraryName = "RNNitroSQLite"
197-
codegenJavaPackageName = "com.margelo.rnnitrosqlite"
198196
}
199197
}

package/android/gradle.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
RNNitroSQLite_kotlinVersion=1.7.0
1+
RNNitroSQLite_kotlinVersion=2.0.21
22
RNNitroSQLite_minSdkVersion=21
33
RNNitroSQLite_targetSdkVersion=31
44
RNNitroSQLite_compileSdkVersion=31
5-
RNNitroSQLite_ndkversion=21.4.7075529
5+
RNNitroSQLite_ndkversion=27.1.12297006

package/android/src/main/java/com/margelo/rnnitrosqlite/RNNitroSQLitePackage.kt

Lines changed: 0 additions & 40 deletions
This file was deleted.
Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
package com.margelo.rnnitrosqlite
2+
3+
import com.facebook.react.TurboReactPackage
4+
import com.facebook.react.bridge.NativeModule
5+
import com.facebook.react.bridge.ReactApplicationContext
6+
import com.facebook.react.module.model.ReactModuleInfo
7+
import com.facebook.react.module.model.ReactModuleInfoProvider
8+
import com.margelo.nitro.rnnitrosqlite.RNNitroSQLiteOnLoad
9+
10+
11+
class RNNitroSQLitePackage : TurboReactPackage() {
12+
@Override
13+
override fun getModule(name: String, reactContext: ReactApplicationContext): NativeModule? {
14+
return null
15+
}
16+
17+
@Override
18+
override fun getReactModuleInfoProvider(): ReactModuleInfoProvider {
19+
return ReactModuleInfoProvider { HashMap() }
20+
}
21+
22+
companion object {
23+
init {
24+
RNNitroSQLiteOnLoad.initializeNative()
25+
}
26+
}
27+
}

package/android/src/newarch/com/margelo/rnnitrosqlite/RNNitroSQLiteOnLoadModule.kt

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

package/android/src/oldarch/com/margelo/rnnitrosqlite/RNNitroSQLiteOnLoadModule.kt

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

0 commit comments

Comments
 (0)