WIP: rn 73+expo 50

go/libkb/version.go

@@ -4,4 +4,4 @@
 package libkb
 
 // Version is the current version (should be MAJOR.MINOR.PATCH)
-const Version = "6.3.0"
+const Version = "6.4.0"

rnmodules/react-native-drop-view/android/build.gradle

@@ -1,11 +1,16 @@
 buildscript {
+  // Buildscript is evaluated before everything else so we can't use getExtOrDefault
+  def kotlin_version = rootProject.ext.has("kotlinVersion") ? rootProject.ext.get("kotlinVersion") : project.properties["DropView_kotlinVersion"]
+
   repositories {
     google()
     mavenCentral()
   }
 
   dependencies {
     classpath "com.android.tools.build:gradle:7.2.1"
+    // noinspection DifferentKotlinGradleVersion
+    classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
   }
 }
 
@@ -14,29 +19,7 @@ def isNewArchitectureEnabled() {
 }
 
 apply plugin: "com.android.library"
-
-import groovy.json.JsonSlurper
-
-// https://github.com/callstack/react-native-builder-bob/discussions/359
-def registrationCompat = {
-  def reactNativeManifest = file("$projectDir/../node_modules/react-native/package.json").exists()
-    ? file("$projectDir/../node_modules/react-native/package.json") // developer mode, to run example app
-    : file("$projectDir/../../react-native/package.json")
-  def reactNativeVersion = new JsonSlurper().parseText(reactNativeManifest.text).version as String
-  // Fabric was introduced at react-native@0.68, full CMake support were introduced at react-native@0.71
-  // Use Android.mk for compatibility with react-native@0.68/0.69
-  reactNativeVersion.matches('(0.68.*|0.69.*)')
-}()
-
-def codegenViewLibraryName = "DropViewView"
-def codegenViewModuleName = {
-  // Autolink for Fabric uses codegenConfig.name in package.json since react-native@0.70
-  // Use codegenViewLibraryName for compatibility with react-native@0.68/0.69
-  def libraryManifestJson = new JsonSlurper().parseText(file("$projectDir/../package.json").text)
-  registrationCompat ? codegenViewLibraryName : libraryManifestJson.codegenConfig.name
-}()
-
-def appProject = rootProject.allprojects.find { it.plugins.hasPlugin('com.android.application') }
+apply plugin: "kotlin-android"
 
 if (isNewArchitectureEnabled()) {
   apply plugin: "com.facebook.react"
@@ -50,42 +33,39 @@ def getExtOrIntegerDefault(name) {
   return rootProject.ext.has(name) ? rootProject.ext.get(name) : (project.properties["DropView_" + name]).toInteger()
 }
 
+def supportsNamespace() {
+  def parsed = com.android.Version.ANDROID_GRADLE_PLUGIN_VERSION.tokenize('.')
+  def major = parsed[0].toInteger()
+  def minor = parsed[1].toInteger()
+
+  // Namespace support was added in 7.3.0
+  return (major == 7 && minor >= 3) || major >= 8
+}
+
 android {
-  ndkVersion getExtOrDefault("ndkVersion")
+  if (supportsNamespace()) {
+    namespace "io.keybase.dropview"
+
+    sourceSets {
+      main {
+        manifest.srcFile "src/main/AndroidManifestNew.xml"
+      }
+    }
+  }
+
   compileSdkVersion getExtOrIntegerDefault("compileSdkVersion")
 
   defaultConfig {
     minSdkVersion getExtOrIntegerDefault("minSdkVersion")
     targetSdkVersion getExtOrIntegerDefault("targetSdkVersion")
     buildConfigField "boolean", "IS_NEW_ARCHITECTURE_ENABLED", isNewArchitectureEnabled().toString()
-    buildConfigField "String", "CODEGEN_MODULE_REGISTRATION", (isNewArchitectureEnabled() && registrationCompat ? "\"${codegenViewModuleName}_registration\"" : "null")
-    if (isNewArchitectureEnabled() && registrationCompat) {
-      def reactAndroidProject = project(':ReactAndroid')
-      externalNativeBuild {
-        ndkBuild {
-          arguments "APP_PLATFORM=android-21",
-                    "APP_STL=c++_shared",
-                    "NDK_TOOLCHAIN_VERSION=clang",
-                    "GENERATED_SRC_DIR=$buildDir/generated/source", // for react_codegen_* in this library's codegen/jni
-                    "PROJECT_BUILD_DIR=${appProject.buildDir}", // for REACT_NDK_EXPORT_DIR in ReactAndroid's Android-prebuilt.mk
-                    "REACT_ANDROID_DIR=${reactAndroidProject.projectDir}",
-                    "REACT_ANDROID_BUILD_DIR=${reactAndroidProject.buildDir}",
-                    "CODEGEN_MODULE_NAME=$codegenViewModuleName"
-          cFlags "-Wall", "-Werror", "-fexceptions", "-frtti", "-DWITH_INSPECTOR=1"
-          cppFlags "-std=c++17"
-          targets "${codegenViewModuleName}_registration"
-        }
-      }
-    }
+
   }
-  if (isNewArchitectureEnabled() && registrationCompat) {
-    // We configure the NDK build only if you decide to opt-in for the New Architecture.
-    externalNativeBuild {
-      ndkBuild {
-        path "Android.mk"
-      }
-    }
+
+  buildFeatures {
+    buildConfig true
   }
+
   buildTypes {
     release {
       minifyEnabled false
@@ -121,19 +101,20 @@ repositories {
   google()
 }
 
+def kotlin_version = getExtOrDefault("kotlinVersion")
 
 dependencies {
   // For < 0.71, this will be from the local maven repo
   // For > 0.71, this will be replaced by `com.facebook.react:react-android:$version` by react gradle plugin
   //noinspection GradleDynamicVersion
   implementation "com.facebook.react:react-native:+"
+  implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
 }
 
 if (isNewArchitectureEnabled()) {
   react {
     jsRootDir = file("../src/")
-
-    libraryName = codegenViewLibraryName
-    codegenJavaPackageName = "com.dropview"
+    libraryName = "DropViewView"
+    codegenJavaPackageName = "io.keybase.dropview"
   }
 }

rnmodules/react-native-drop-view/android/src/main/java/com/reactnativedropview/DropViewView.kt

@@ -0,0 +1,12 @@
+package com.reactnativedropview
+
+import android.content.Context
+import android.util.AttributeSet
+import android.widget.FrameLayout
+import androidx.annotation.Nullable
+
+class DropViewView @JvmOverloads constructor(
+        context: Context,
+        @Nullable attrs: AttributeSet? = null,
+        defStyleAttr: Int = 0
+) : FrameLayout(context, attrs, defStyleAttr)

rnmodules/react-native-drop-view/android/src/main/java/com/reactnativedropview/DropViewViewManager.kt

@@ -0,0 +1,23 @@
+package com.reactnativedropview
+
+import com.facebook.react.module.annotations.ReactModule
+import com.facebook.react.bridge.ReactApplicationContext
+import com.facebook.react.uimanager.ThemedReactContext
+import com.facebook.react.uimanager.annotations.ReactProp
+
+@ReactModule(name = DropViewViewManager.NAME)
+class DropViewViewManager :
+        DropViewViewManagerSpec<DropViewView>() {
+    override fun getName(): String {
+        return NAME
+    }
+
+    public override fun createViewInstance(context: ThemedReactContext): DropViewView {
+        return DropViewView(context)
+    }
+
+    companion object {
+        const val NAME = "DropViewView"
+    }
+}
+

rnmodules/react-native-drop-view/android/src/main/java/com/reactnativedropview/DropViewViewPackage.kt

@@ -0,0 +1,20 @@
+package com.reactnativedropview
+
+import com.facebook.react.ReactPackage
+import com.facebook.react.bridge.NativeModule
+import com.facebook.react.bridge.ReactApplicationContext
+import com.facebook.react.uimanager.ViewManager
+import java.util.ArrayList
+
+class DropViewViewPackage : ReactPackage {
+    override fun createViewManagers(reactContext: ReactApplicationContext): List<ViewManager<*, *>> {
+        val viewManagers: MutableList<ViewManager<*, *>> = ArrayList()
+        viewManagers.add(DropViewViewManager())
+        return viewManagers
+    }
+
+    override fun createNativeModules(reactContext: ReactApplicationContext): List<NativeModule> {
+        return emptyList()
+    }
+}
+

rnmodules/react-native-drop-view/android/src/newarch/DropViewViewManagerSpec.kt

@@ -0,0 +1,22 @@
+package com.reactnativedropview
+
+import android.view.View
+import android.widget.FrameLayout
+import com.facebook.react.uimanager.ViewManagerDelegate
+import com.facebook.react.viewmanagers.DropViewViewManagerDelegate
+import com.facebook.react.viewmanagers.DropViewViewManagerInterface
+import com.facebook.react.uimanager.ViewGroupManager
+import com.facebook.soloader.SoLoader
+
+abstract class DropViewViewManagerSpec<T : FrameLayout> : ViewGroupManager<T>(), DropViewViewManagerInterface<T> {
+    private val mDelegate: ViewManagerDelegate<T>
+
+    init {
+        mDelegate = DropViewViewManagerDelegate(this)
+    }
+
+    override fun getDelegate(): ViewManagerDelegate<T>? {
+        return mDelegate
+    }
+
+}

rnmodules/react-native-drop-view/android/src/oldarch/DropViewViewManagerSpec.kt

@@ -0,0 +1,7 @@
+package com.reactnativedropview
+
+import android.view.View
+import com.facebook.react.uimanager.ViewGroupManager
+import android.widget.FrameLayout
+
+abstract class DropViewViewManagerSpec<T : FrameLayout> : ViewGroupManager<T>()

rnmodules/react-native-drop-view/ios/DropViewView.mm

@@ -23,18 +23,14 @@ + (ComponentDescriptorProvider)componentDescriptorProvider
     return concreteComponentDescriptorProvider<DropViewViewComponentDescriptor>();
 }
 
-- (instancetype)initWithFrame:(CGRect)frame
+- (instancetype)init
 {
-  if (self = [super initWithFrame:frame]) {
+  if (self = [super init]) {
+#ifdef RCT_NEW_ARCH_ENABLED
     static const auto defaultProps = std::make_shared<const DropViewViewProps>();
     _props = defaultProps;
-
-      DropView *dv = [[DropView alloc] init];
-      _view = dv;
-
-    self.contentView = _view;
+#endif
   }
-
   return self;
 }
 
@@ -48,5 +44,20 @@ - (void)updateProps:(Props::Shared const &)props oldProps:(Props::Shared const &
     return DropViewView.class;
 }
 
+- (void)layoutSubviews
+{
+    [super layoutSubviews];
+}
+
+- (void)mountChildComponentView:(UIView<RCTComponentViewProtocol> *)childComponentView index:(NSInteger)index
+{
+    [super mountChildComponentView:childComponentView index:index];
+}
+
+- (UIView *)view
+{
+  return [[DropView alloc] init];
+}
+
 @end
 #endif