Skip to content

Commit

Permalink
TM working on iOS
Browse files Browse the repository at this point in the history
  • Loading branch information
Shawn Dempsey committed Jun 14, 2023
1 parent c6be49f commit 47eaff3
Show file tree
Hide file tree
Showing 8 changed files with 18,794 additions and 12,742 deletions.
2 changes: 1 addition & 1 deletion RNCAsyncStorage.podspec
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ Pod::Spec.new do |s|
'HEADER_SEARCH_PATHS' => '"$(PODS_ROOT)/boost" "$(PODS_ROOT)/boost-for-react-native" "$(PODS_ROOT)/RCT-Folly"',
'CLANG_CXX_LANGUAGE_STANDARD' => 'c++17',
}
s.platforms = { ios: '11.0', tvos: '11.0', :osx => "10.14" }
s.platforms = { ios: '12.4', tvos: '11.0', :osx => "10.15" }
s.compiler_flags = folly_compiler_flags + ' -DRCT_NEW_ARCH_ENABLED'

s.dependency "React"
Expand Down
6 changes: 5 additions & 1 deletion babel.config.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
module.exports = {
presets: ['module:metro-react-native-babel-preset'],
"presets": [
["@babel/preset-react", {
"runtime": "automatic"
}]
]
};
4 changes: 2 additions & 2 deletions example/AsyncStorageExample.podspec
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ Pod::Spec.new do |s|
s.source = { :git => package['repository']['url'] }
s.summary = 'AsyncStorage example app'

s.ios.deployment_target = '12.0'
s.osx.deployment_target = '10.14'
s.ios.deployment_target = '12.4'
s.osx.deployment_target = '10.15'

s.dependency 'React'
s.dependency 'ReactTestApp-DevSupport'
Expand Down
4 changes: 2 additions & 2 deletions example/ios/Podfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ workspace 'AsyncStorageExample.xcworkspace'
use_flipper! false

options = {
:fabric_enabled => false,
:fabric_enabled => true,
:hermes_enabled => false,
:turbomodule_enabled => false,
:turbomodule_enabled => true,
}

use_test_app! options do |target|
Expand Down
2 changes: 1 addition & 1 deletion ios/RNCAsyncStorage.h
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
#import <React/RCTInvalidating.h>

#ifdef RCT_NEW_ARCH_ENABLED
#import <rnasyncstorage/rnasyncstorage.h>
#import <tmSpecs/tmSpecs.h>
#endif

#import "RNCAsyncStorageDelegate.h"
Expand Down
11 changes: 7 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,8 @@
"devDependencies": {
"@babel/core": "^7.12.0",
"@babel/preset-env": "^7.1.6",
"@babel/preset-react": "^7.22.5",
"@react-native-community/cli": "^11.3.2",
"@react-native-community/eslint-config": "^3.0.0",
"@semantic-release/changelog": "^6.0.0",
"@semantic-release/git": "^10.0.0",
Expand All @@ -85,9 +87,10 @@
"prettier": "^2.5.1",
"react": "18.2.0",
"react-dom": "18.2.0",
"react-native": "0.71.2",
"react-native": "0.71.10",
"react-native-builder-bob": "^0.18.0",
"react-native-macos": "^0.68.0",
"react-native-codegen": "^0.71.5",
"react-native-macos": "^0.71.11",
"react-native-test-app": "^2.3.10",
"react-native-web": "^0.17.0",
"react-native-windows": "^0.71.0",
Expand Down Expand Up @@ -195,9 +198,9 @@
]
},
"codegenConfig": {
"name": "rnasyncstorage",
"name": "tmSpecs",
"type": "modules",
"jsSrcsDir": "./src",
"jsSrcsDir": "src",
"android": {
"javaPackageName": "com.reactnativecommunity.asyncstorage"
}
Expand Down
4 changes: 1 addition & 3 deletions react-native.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,12 @@ const project = (() => {
const path = require('path');
try {
const { configureProjects } = require('react-native-test-app');
const iosProject = iosProjectPath('ios');
return configureProjects({
android: {
sourceDir: path.join('example', 'android'),
},
ios: {
sourceDir: 'example/ios',
...(iosProject ? { project: iosProject } : undefined),
sourceDir: path.join('example', 'ios'),
},
windows: {
sourceDir: path.join('example', 'windows'),
Expand Down
Loading

0 comments on commit 47eaff3

Please sign in to comment.