Make Expo 51 work on Android

ephemeraHQ · Jul 1, 2024 · 4b4d3d7 · 4b4d3d7
1 parent 6d7a9e5
commit 4b4d3d7
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 7 deletions.
diff --git a/android/app/src/main/java/com/converse/dev/PushNotificationsService.kt b/android/app/src/main/java/com/converse/dev/PushNotificationsService.kt
@@ -15,9 +15,7 @@ import com.google.crypto.tink.subtle.Base64
 import com.google.firebase.messaging.FirebaseMessagingService
 import com.google.firebase.messaging.RemoteMessage
 import com.reactnativecommunity.asyncstorage.AsyncStorageModule
-import expo.modules.core.ExportedModule
 import expo.modules.core.ModuleRegistry
-import expo.modules.core.ViewManager
 import expo.modules.core.interfaces.InternalModule
 import expo.modules.core.interfaces.SingletonModule
 import expo.modules.kotlin.AppContext
@@ -189,11 +187,9 @@ class PushNotificationsService : FirebaseMessagingService() {
         // to access the Expo SecureStore module from Kotlin
 
         val internalModules: Collection<InternalModule> = listOf()
-        val exportedModules: Collection<ExportedModule> = listOf()
-        val viewManagers: Collection<ViewManager<View>> = listOf()
         val singletonModules: Collection<SingletonModule> = listOf()
 
-        val moduleRegistry = ModuleRegistry(internalModules, exportedModules, viewManagers, singletonModules)
+        val moduleRegistry = ModuleRegistry(internalModules, singletonModules)
 
         reactAppContext = ReactApplicationContext(this)
         val weakRef = WeakReference(reactAppContext)

diff --git a/android/build.gradle b/android/build.gradle
@@ -15,7 +15,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath('com.android.tools.build:gradle:8.4.1')
+        classpath('com.android.tools.build:gradle:8.5.0')
         classpath('com.facebook.react:react-native-gradle-plugin')
         classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:1.8.0'
         classpath("io.sentry:sentry-android-gradle-plugin:3.11.1")

diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-all.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

diff --git a/package.json b/package.json
@@ -81,6 +81,7 @@
     "expo-application": "~5.9.1",
     "expo-asset": "~10.0.10",
     "expo-background-fetch": "~12.0.1",
+    "expo-clipboard": "~6.0.3",
     "expo-constants": "~16.0.2",
     "expo-contacts": "~13.0.4",
     "expo-crypto": "~13.0.2",

diff --git a/yarn.lock b/yarn.lock
@@ -13565,6 +13565,11 @@ expo-clipboard@^4.5.0:
   resolved "https://registry.yarnpkg.com/expo-clipboard/-/expo-clipboard-4.8.0.tgz#0380d3e01beabc007d442602e449e7e51fea4c03"
   integrity sha512-+ge2eRiOdcAlkwWyGbRTj7Wh43568mrh/zd7121Audkn3Gl0+m5CmAhJYpmuRLTdYzgOOc/JyZTWhsRav80P6Q==
 
+expo-clipboard@~6.0.3:
+  version "6.0.3"
+  resolved "https://registry.yarnpkg.com/expo-clipboard/-/expo-clipboard-6.0.3.tgz#dfea74d4a004dce59ecefd063d6fb9f1c356a03f"
+  integrity sha512-RIKDsuHkYfaspifbFpVC8sBVFKR05L7Pj7mU2/XkbrW9m01OBNvdpGraXEMsTFCx97xMGsZpEw9pPquL4j4xVg==
+
 expo-constants@~16.0.0, expo-constants@~16.0.2:
   version "16.0.2"
   resolved "https://registry.yarnpkg.com/expo-constants/-/expo-constants-16.0.2.tgz#eb5a1bddb7308fd8cadac8fc44decaf4784cac5e"