From 465318ae16906c2f98d2095d5d59233ae0eac9cd Mon Sep 17 00:00:00 2001 From: Kudo Chien Date: Tue, 29 Mar 2022 21:52:01 +0800 Subject: [PATCH 1/2] remove expo adapter --- android-npm/expo/linking.gradle | 46 ------------------- .../reanimated/EXReanimatedAdapter.java | 12 ----- .../reanimated/EXReanimatedPackage.java | 26 ----------- android/build.gradle | 12 ----- createNPMPackage.sh | 2 - expo-module.config.json | 3 -- 6 files changed, 101 deletions(-) delete mode 100644 android-npm/expo/linking.gradle delete mode 100644 android-npm/expo/src/main/java/com/swmansion/reanimated/EXReanimatedAdapter.java delete mode 100644 android-npm/expo/src/main/java/expo/modules/adapters/reanimated/EXReanimatedPackage.java delete mode 100644 expo-module.config.json diff --git a/android-npm/expo/linking.gradle b/android-npm/expo/linking.gradle deleted file mode 100644 index 81ae08b2d4de..000000000000 --- a/android-npm/expo/linking.gradle +++ /dev/null @@ -1,46 +0,0 @@ -def isExpoLinked = false -rootProject.getSubprojects().forEach({ project -> - if (project.plugins.hasPlugin("com.android.application")) { - if (project.configurations.implementation.getDependencies().find { dep -> dep.name == "expo" }) { - isExpoLinked = true - } - } -}) - -def safeExtGet(prop, fallback) { - rootProject.ext.has(prop) ? rootProject.ext.get(prop) : fallback -} - -if (isExpoLinked) { - apply plugin: 'com.android.library' - - android { - // Disable aar bundling to fix the error when running `gradle assembleRelease` over `gradle :app:assembleRelease` - // which will throw `Direct local .aar file dependencies are not supported when building an AAR.` - tasks.whenTaskAdded { task -> - if (['bundleDebugAar', 'bundleReleaseAar'].contains(task.name)) { - task.enabled = false - } - } - - compileSdkVersion safeExtGet('compileSdkVersion', 30) - - sourceSets { - main.manifest.srcFile 'src/AndroidManifest.xml' - main.java.srcDirs = [ 'expo/src/main/java' ] - } - - libraryVariants.all { - generateBuildConfigProvider?.get()?.enabled = false - } - } - - dependencies { - implementation 'com.facebook.react:react-native:+' - implementation project(':expo-modules-core') - - project.configurations.default.artifacts.each { artifact -> - api files(artifact.file) - } - } -} diff --git a/android-npm/expo/src/main/java/com/swmansion/reanimated/EXReanimatedAdapter.java b/android-npm/expo/src/main/java/com/swmansion/reanimated/EXReanimatedAdapter.java deleted file mode 100644 index da76cd4a5141..000000000000 --- a/android-npm/expo/src/main/java/com/swmansion/reanimated/EXReanimatedAdapter.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.swmansion.reanimated; - -import com.facebook.react.bridge.JavaScriptContextHolder; -import com.facebook.react.bridge.ReactApplicationContext; - -public class EXReanimatedAdapter { - public static void registerJSIModules(ReactApplicationContext reactApplicationContext, JavaScriptContextHolder jsContext) { - NodesManager nodesManager = - reactApplicationContext.getNativeModule(ReanimatedModule.class).getNodesManager(); - nodesManager.initWithContext(reactApplicationContext); - } -} diff --git a/android-npm/expo/src/main/java/expo/modules/adapters/reanimated/EXReanimatedPackage.java b/android-npm/expo/src/main/java/expo/modules/adapters/reanimated/EXReanimatedPackage.java deleted file mode 100644 index 635751c94bf1..000000000000 --- a/android-npm/expo/src/main/java/expo/modules/adapters/reanimated/EXReanimatedPackage.java +++ /dev/null @@ -1,26 +0,0 @@ -package expo.modules.adapters.reanimated; - -import android.content.Context; - -import com.facebook.react.bridge.JavaScriptContextHolder; -import com.facebook.react.bridge.ReactApplicationContext; -import com.swmansion.reanimated.EXReanimatedAdapter; - -import java.util.Collections; -import java.util.List; - -import expo.modules.core.interfaces.Package; -import expo.modules.core.interfaces.ReactNativeHostHandler; - -public class EXReanimatedPackage implements Package { - @Override - public List createReactNativeHostHandlers(Context context) { - final ReactNativeHostHandler handler = new ReactNativeHostHandler() { - @Override - public void onRegisterJSIModules(ReactApplicationContext reactApplicationContext, JavaScriptContextHolder jsContext, boolean useDeveloperSupport) { - EXReanimatedAdapter.registerJSIModules(reactApplicationContext, jsContext); - } - }; - return Collections.singletonList(handler); - } -} diff --git a/android/build.gradle b/android/build.gradle index a09bbc441d3f..0ea7a77ebe17 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -74,15 +74,6 @@ def resolveBuildType() { return true } -def resolveExpoLinkingGradle() { - def gradleScript = file("./expo/linking.gradle") - if (gradleScript.exists()) { - return "./expo/linking.gradle" - } else { - return "../android-npm/expo/linking.gradle" - } -} - def isDeveloperMode() { // developer mode, to run Example app return file("$projectDir/../node_modules/react-native/package.json").exists() @@ -291,9 +282,6 @@ if (!BUILD_FROM_SOURCE) { // end if already loaded aar if (!BUILD_FROM_SOURCE) return -// apply expo config -apply from: resolveExpoLinkingGradle() - def localProps = new Properties() def localPropertiesFile = file("local.properties") if (localPropertiesFile.exists()) { diff --git a/createNPMPackage.sh b/createNPMPackage.sh index 75cd9af166a5..8bb13ad18182 100755 --- a/createNPMPackage.sh +++ b/createNPMPackage.sh @@ -67,12 +67,10 @@ done yarn add react-native@"${versions[0]}" --dev -cp -R android-npm/expo android/ cp -R android/build build_output cd android && ./gradlew clean && cd .. yarn run type:generate npm pack -rm -rf android/expo rm -rf ./lib rm -rf ./android/rnVersionPatch/backup/* diff --git a/expo-module.config.json b/expo-module.config.json deleted file mode 100644 index 339d64e117cf..000000000000 --- a/expo-module.config.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "platforms": ["android"] -} From be2bea180f2b49f793c4da27b63c1372e436f9e8 Mon Sep 17 00:00:00 2001 From: Kudo Chien Date: Thu, 31 Mar 2022 13:25:20 +0800 Subject: [PATCH 2/2] remove expo-module.config.json from publishment --- package.json | 1 - 1 file changed, 1 deletion(-) diff --git a/package.json b/package.json index 68e317fee0ae..7a26f1016b68 100644 --- a/package.json +++ b/package.json @@ -54,7 +54,6 @@ "react-native-reanimated.d.ts", "mock.js", "plugin.js", - "expo-module.config.json", "!__snapshots__", "!*.test.js", "!*.test.js.map"