Skip to content

Commit 4efa050

Browse files
iOS build issue fix
1 parent 37d2946 commit 4efa050

File tree

17 files changed

+23979
-4354
lines changed

17 files changed

+23979
-4354
lines changed

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "react-native-square-reader-sdk",
3-
"version": "1.4.3",
3+
"version": "1.7.2",
44
"description": "A React Native plugin for Square Reader SDK",
55
"homepage": "https://github.com/square/react-native-square-reader-sdk",
66
"repository": {

reader-sdk-react-native-quickstart/android/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,8 +70,8 @@ allprojects {
7070
maven {
7171
url "https://sdk.squareup.com/android"
7272
credentials {
73-
username SQUARE_READER_SDK_APPLICATION_ID
74-
password SQUARE_READER_SDK_REPOSITORY_PASSWORD
73+
username "sq0idp-ZEe0gjVrSrPSE1YMM4T75A"
74+
password "35mywk6inosfvr4zgudkmssu5tvtuiwnicjvc2vn7xwf7ujtd22q"
7575
}
7676
}
7777
mavenCentral {

reader-sdk-react-native-quickstart/app/components/SquareLogo.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,13 @@ limitations under the License.
1717
import React, {FC} from 'react';
1818
import {Animated} from 'react-native';
1919

20-
const iconImage = require('./img/ic_jewel.png');
20+
// const iconImage = require('./img/ic_jewel.png');
2121

2222
const SquareLogo: FC<Props> = props => {
2323
return (
2424
<Animated.Image
2525
style={[{width: props.width, height: props.height}, props.style]}
26-
source={iconImage}
26+
// source={require('../assets/images/ic_jewel.png')}
2727
/>
2828
);
2929
};

reader-sdk-react-native-quickstart/app/screens/CheckoutScreen.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ import {
3838
import CustomButton from '../components/CustomButton';
3939
import SquareLogo from '../components/SquareLogo';
4040
import {defaultStyles} from '../styles/common';
41-
const iconImage = require('../components/img/setting.png');
41+
// const iconImage = require('../components/img/setting.png');
4242

4343
export default function CheckoutScreen({navigation}) {
4444
const [locationName, setLocationName] = useState('');
@@ -153,7 +153,7 @@ export default function CheckoutScreen({navigation}) {
153153
return (
154154
<View style={defaultStyles.pageContainer}>
155155
<TouchableOpacity onPress={() => onSettings()}>
156-
<Image style={defaultStyles.settingIconStyle} source={iconImage} />
156+
{/* <Image style={defaultStyles.settingIconStyle} source={require('../assets/images/setting.png')} /> */}
157157
</TouchableOpacity>
158158
<View style={defaultStyles.logoContainer}>
159159
<SquareLogo style={defaultStyles.logoStyle} />
Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
module.exports = {
2-
presets: ['module:metro-react-native-babel-preset'],
2+
// presets: ['module:metro-react-native-babel-preset', ],
3+
presets: ['module:@react-native/babel-preset'],
34
};

reader-sdk-react-native-quickstart/ios/File.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
1010
func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool {
1111
let jsCodeLocation: URL
1212

13-
jsCodeLocation = RCTBundleURLProvider.sharedSettings().jsBundleURL(forBundleRoot: "index", fallbackResource:nil)
13+
jsCodeLocation = RCTBundleURLProvider.sharedSettings().jsBundleURL(forBundleRoot: "index", fallbackExtension:nil)!
1414
let rootView = RCTRootView(bundleURL: jsCodeLocation, moduleName: "RNReaderSDKSample", initialProperties: nil, launchOptions: launchOptions)
1515
let rootViewController = UIViewController()
1616
rootViewController.view = rootView

reader-sdk-react-native-quickstart/ios/Podfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ target 'RNReaderSDKSample' do
6565
# ...but if you bump iOS deployment target, Flipper barfs again "Time.h:52:17: error: typedef redefinition with different types"
6666
# We need to make one crude patch to RCT-Folly - set `__IPHONE_10_0` to our iOS target + 1
6767
# https://github.com/facebook/flipper/issues/834 - 84 comments and still going...
68-
__apply_Xcode_12_5_M1_post_install_workaround(installer)
68+
# __apply_Xcode_12_5_M1_post_install_workaround(installer)
6969
`sed -i -e $'s/__IPHONE_10_0/__IPHONE_12_0/' Pods/RCT-Folly/folly/portability/Time.h`
7070
end
7171
end

0 commit comments

Comments
 (0)