fix: remove use of deprecated apis

vonovak · vonovak · commit 465e780d0086 · 2025-09-20T13:10:45.000+02:00
diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml
@@ -15,6 +15,16 @@ on:
 jobs:
   android-build:
     runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        arch: [old, new]
+        include:
+          - arch: old
+            new-arch-enabled: false
+            description: "old architecture"
+          - arch: new
+            new-arch-enabled: true
+            description: "new architecture"
     steps:
       - uses: actions/checkout@v4
       - name: Use Node.js lts
@@ -27,23 +37,6 @@ jobs:
           java-version: '17'
       - name: Install dependencies
         run: yarn install --immutable
-      - name: Build android example app on old architecture
-        run: ./gradlew app:assembleDebug -PnewArchEnabled=false
-        working-directory: example/android
-  android-build-new-arch:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v3
-      - name: Use Node.js lts
-        uses: actions/setup-node@v4
-        with:
-          node-version: lts/*
-      - uses: actions/setup-java@v4
-        with:
-          distribution: 'temurin'
-          java-version: '17'
-      - name: Install dependencies
-        run: yarn install --immutable
-      - name: Build android example app on new architecture
-        run: ./gradlew app:assembleDebug -PnewArchEnabled=true
+      - name: Build android example app on ${{ matrix.description }}
+        run: ./gradlew app:assembleDebug -PnewArchEnabled=${{ matrix.new-arch-enabled }}
         working-directory: example/android
diff --git a/.github/workflows/ios.yml b/.github/workflows/ios.yml
@@ -16,7 +16,17 @@ on:
 
 jobs:
   ios-build:
-    runs-on: macos-latest
+    runs-on: macos-26
+    strategy:
+      matrix:
+        arch: [old, new]
+        include:
+          - arch: old
+            new-arch-enabled: 0
+            description: "old architecture"
+          - arch: new
+            new-arch-enabled: 1
+            description: "new architecture"
     steps:
       - uses: actions/checkout@v4
       - name: Use Node.js lts
@@ -31,29 +41,8 @@ jobs:
       - name: Install dependencies
         run: yarn install --immutable
       - name: Install pods
-        run: RCT_NEW_ARCH_ENABLED=0 RCT_USE_PREBUILT_RNCORE=1 RCT_USE_RN_DEP=1 npx pod-install
+        run: RCT_NEW_ARCH_ENABLED=${{ matrix.new-arch-enabled }} RCT_USE_PREBUILT_RNCORE=1 RCT_USE_RN_DEP=1 npx pod-install
         working-directory: example/ios
-      - name: Build ios example app on old architecture
-        run: xcodebuild -scheme ReactTestApp -workspace document-picker-example.xcworkspace ONLY_ACTIVE_ARCH=NO -sdk iphonesimulator -configuration Debug
-        working-directory: example/ios
-  ios-build-new-arch:
-    runs-on: macos-latest
-    steps:
-      - uses: actions/checkout@v4
-      - name: Use Node.js lts
-        uses: actions/setup-node@v4
-        with:
-          node-version: lts/*
-      - uses: ruby/setup-ruby@v1
-        with:
-          ruby-version: 2.7
-          working-directory: example/ios
-          bundler-cache: true
-      - name: Install dependencies
-        run: yarn install --immutable
-      - name: Install pods for new arch
-        run: RCT_NEW_ARCH_ENABLED=1 RCT_USE_PREBUILT_RNCORE=1 RCT_USE_RN_DEP=1 npx pod-install
-        working-directory: example/ios
-      - name: Build ios example app on new architecture
+      - name: Build ios example app on ${{ matrix.description }}
         run: xcodebuild -scheme ReactTestApp -workspace document-picker-example.xcworkspace ONLY_ACTIVE_ARCH=NO -sdk iphonesimulator -configuration Debug
         working-directory: example/ios
diff --git a/example/android/gradle.properties b/example/android/gradle.properties
@@ -40,8 +40,8 @@ reactNativeArchitectures=armeabi-v7a,arm64-v8a,x86,x86_64
 # to write custom TurboModules/Fabric components OR use libraries that
 # are providing them.
 # Note that this is incompatible with web debugging.
-newArchEnabled=false
-bridgelessEnabled=false
+newArchEnabled=true
+bridgelessEnabled=true
 
 # Uncomment the line below to build React Native from source.
 #react.buildFromSource=true
diff --git a/example/package.json b/example/package.json
@@ -29,19 +29,19 @@
   "homepage": "https://github.com/react-native-documents/sponsors-only#readme",
   "devDependencies": {
     "@react-native-community/cli": "^20.0.2",
-    "@react-native/metro-config": "^0.81.1",
+    "@react-native/metro-config": "^0.81.4",
     "@types/invariant": "^2.2.37",
     "@types/jasmine": "^5.1.5",
-    "@types/react": "^18.3.18",
+    "@types/react": "^19.1.13",
     "@wdio/browserstack-service": "^8.36.1",
     "@wdio/cli": "^8.36.1",
     "@wdio/jasmine-framework": "^8.36.1",
     "@wdio/local-runner": "^8.36.1",
     "@wdio/spec-reporter": "^8.36.1",
     "appium": "^2.5.4",
     "appium-uiautomator2-driver": "^3.1.0",
-    "pod-install": "1.0.1",
-    "react-native-test-app": "^4.4.9",
+    "pod-install": "1.0.7",
+    "react-native-test-app": "^4.4.10",
     "ts-node": "^10.9.2",
     "wdio-wait-for": "^3.0.11"
   },
@@ -64,6 +64,6 @@
     "@react-native-segmented-control/segmented-control": "^2.5.7",
     "invariant": "^2.2.4",
     "react": "19.1.0",
-    "react-native": "^0.81.1"
+    "react-native": "^0.81.4"
   }
 }
diff --git a/package.json b/package.json
@@ -45,17 +45,17 @@
     ]
   },
   "dependencies": {
-    "@changesets/cli": "^2.29.6",
+    "@changesets/cli": "^2.29.7",
     "@commitlint/cli": "^18.6.1",
     "@commitlint/config-conventional": "^18.6.3",
     "@evilmartians/lefthook": "^1.13.0",
     "@jest/globals": "^29.7.0",
-    "@manypkg/cli": "^0.21.4",
-    "@react-native/eslint-config": "^0.81.1",
+    "@manypkg/cli": "^0.25.1",
+    "@react-native/eslint-config": "^0.81.4",
     "@types/jest": "^29.5.14",
     "eslint": "^8.57.1",
-    "eslint-config-prettier": "^9.1.0",
-    "eslint-plugin-prettier": "^5.2.3",
+    "eslint-config-prettier": "^9.1.2",
+    "eslint-plugin-prettier": "^5.5.4",
     "jest": "^29.7.0",
     "pod-install": "1.0.7",
     "prettier": "^3.6.2",
diff --git a/packages/document-picker/android/src/main/java/com/reactnativedocumentpicker/MetadataGetter.kt b/packages/document-picker/android/src/main/java/com/reactnativedocumentpicker/MetadataGetter.kt
@@ -138,7 +138,7 @@ class MetadataGetter(private val uriMap: MutableMap<String, Uri>) {
   private fun <T> getCursorValue(cursor: Cursor, columnName: String, valueType: Class<T>): T? {
     val columnIndex = cursor.getColumnIndex(columnName)
     if (columnIndex != -1 && !cursor.isNull(columnIndex)) {
-      return try {
+      return runCatching {
         when (valueType) {
           String::class.java -> cursor.getString(columnIndex) as T
           Int::class.java -> cursor.getInt(columnIndex) as T
@@ -147,10 +147,8 @@ class MetadataGetter(private val uriMap: MutableMap<String, Uri>) {
           Float::class.java -> cursor.getFloat(columnIndex) as T
           else -> null
         }
-      } catch (e: Exception) {
-        // this should not happen but if it does, we return null
-        null
-      }
+      // throw should not happen but if it does, we return null
+      }.getOrNull()
     }
     return null
   }
diff --git a/packages/document-picker/android/src/main/java/com/reactnativedocumentpicker/RNDocumentPickerPackage.java b/packages/document-picker/android/src/main/java/com/reactnativedocumentpicker/RNDocumentPickerPackage.java
diff --git a/packages/document-picker/android/src/main/java/com/reactnativedocumentpicker/RNDocumentPickerPackage.kt b/packages/document-picker/android/src/main/java/com/reactnativedocumentpicker/RNDocumentPickerPackage.kt
@@ -0,0 +1,35 @@
+// LICENSE: see License.md in the package root
+package com.reactnativedocumentpicker
+
+import com.facebook.react.BaseReactPackage
+import com.facebook.react.bridge.NativeModule
+import com.facebook.react.bridge.ReactApplicationContext
+import com.facebook.react.module.model.ReactModuleInfo
+import com.facebook.react.module.model.ReactModuleInfoProvider
+
+class RNDocumentPickerPackage : BaseReactPackage() {
+  override fun getModule(name: String, reactContext: ReactApplicationContext): NativeModule? {
+    return if (name == NativeDocumentPickerSpec.NAME) {
+      RNDocumentPickerModule(reactContext)
+    } else {
+      null
+    }
+  }
+
+  override fun getReactModuleInfoProvider(): ReactModuleInfoProvider {
+    return ReactModuleInfoProvider {
+      val isTurboModule = BuildConfig.IS_NEW_ARCHITECTURE_ENABLED
+      val moduleInfos = mapOf(
+        NativeDocumentPickerSpec.NAME to ReactModuleInfo(
+          NativeDocumentPickerSpec.NAME,
+          NativeDocumentPickerSpec.NAME,  //          "DocumentPickerModule",
+          false,  // canOverrideExistingModule
+          false,  // needsEagerInit
+          false,  // isCxxModule
+          isTurboModule // isTurboModule
+        )
+      )
+      moduleInfos
+    }
+  }
+}
diff --git a/packages/document-picker/ios/RNDocumentPicker.mm b/packages/document-picker/ios/RNDocumentPicker.mm
@@ -14,10 +14,6 @@
 #import "react_native_document_picker-Swift.h"
 #endif
 
-// for UIModalPresentationStyle conversion
-// remove after https://github.com/facebook/react-native/commit/2d547a3252b328251e49dabfeec85f8d46c85411 is released
-#import <React/RCTModalHostViewManager.h>
-
 @interface RNDocumentPicker ()
 @end
 
diff --git a/packages/document-viewer/android/src/main/java/com/reactnativedocumentviewer/RNDocumentViewerPackage.java b/packages/document-viewer/android/src/main/java/com/reactnativedocumentviewer/RNDocumentViewerPackage.java
diff --git a/packages/document-viewer/android/src/main/java/com/reactnativedocumentviewer/RNDocumentViewerPackage.kt b/packages/document-viewer/android/src/main/java/com/reactnativedocumentviewer/RNDocumentViewerPackage.kt
@@ -0,0 +1,33 @@
+// LICENSE: see License.md in the package root
+package com.reactnativedocumentviewer
+
+import com.facebook.react.BaseReactPackage
+import com.facebook.react.bridge.NativeModule
+import com.facebook.react.bridge.ReactApplicationContext
+import com.facebook.react.module.model.ReactModuleInfo
+import com.facebook.react.module.model.ReactModuleInfoProvider
+
+class RNDocumentViewerPackage : BaseReactPackage() {
+  override fun getModule(name: String, reactContext: ReactApplicationContext): NativeModule? {
+    return if (name == NativeDocumentViewerSpec.NAME) {
+      RNDocumentViewerModule(reactContext)
+    } else {
+      null
+    }
+  }
+
+  override fun getReactModuleInfoProvider(): ReactModuleInfoProvider {
+    return ReactModuleInfoProvider {
+      val isTurboModule = BuildConfig.IS_NEW_ARCHITECTURE_ENABLED
+      mapOf(
+        NativeDocumentViewerSpec.NAME to ReactModuleInfo(
+        NativeDocumentViewerSpec.NAME,
+        NativeDocumentViewerSpec.NAME,  //          "DocumentViewerModule",
+        false,  // canOverrideExistingModule
+        false,  // needsEagerInit
+        false,  // isCxxModule
+        isTurboModule // isTurboModule
+      ))
+    }
+  }
+}
diff --git a/yarn.lock b/yarn.lock
