WIP: RN 76

rnmodules/react-native-kb/android/CMakeLists.txt

@@ -43,7 +43,8 @@ target_link_libraries(
         ${LOG_LIB}
         fbjni::fbjni
         ReactAndroid::jsi
-        ReactAndroid::turbomodulejsijni
-        ReactAndroid::react_nativemodule_core
+        # ReactAndroid::turbomodulejsijni
+        # ReactAndroid::react_nativemodule_core
+        ReactAndroid::reactnative
         android
 )

rnmodules/react-native-kb/android/src/main/java/com/reactnativekb/KbModule.kt

@@ -111,9 +111,9 @@ internal class KbModule(reactContext: ReactApplicationContext?) : KbSpec(reactCo
 
 
     // only old arch, uncomment
-    override fun getConstants(): MutableMap<String, Any>? {
-        return getTypedExportedConstants()
-    }
+    // override fun getConstants(): MutableMap<String, Any>? {
+    //     return getTypedExportedConstants()
+    // }
 
     // newarch @Override
     override fun getTypedExportedConstants(): MutableMap<String, Any> {
@@ -354,14 +354,14 @@ internal class KbModule(reactContext: ReactApplicationContext?) : KbSpec(reactCo
                 .addOnCompleteListener(OnCompleteListener { task ->
                         if (!task.isSuccessful()) {
                             NativeLogger.info("Fetching FCM registration token failed " + task.getException())
-                            promise.reject(task.getException())
+                            promise.reject("Fetching FCM registration token failed")
                             return@OnCompleteListener
                         }
 
                         // Get new FCM registration token
                         val token: String? = task.result
                         if (token == null) {
-                            promise.reject(task.getException())
+                            promise.reject("null token")
                             return@OnCompleteListener
                          }
                         NativeLogger.info("Got token: $token")

rnmodules/react-native-kb/ios/Kb.mm

@@ -305,7 +305,7 @@ - (NSDictionary *)constantsToExport {
   });
 }
 
-BOOL isBridgeless = false; // SYNC with AppDelegate.mm
+BOOL isBridgeless = true; // SYNC with AppDelegate.mm
 
 #if defined(RCT_NEW_ARCH_ENABLED)
 @synthesize runtimeExecutor = _runtimeExecutor;

shared/Gemfile

@@ -4,3 +4,4 @@ ruby ">= 2.6.10"
 # Exclude problematic versions of cocoapods and activesupport that causes build failures.
 gem 'cocoapods', '>= 1.13', '!= 1.15.0', '!= 1.15.1'
 gem 'activesupport', '>= 6.1.7.5', '!= 7.1.0'
+gem 'xcodeproj', '< 1.26.0'

shared/android/app/src/main/java/io/keybase/ossifrage/MainApplication.kt

@@ -21,6 +21,7 @@ import com.facebook.react.defaults.DefaultNewArchitectureEntryPoint.load
 import com.facebook.react.defaults.DefaultReactHost.getDefaultReactHost
 import com.facebook.react.defaults.DefaultReactNativeHost
 import com.facebook.soloader.SoLoader
+import com.facebook.react.soloader.OpenSourceMergedSoMapping
 import expo.modules.ApplicationLifecycleDispatcher.onApplicationCreate
 import expo.modules.ApplicationLifecycleDispatcher.onConfigurationChanged
 import io.keybase.ossifrage.modules.BackgroundSyncWorker
@@ -61,7 +62,7 @@ class MainApplication : Application(), ReactApplication {
     override fun onCreate() {
         NativeLogger.info("MainApplication created")
         super.onCreate()
-        SoLoader.init(this,  /* native exopackage */false)
+        SoLoader.init(this, OpenSourceMergedSoMapping)
         if (BuildConfig.IS_NEW_ARCHITECTURE_ENABLED) {
             // If you opted-in for the New Architecture, we load the native entry point for this app.
             load(bridgelessEnabled = true)

shared/android/build.gradle

@@ -1,8 +1,8 @@
 buildscript {
     ext {
-        buildToolsVersion = "34.0.0"
-        minSdkVersion = 23
-        compileSdkVersion = 34
+        buildToolsVersion = "35.0.0"
+        minSdkVersion = 24
+        compileSdkVersion = 35
         targetSdkVersion = 34
         ndkVersion = "26.1.10909125"
         kotlinVersion = "1.9.24"

shared/android/gradle.properties

@@ -9,7 +9,7 @@ org.gradle.jvmargs=-Xmx4096m -XX:MaxMetaspaceSize=1024m
 # https://developer.android.com/topic/libraries/support-library/androidx-rn
 android.useAndroidX=true
 # Automatically convert third-party libraries to use AndroidX
-android.enableJetifier=true
+#android.enableJetifier=true
 
 # Use this property to specify which architecture you want to build.
 # You can also override it from the CLI using
@@ -21,7 +21,7 @@ reactNativeArchitectures=armeabi-v7a,arm64-v8a,x86,x86_64
 # to write custom TurboModules/Fabric components OR use libraries that
 # are providing them.
 # RUN A CLEAN if you change this
-newArchEnabled=false
+newArchEnabled=true
 # Use this property to enable or disable the Hermes JS engine.
 # If set to false, you will be using JSC instead.
 hermesEnabled=true

shared/android/gradle/wrapper/gradle-wrapper.properties

@@ -1,7 +1,7 @@
 #Mon May 06 15:15:57 PDT 2019
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-all.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

shared/android/gradlew

@@ -15,6 +15,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 
 ##############################################################################
 #
@@ -84,7 +86,8 @@ done
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
 # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
-APP_HOME=$(cd "${APP_HOME:-./}" >/dev/null && pwd -P) || exit
+APP_HOME=$(cd -P "${APP_HOME:-./}" >/dev/null && printf '%s
+' "$PWD") || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum

shared/android/gradlew.bat

@@ -13,6 +13,8 @@
 @rem See the License for the specific language governing permissions and
 @rem limitations under the License.
 @rem
+@rem SPDX-License-Identifier: Apache-2.0
+@rem
 
 @if "%DEBUG%"=="" @echo off
 @rem ##########################################################################

shared/ios/Keybase.xcodeproj/project.pbxproj

@@ -704,7 +704,7 @@
 					"$(SRCROOT)/KeybaseGo",
 				);
 				INFOPLIST_FILE = Keybase/Info.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 13.4;
+				IPHONEOS_DEPLOYMENT_TARGET = 15.1;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@@ -758,7 +758,7 @@
 					"$(SRCROOT)/KeybaseGo",
 				);
 				INFOPLIST_FILE = Keybase/Info.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 13.4;
+				IPHONEOS_DEPLOYMENT_TARGET = 15.1;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@@ -820,7 +820,7 @@
 				);
 				GCC_C_LANGUAGE_STANDARD = gnu11;
 				INFOPLIST_FILE = KeybaseShare/Info.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 15.1;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@@ -871,7 +871,7 @@
 				);
 				GCC_C_LANGUAGE_STANDARD = gnu11;
 				INFOPLIST_FILE = KeybaseShare/Info.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 15.1;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@@ -962,7 +962,7 @@
 					"${PODS_CONFIGURATION_BUILD_DIR}/React-NativeModulesApple/React_NativeModulesApple.framework/Headers",
 					"${PODS_CONFIGURATION_BUILD_DIR}/React-graphics/React_graphics.framework/Headers/react/renderer/graphics/platform/ios",
 				);
-				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 15.1;
 				LD = "";
 				LDPLUSPLUS = "";
 				MTL_ENABLE_DEBUG_INFO = YES;
@@ -1060,7 +1060,7 @@
 					"${PODS_CONFIGURATION_BUILD_DIR}/React-NativeModulesApple/React_NativeModulesApple.framework/Headers",
 					"${PODS_CONFIGURATION_BUILD_DIR}/React-graphics/React_graphics.framework/Headers/react/renderer/graphics/platform/ios",
 				);
-				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 15.1;
 				LD = "";
 				LDPLUSPLUS = "";
 				MTL_ENABLE_DEBUG_INFO = NO;

shared/ios/Keybase/AppDelegate.mm

@@ -47,7 +47,7 @@ - (NSURL *)bundleURL {
 
 - (BOOL)bridgelessEnabled
 {
-    return NO; // if you change this change Kb.mm also BOOL isBridgeless;
+    return YES; // if you change this change Kb.mm also BOOL isBridgeless;
 }
 
 @end

shared/ios/Podfile

@@ -1,7 +1,7 @@
 require File.join(File.dirname(`node --print "require.resolve('expo/package.json')"`), "scripts/autolinking")
 require File.join(File.dirname(`node --print "require.resolve('react-native/package.json')"`), "scripts/react_native_pods")
 
-platform :ios, "13.4"
+platform :ios,  min_ios_version_supported
 install! 'cocoapods',
   :deterministic_uuids => false