mirror of
https://gitcode.com/gh_mirrors/re/react-native-pushy.git
synced 2025-09-16 07:01:38 +08:00
disable expo autolink if sdk < 50
This commit is contained in:
File diff suppressed because it is too large
Load Diff
@@ -22,21 +22,49 @@ def supportsNamespace() {
|
||||
return major >= 8
|
||||
}
|
||||
|
||||
def isExpoProject() {
|
||||
def checkProjectInfo() {
|
||||
def hasExpoModulesCore = rootProject.subprojects.any { it.name == 'expo-modules-core' }
|
||||
|
||||
def packageJsonFile = new File(rootProject.projectDir.parentFile, 'package.json')
|
||||
|
||||
def hasExpoDependency = false
|
||||
def projectVersion = '1.0.0' // Default version
|
||||
|
||||
if (packageJsonFile.exists()) {
|
||||
def packageJson = new groovy.json.JsonSlurper().parseText(packageJsonFile.text)
|
||||
hasExpoDependency = (packageJson.dependencies?.expo != null) ||
|
||||
(packageJson.devDependencies?.expo != null)
|
||||
projectVersion = packageJson.version ?: '1.0.0' // Get project version
|
||||
|
||||
// Check for expo dependency and version >= 50
|
||||
String expoVersionString = packageJson.dependencies?.expo ?: packageJson.devDependencies?.expo
|
||||
boolean expoVersionIsHighEnough = false
|
||||
if (expoVersionString) {
|
||||
try {
|
||||
// Extract the first number sequence as the major version
|
||||
def matcher = (expoVersionString =~ /(\d+)/)
|
||||
if (matcher.find()) {
|
||||
int majorVersion = matcher[0][0].toInteger()
|
||||
if (majorVersion >= 50) {
|
||||
expoVersionIsHighEnough = true
|
||||
}
|
||||
}
|
||||
} catch (NumberFormatException e) {
|
||||
// Handle error if version parsing fails, maybe log a warning
|
||||
println "Warning: Could not parse Expo version string: ${expoVersionString}"
|
||||
}
|
||||
}
|
||||
hasExpoDependency = expoVersionIsHighEnough // Update based on version check
|
||||
}
|
||||
|
||||
return hasExpoModulesCore || hasExpoDependency
|
||||
def isExpo = hasExpoModulesCore && hasExpoDependency
|
||||
|
||||
// Return a map containing both pieces of information
|
||||
return [isExpo: isExpo, version: projectVersion]
|
||||
}
|
||||
|
||||
def expoProject = isExpoProject()
|
||||
// Get project info map
|
||||
def projectInfo = checkProjectInfo()
|
||||
// Extract info into variables
|
||||
def projectVersion = projectInfo.version
|
||||
def expoProject = projectInfo.isExpo
|
||||
|
||||
apply plugin: 'com.android.library'
|
||||
if (isNewArchitectureEnabled()) {
|
||||
@@ -45,16 +73,16 @@ if (isNewArchitectureEnabled()) {
|
||||
|
||||
if (expoProject) {
|
||||
group = 'expo.modules.pushy'
|
||||
version = '1.0.0'
|
||||
version = projectVersion
|
||||
|
||||
def expoModulesCorePlugin = new File(project(":expo-modules-core").projectDir.absolutePath, "ExpoModulesCorePlugin.gradle")
|
||||
apply from: expoModulesCorePlugin
|
||||
applyKotlinExpoModulesCorePlugin()
|
||||
useCoreDependencies()
|
||||
useExpoPublishing()
|
||||
useCoreDependencies()
|
||||
} else {
|
||||
group = 'cn.reactnative.modules.update'
|
||||
version = '1.0.0'
|
||||
version = projectVersion
|
||||
}
|
||||
|
||||
android {
|
||||
|
@@ -1,9 +1,10 @@
|
||||
{
|
||||
"name": "react-native-update",
|
||||
"version": "10.28.4",
|
||||
"version": "10.28.5",
|
||||
"description": "react-native hot update",
|
||||
"main": "src/index",
|
||||
"scripts": {
|
||||
"postinstall": "node scripts/check-expo-version.js",
|
||||
"prepack": "yarn submodule && yarn lint",
|
||||
"lint": "eslint \"src/*.@(ts|tsx|js|jsx)\" && tsc --noEmit",
|
||||
"submodule": "git submodule update --init --recursive",
|
||||
|
@@ -1,13 +1,41 @@
|
||||
require 'json'
|
||||
require 'rubygems' # Required for version comparison
|
||||
|
||||
|
||||
new_arch_enabled = ENV['RCT_NEW_ARCH_ENABLED'] == '1'
|
||||
|
||||
package = JSON.parse(File.read(File.join(__dir__, 'package.json')))
|
||||
|
||||
podspec_dir = File.dirname(__FILE__)
|
||||
|
||||
Pod::Spec.new do |s|
|
||||
|
||||
is_expo_in_podfile = false
|
||||
is_version_sufficient = false
|
||||
begin
|
||||
# Check Podfile for use_expo_modules!
|
||||
podfile_path = File.join(Pod::Config.instance.installation_root, 'Podfile')
|
||||
if File.exist?(podfile_path)
|
||||
podfile_content = File.read(podfile_path)
|
||||
is_expo_in_podfile = podfile_content.include?('use_expo_modules!')
|
||||
end
|
||||
# Check root package.json for Expo version >= 50
|
||||
root_package_json_path = File.join(podspec_dir, '..', '..', 'package.json')
|
||||
if File.exist?(root_package_json_path)
|
||||
pkg_json = JSON.parse(File.read(root_package_json_path))
|
||||
expo_version_string = pkg_json['dependencies']&.[]('expo') || pkg_json['devDependencies']&.[]('expo')
|
||||
if expo_version_string
|
||||
match = expo_version_string.match(/\d+/)
|
||||
if match
|
||||
major_version = match[0].to_i
|
||||
is_version_sufficient = major_version >= 50
|
||||
end
|
||||
end
|
||||
end
|
||||
rescue => e
|
||||
# Silently ignore errors during check
|
||||
end
|
||||
# Determine final validity
|
||||
valid_expo_project = is_expo_in_podfile && is_version_sufficient
|
||||
|
||||
s.name = package['name']
|
||||
s.version = package['version']
|
||||
s.summary = package['description']
|
||||
@@ -20,7 +48,14 @@ Pod::Spec.new do |s|
|
||||
s.platform = :ios, "8.0"
|
||||
s.platforms = { :ios => "11.0" }
|
||||
s.source = { :git => 'https://github.com/reactnativecn/react-native-update.git', :tag => '#{s.version}' }
|
||||
s.source_files = Dir.glob("ios/**/*.{h,m,mm,swift}").reject { |f| f.start_with?("ios/Expo/") }
|
||||
|
||||
# Conditionally set source files
|
||||
if valid_expo_project
|
||||
s.source_files = Dir.glob("ios/**/*.{h,m,mm,swift}") # Include Expo files
|
||||
else
|
||||
s.source_files = Dir.glob("ios/**/*.{h,m,mm,swift}").reject { |f| f.start_with?("ios/Expo/") } # Exclude Expo files
|
||||
end
|
||||
|
||||
s.libraries = 'bz2', 'z'
|
||||
s.vendored_libraries = 'RCTPushy/libRCTPushy.a'
|
||||
s.pod_target_xcconfig = {
|
||||
@@ -34,46 +69,9 @@ Pod::Spec.new do |s|
|
||||
s.dependency "React-Core"
|
||||
s.dependency 'SSZipArchive'
|
||||
|
||||
is_expo_project = false
|
||||
expo_dependency_added = false
|
||||
supports_bundle_url_final = false
|
||||
|
||||
# Use CocoaPods mechanism to find Podfile
|
||||
begin
|
||||
podfile_path = File.join(Pod::Config.instance.installation_root, 'Podfile')
|
||||
if File.exist?(podfile_path)
|
||||
podfile_content = File.read(podfile_path)
|
||||
is_expo_project = podfile_content.include?('use_expo_modules!')
|
||||
end
|
||||
rescue
|
||||
# Silently skip if CocoaPods config is not available
|
||||
end
|
||||
|
||||
if is_expo_project
|
||||
# Conditionally add Expo dependency
|
||||
if valid_expo_project
|
||||
s.dependency 'ExpoModulesCore'
|
||||
expo_dependency_added = true
|
||||
|
||||
# Current directory is in node_modules/react-native-update, so parent is node_modules
|
||||
expo_core_package_json_path = File.join(__dir__, '..', 'expo-modules-core', 'package.json')
|
||||
|
||||
if File.exist?(expo_core_package_json_path)
|
||||
begin
|
||||
core_package_json = JSON.parse(File.read(expo_core_package_json_path))
|
||||
installed_version_str = core_package_json['version']
|
||||
|
||||
if installed_version_str
|
||||
begin
|
||||
installed_version = Gem::Version.new(installed_version_str)
|
||||
target_version = Gem::Version.new('1.12.0')
|
||||
supports_bundle_url_final = installed_version >= target_version
|
||||
rescue ArgumentError
|
||||
# Silently skip version parsing errors
|
||||
end
|
||||
end
|
||||
rescue JSON::ParserError, StandardError
|
||||
# Silently skip file reading and parsing errors
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
s.subspec 'RCTPushy' do |ss|
|
||||
@@ -91,7 +89,25 @@ Pod::Spec.new do |s|
|
||||
ss.public_header_files = 'ios/RCTPushy/HDiffPatch/**/*.h'
|
||||
end
|
||||
|
||||
if expo_dependency_added
|
||||
# Conditionally add Expo subspec and check ExpoModulesCore version
|
||||
if valid_expo_project
|
||||
supports_bundle_url_final = false # Default
|
||||
begin
|
||||
# Check installed ExpoModulesCore version for bundle URL support
|
||||
expo_core_package_json_path = File.join(podspec_dir, '..', 'expo-modules-core', 'package.json')
|
||||
if File.exist?(expo_core_package_json_path)
|
||||
core_package_json = JSON.parse(File.read(expo_core_package_json_path))
|
||||
installed_version_str = core_package_json['version']
|
||||
if installed_version_str
|
||||
installed_version = Gem::Version.new(installed_version_str)
|
||||
target_version = Gem::Version.new('1.12.0')
|
||||
supports_bundle_url_final = installed_version >= target_version
|
||||
end
|
||||
end
|
||||
rescue JSON::ParserError, Errno::ENOENT, ArgumentError, StandardError => e
|
||||
# Pod::UI.warn "Could not check ExpoModulesCore version: #{e.message}"
|
||||
end
|
||||
|
||||
s.subspec 'Expo' do |ss|
|
||||
ss.source_files = 'ios/Expo/**/*.{h,m,mm,swift}'
|
||||
if supports_bundle_url_final
|
||||
|
85
scripts/check-expo-version.js
Normal file
85
scripts/check-expo-version.js
Normal file
@@ -0,0 +1,85 @@
|
||||
const fs = require('fs');
|
||||
const path = require('path');
|
||||
|
||||
const projectRoot = path.resolve(__dirname, '..'); // react-native-update module root
|
||||
const expoConfigPath = path.resolve(projectRoot, 'expo-module.config.json');
|
||||
|
||||
function getExpoMajorVersion() {
|
||||
let resolvedExpoPackagePath;
|
||||
try {
|
||||
// Use require.resolve to find expo's package.json from the host project's perspective
|
||||
resolvedExpoPackagePath = require.resolve('expo/package.json', {
|
||||
paths: [path.resolve(projectRoot, '..', '..')],
|
||||
});
|
||||
} catch (e) {
|
||||
console.log(
|
||||
'Expo not found in project node_modules (via require.resolve).',
|
||||
);
|
||||
return null; // Expo not found or resolvable
|
||||
}
|
||||
|
||||
// Check if the resolved path actually exists (belt-and-suspenders)
|
||||
if (!fs.existsSync(resolvedExpoPackagePath)) {
|
||||
console.log(
|
||||
`Expo package.json path resolved to ${resolvedExpoPackagePath}, but file does not exist.`,
|
||||
);
|
||||
return null;
|
||||
}
|
||||
|
||||
try {
|
||||
const packageJson = JSON.parse(
|
||||
fs.readFileSync(resolvedExpoPackagePath, 'utf8'),
|
||||
);
|
||||
const version = packageJson.version;
|
||||
if (!version) {
|
||||
console.log('Expo package.json does not contain a version.');
|
||||
return null; // Version not found
|
||||
}
|
||||
|
||||
// Extract the first number sequence as the major version
|
||||
const match = version.match(/\d+/);
|
||||
if (!match) {
|
||||
console.log(
|
||||
`Could not parse major version from Expo version string: ${version}`,
|
||||
);
|
||||
return null; // Cannot parse version
|
||||
}
|
||||
|
||||
return parseInt(match[0], 10);
|
||||
} catch (error) {
|
||||
console.error('Error reading or parsing Expo package.json:', error);
|
||||
return null; // Error during processing
|
||||
}
|
||||
}
|
||||
|
||||
function checkAndCleanExpoConfig() {
|
||||
const majorVersion = getExpoMajorVersion();
|
||||
|
||||
// Condition: Expo not found OR major version is less than 50
|
||||
if (majorVersion === null || majorVersion < 50) {
|
||||
if (fs.existsSync(expoConfigPath)) {
|
||||
try {
|
||||
fs.unlinkSync(expoConfigPath);
|
||||
console.log(
|
||||
`Expo version (${
|
||||
majorVersion !== null ? majorVersion : 'not found'
|
||||
}) is < 50 or Expo not found. Deleted ${expoConfigPath}`,
|
||||
);
|
||||
} catch (error) {
|
||||
console.error(`Failed to delete ${expoConfigPath}:`, error);
|
||||
}
|
||||
} else {
|
||||
console.log(
|
||||
`Expo version (${
|
||||
majorVersion !== null ? majorVersion : 'not found'
|
||||
}) is < 50 or Expo not found. ${expoConfigPath} does not exist, no action needed.`,
|
||||
);
|
||||
}
|
||||
} else {
|
||||
console.log(
|
||||
`Expo version (${majorVersion}) is >= 50. Kept ${expoConfigPath}`,
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
checkAndCleanExpoConfig();
|
Reference in New Issue
Block a user