Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions platforms/react-native/sample/android/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ react {
// bundleConfig = file(../rn-cli.config.js)
//
// The name of the generated asset file containing your JS bundle
bundleAssetName = "ReactNative.android.bundle"
bundleAssetName = "CheckoutKitReactNativeDemo.android.bundle"
//
// The entry file for bundle generation. Default is 'index.android.js' or 'index.js'
entryFile = file("../../index.js")
Expand Down Expand Up @@ -103,9 +103,9 @@ android {
}
}

namespace "com.shopify.checkoutkitreactnative"
namespace "com.shopify.checkoutkit.reactnativedemo"
defaultConfig {
applicationId "com.shopify.checkoutkitreactnative"
applicationId "com.shopify.checkoutkit.reactnativedemo"
minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion
versionCode 11
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,4 @@
# http://developer.android.com/guide/developing/tools/proguard.html

# Add any project specific keep options here:
-keep class com.shopify.checkoutkitreactnative.BuildConfig { *; }
-keep class com.shopify.checkoutkit.reactnativedemo.BuildConfig { *; }
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.shopify.checkoutkitreactnative
package com.shopify.checkoutkit.reactnativedemo

import com.facebook.react.ReactActivity
import com.facebook.react.ReactActivityDelegate
Expand All @@ -11,7 +11,7 @@ class MainActivity : ReactActivity() {
* Returns the name of the main component registered from JavaScript. This is used to schedule
* rendering of the component.
*/
override fun getMainComponentName(): String = "ReactNative"
override fun getMainComponentName(): String = "CheckoutKitReactNativeDemo"

/**
* Returns the instance of the [ReactActivityDelegate]. We use [DefaultReactActivityDelegate]
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.shopify.checkoutkitreactnative
package com.shopify.checkoutkit.reactnativedemo

import android.app.Application
import com.facebook.react.PackageList
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<resources>
<string name="app_name">ReactNative</string>
<string name="app_name">Checkout Kit React Native Demo</string>
<string name="checkout_web_view_title">Checkout</string>
</resources>
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.shopify.checkoutkitreactnative;
package com.shopify.checkoutkit.reactnativedemo;

import android.webkit.GeolocationPermissions;

Expand Down
2 changes: 1 addition & 1 deletion platforms/react-native/sample/android/settings.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ extensions.configure(com.facebook.react.ReactSettingsExtension) { ex ->
)
}

rootProject.name = 'ReactNative'
rootProject.name = 'CheckoutKitReactNativeDemo'

include ':app'
include ':react-native-config'
Expand Down
4 changes: 2 additions & 2 deletions platforms/react-native/sample/app.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{
"name": "ReactNative",
"displayName": "Shopify Checkout"
"name": "CheckoutKitReactNativeDemo",
"displayName": "Checkout Kit React Native Demo"
}
2 changes: 1 addition & 1 deletion platforms/react-native/sample/ios/AppDelegate.swift
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
window = UIWindow(frame: UIScreen.main.bounds)

factory.startReactNative(
withModuleName: "ReactNative",
withModuleName: "CheckoutKitReactNativeDemo",
in: window,
launchOptions: launchOptions
)
Expand Down

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "13B07F861A680F5B00A75B9A"
BuildableName = "ReactNative.app"
BlueprintName = "ReactNative"
ReferencedContainer = "container:ReactNative.xcodeproj">
BuildableName = "CheckoutKitReactNativeDemo.app"
BlueprintName = "CheckoutKitReactNativeDemo"
ReferencedContainer = "container:CheckoutKitReactNativeDemo.xcodeproj">
</BuildableReference>
</BuildActionEntry>
</BuildActionEntries>
Expand All @@ -33,9 +33,9 @@
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "00E356ED1AD99517003FC87E"
BuildableName = "ReactNativeTests.xctest"
BlueprintName = "ReactNativeTests"
ReferencedContainer = "container:ReactNative.xcodeproj">
BuildableName = "CheckoutKitReactNativeDemoTests.xctest"
BlueprintName = "CheckoutKitReactNativeDemoTests"
ReferencedContainer = "container:CheckoutKitReactNativeDemo.xcodeproj">
</BuildableReference>
</TestableReference>
</Testables>
Expand All @@ -55,9 +55,9 @@
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "13B07F861A680F5B00A75B9A"
BuildableName = "ReactNative.app"
BlueprintName = "ReactNative"
ReferencedContainer = "container:ReactNative.xcodeproj">
BuildableName = "CheckoutKitReactNativeDemo.app"
BlueprintName = "CheckoutKitReactNativeDemo"
ReferencedContainer = "container:CheckoutKitReactNativeDemo.xcodeproj">
</BuildableReference>
</BuildableProductRunnable>
<EnvironmentVariables>
Expand All @@ -79,9 +79,9 @@
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "13B07F861A680F5B00A75B9A"
BuildableName = "ReactNative.app"
BlueprintName = "ReactNative"
ReferencedContainer = "container:ReactNative.xcodeproj">
BuildableName = "CheckoutKitReactNativeDemo.app"
BlueprintName = "CheckoutKitReactNativeDemo"
ReferencedContainer = "container:CheckoutKitReactNativeDemo.xcodeproj">
</BuildableReference>
</BuildableProductRunnable>
</ProfileAction>
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
</array>
<key>com.apple.developer.in-app-payments</key>
<array>
<string>merchant.com.shopify.example.CheckoutKitReactNative</string>
<string>merchant.com.shopify.checkoutkit.reactnativedemo</string>
</array>
</dict>
</plist>
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<key>CFBundleDevelopmentRegion</key>
<string>en</string>
<key>CFBundleDisplayName</key>
<string>ReactNative</string>
<string>Checkout Kit React Native Demo</string>
<key>CFBundleExecutable</key>
<string>$(EXECUTABLE_NAME)</string>
<key>CFBundleIdentifier</key>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="ReactNative" textAlignment="center" lineBreakMode="middleTruncation" baselineAdjustment="alignBaselines" minimumFontSize="18" translatesAutoresizingMaskIntoConstraints="NO" id="GJd-Yh-RWb">
<label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Checkout Kit React Native Demo" textAlignment="center" lineBreakMode="middleTruncation" baselineAdjustment="alignBaselines" minimumFontSize="18" translatesAutoresizingMaskIntoConstraints="NO" id="GJd-Yh-RWb">
<rect key="frame" x="0.0" y="202" width="375" height="43"/>
<fontDescription key="fontDescription" type="boldSystem" pointSize="36"/>
<nil key="highlightedColor"/>
Expand Down
4 changes: 2 additions & 2 deletions platforms/react-native/sample/ios/Podfile
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ if linkage != nil
use_frameworks! :linkage => linkage.to_sym
end

target 'ReactNative' do
target 'CheckoutKitReactNativeDemo' do
config = use_native_modules!

use_local_sdk = ENV['USE_LOCAL_SDK'] == '1'
Expand All @@ -37,7 +37,7 @@ target 'ReactNative' do
:app_path => "#{Pod::Config.instance.installation_root}/.."
)

target 'ReactNativeTests' do
target 'CheckoutKitReactNativeDemoTests' do
inherit! :search_paths
end

Expand Down
2 changes: 1 addition & 1 deletion platforms/react-native/sample/ios/Podfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -3002,6 +3002,6 @@ SPEC CHECKSUMS:
SocketRocket: d4aabe649be1e368d1318fdf28a022d714d65748
Yoga: a742cc68e8366fcfc681808162492bc0aa7a9498

PODFILE CHECKSUM: b7de0f54ab3d6982ef980cd35ebbc624c6b8a80f
PODFILE CHECKSUM: fc307bb38346b4348e5076bb3253fdd1d4d7637a

COCOAPODS: 1.15.2
4 changes: 2 additions & 2 deletions platforms/react-native/sample/scripts/build_ios
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@ if [ "$CI" = "true" ]; then
fi

xcodebuild clean build \
-workspace ReactNative.xcworkspace \
-scheme ReactNative \
-workspace CheckoutKitReactNativeDemo.xcworkspace \
-scheme CheckoutKitReactNativeDemo \
-sdk iphonesimulator \
-destination "$dest" \
-skipPackagePluginValidation \
Expand Down
2 changes: 1 addition & 1 deletion platforms/react-native/sample/scripts/release_android
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ Output files:

To install the release build:
- Ensure an emulator or device is connected
- Uninstall existing version: adb uninstall com.shopify.checkoutkitreactnative
- Uninstall existing version: adb uninstall com.shopify.checkoutkit.reactnativedemo
- Install new version: adb install android/app/build/outputs/apk/release/app-release.apk

To observe the production logs for your emulator/device:
Expand Down
4 changes: 2 additions & 2 deletions platforms/react-native/sample/scripts/test_ios
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ if [ "$CI" = "true" ]; then
fi

xcodebuild test \
-workspace ReactNative.xcworkspace \
-scheme ReactNative \
-workspace CheckoutKitReactNativeDemo.xcworkspace \
-scheme CheckoutKitReactNativeDemo \
-destination "$dest" \
-skipPackagePluginValidation \
-sdk iphonesimulator \
Expand Down
Loading