Merge branch 'nitro' into rename-to-nitro-sqlite

Author: chrispader

example/android/app/src/main/java/com/margelo/rnnitrosqlite/example/MainApplication.kt

@@ -11,7 +11,6 @@ import com.facebook.react.defaults.DefaultReactHost.getDefaultReactHost
 import com.facebook.react.defaults.DefaultReactNativeHost
 import com.facebook.react.soloader.OpenSourceMergedSoMapping
 import com.facebook.soloader.SoLoader
-import com.margelo.rnnitrosqlite.RNNitroSQLitePackage
 
 class MainApplication : Application(), ReactApplication {
 

package/android/CMakeLists.txt

@@ -8,10 +8,6 @@ add_definitions(
   ${SQLITE_FLAGS}
 )
 
-include_directories(
-  ../cpp
-)
-
 file(GLOB_RECURSE cpp_files RELATIVE ${CMAKE_SOURCE_DIR}
   "../cpp/**.c"
   "../cpp/**.cpp"
@@ -33,6 +29,15 @@ include_directories(
   src/main/cpp
 )
 
+set_target_properties(
+  ${CMAKE_PROJECT_NAME} PROPERTIES
+  CXX_STANDARD ${CMAKE_CXX_STANDARD}
+  CXX_EXTENSIONS OFF
+  POSITION_INDEPENDENT_CODE ON
+)
+
+find_package(ReactAndroid REQUIRED CONFIG)
+find_package(fbjni REQUIRED CONFIG)
 find_library(LOG_LIB log)
 
 target_link_libraries(

package/android/build.gradle

@@ -23,15 +23,6 @@ def isNewArchitectureEnabled() {
   return rootProject.hasProperty("newArchEnabled") && rootProject.getProperty("newArchEnabled") == "true"
 }
 
-apply plugin: "com.android.library"
-apply plugin: "kotlin-android"
-
-apply from: '../nitrogen/generated/android/RNNitroSQLite+autolinking.gradle'
-
-if (isNewArchitectureEnabled()) {
-  apply plugin: "com.facebook.react"
-}
-
 def getExtOrDefault(name) {
   return rootProject.ext.has(name) ? rootProject.ext.get(name) : project.properties["RNNitroSQLite_" + name]
 }
@@ -45,6 +36,12 @@ def safeAppExtGet(prop, fallback) {
   appProject?.ext?.has(prop) ? appProject.ext.get(prop) : fallback
 }
 
+def resolveBuildType() {
+  Gradle gradle = getGradle()
+  String tskReqStr = gradle.getStartParameter().getTaskRequests()['args'].toString()
+  return tskReqStr.contains('Release') ? 'release' : 'debug'
+}
+
 def supportsNamespace() {
   def parsed = com.android.Version.ANDROID_GRADLE_PLUGIN_VERSION.tokenize('.')
   def major = parsed[0].toInteger()
@@ -66,19 +63,27 @@ def resolveReactNativeDirectory() {
     return reactNativePackage.parentFile
   }
 
-  throw new GradleException("[react-native-live-markdown] Unable to resolve react-native location in node_modules. Your app should define `REACT_NATIVE_NODE_MODULES_DIR` extension property in `app/build.gradle` with a path to react-native in node_modules.")
+  throw new GradleException("[react-native-quick-sqlite] Unable to resolve react-native location in node_modules. Your app should define `REACT_NATIVE_NODE_MODULES_DIR` extension property in `app/build.gradle` with a path to react-native in node_modules.")
 }
 
-def getReactNativeMinorVersion() {
-  def reactNativeRootDir = resolveReactNativeDirectory()
-  def reactNativeProperties = new Properties()
-  file("$reactNativeRootDir/ReactAndroid/gradle.properties").withInputStream { reactNativeProperties.load(it) }
-  def reactNativeVersion = reactNativeProperties.getProperty("VERSION_NAME")
-  return reactNativeVersion.split("\\.")[1].toInteger()
-}
+def reactNativeRootDir = resolveReactNativeDirectory()
+def reactProperties = new Properties()
+file("$reactNativeRootDir/ReactAndroid/gradle.properties").withInputStream { reactProperties.load(it) }
+
+def REACT_NATIVE_VERSION = reactProperties.getProperty("VERSION_NAME")
+def REACT_NATIVE_MINOR_VERSION = REACT_NATIVE_VERSION.startsWith("0.0.0-") ? 1000 : REACT_NATIVE_VERSION.split("\\.")[1].toInteger()
 
 def SQLITE_FLAGS = rootProject.properties['nitroSqliteFlags']
 
+apply plugin: "com.android.library"
+apply plugin: "kotlin-android"
+
+if (isNewArchitectureEnabled()) {
+  apply plugin: "com.facebook.react"
+}
+
+apply from: '../nitrogen/generated/android/RNNitroSQLite+autolinking.gradle'
+
 android {
   if (supportsNamespace()) {
     namespace "com.margelo.rnnitrosqlite"
@@ -97,14 +102,14 @@ android {
     minSdkVersion getExtOrIntegerDefault("minSdkVersion")
     targetSdkVersion getExtOrIntegerDefault("targetSdkVersion")
 
-    buildConfigField "int", "REACT_NATIVE_MINOR_VERSION", getReactNativeMinorVersion().toString()
+    buildConfigField "int", "REACT_NATIVE_MINOR_VERSION", REACT_NATIVE_MINOR_VERSION.toString()
     buildConfigField "boolean", "IS_NEW_ARCHITECTURE_ENABLED", isNewArchitectureEnabled().toString()
 
     externalNativeBuild {
       cmake {
         arguments "-DANDROID_STL=c++_shared",
           "-DANDROID_TOOLCHAIN=clang",
-          "-DREACT_NATIVE_MINOR_VERSION=${getReactNativeMinorVersion()}",
+          "-DREACT_NATIVE_MINOR_VERSION=${REACT_NATIVE_MINOR_VERSION}",
           "-DSQLITE_FLAGS='${SQLITE_FLAGS ? SQLITE_FLAGS : ''}'"
         abiFilters (*reactNativeArchitectures())
       }
@@ -114,6 +119,7 @@ android {
   externalNativeBuild {
     cmake {
       path "CMakeLists.txt"
+      version = System.getenv("CMAKE_VERSION") ?: "3.22.1"
     }
   }
 
@@ -153,6 +159,7 @@ android {
   }
 
   packagingOptions {
+    doNotStrip resolveBuildType() == 'debug' ? "**/**/*.so" : ''
     excludes = [
       "META-INF",
       "META-INF/**",