From 89472eeb925b404f5b65e4b4d9446ed6cbb7acd5 Mon Sep 17 00:00:00 2001 From: Yuki Tokuhiro Date: Mon, 6 May 2019 17:57:45 -0700 Subject: [PATCH 1/4] Fix Example folder names, README links --- .../AppDelegate.h | 0 .../AppDelegate.m | 0 .../ApplePayExampleViewController.h | 0 .../ApplePayExampleViewController.m | 0 .../BrowseExamplesViewController.h | 0 .../BrowseExamplesViewController.m | 0 .../CardAutomaticConfirmationViewController.h | 0 .../CardAutomaticConfirmationViewController.m | 0 .../CardManualConfirmationExampleViewController.h | 0 .../CardManualConfirmationExampleViewController.m | 0 .../Constants.h | 0 .../Constants.m | 0 .../AppIcon.appiconset/Contents.json | 0 .../Images.xcassets/Contents.json | 0 .../LaunchImage.launchimage/Contents.json | 0 .../Info.plist | 0 .../README.md | 0 .../ShippingManager.h | 0 .../ShippingManager.m | 0 .../SofortExampleViewController.h | 0 .../SofortExampleViewController.m | 0 .../de.lproj/Localizable.strings | 0 .../en.lproj/Localizable.strings | 0 .../es.lproj/Localizable.strings | 0 .../fi.lproj/Localizable.strings | 0 .../fr.lproj/Localizable.strings | 0 .../it.lproj/Localizable.strings | 0 .../ja.lproj/Localizable.strings | 0 .../main.m | 0 .../nb.lproj/Localizable.strings | 0 .../nl.lproj/Localizable.strings | 0 .../zh-Hans.lproj/Localizable.strings | 0 Example/README.md | 4 ++-- .../AppDelegate.swift | 0 .../BrowseProductsViewController.swift | 0 .../Buttons.swift | 0 .../CheckoutRowView.swift | 0 .../CheckoutViewController.swift | 0 .../AppIcon.appiconset/Contents.json | 0 .../LaunchImage.launchimage/Contents.json | 0 .../Images.xcassets/llamas.imageset/Contents.json | 0 .../Images.xcassets/llamas.imageset/llamas.jpg | Bin .../Images.xcassets/llamas.imageset/llamas@2x.jpg | Bin .../Info.plist | 0 .../Localizations/de.lproj/Localizable.strings | 0 .../Localizations/en.lproj/Localizable.strings | 0 .../Localizations/es.lproj/Localizable.strings | 0 .../Localizations/fi.lproj/Localizable.strings | 0 .../Localizations/fr.lproj/Localizable.strings | 0 .../Localizations/it.lproj/Localizable.strings | 0 .../Localizations/ja.lproj/Localizable.strings | 0 .../Localizations/nb.lproj/Localizable.strings | 0 .../Localizations/nl.lproj/Localizable.strings | 0 .../Localizations/zh-Hans.lproj/Localizable.strings | 0 .../MyAPIClient.swift | 0 .../PaymentContextFooterView.swift | 0 .../README.md | 0 .../SettingsViewController.swift | 0 .../Standard Integration (Swift).entitlements | 0 README.md | 4 ++-- 60 files changed, 4 insertions(+), 4 deletions(-) rename Example/{Custom Integration => Custom Integration (Recommended)}/AppDelegate.h (100%) rename Example/{Custom Integration => Custom Integration (Recommended)}/AppDelegate.m (100%) rename Example/{Custom Integration => Custom Integration (Recommended)}/ApplePayExampleViewController.h (100%) rename Example/{Custom Integration => Custom Integration (Recommended)}/ApplePayExampleViewController.m (100%) rename Example/{Custom Integration => Custom Integration (Recommended)}/BrowseExamplesViewController.h (100%) rename Example/{Custom Integration => Custom Integration (Recommended)}/BrowseExamplesViewController.m (100%) rename Example/{Custom Integration => Custom Integration (Recommended)}/CardAutomaticConfirmationViewController.h (100%) rename Example/{Custom Integration => Custom Integration (Recommended)}/CardAutomaticConfirmationViewController.m (100%) rename Example/{Custom Integration => Custom Integration (Recommended)}/CardManualConfirmationExampleViewController.h (100%) rename Example/{Custom Integration => Custom Integration (Recommended)}/CardManualConfirmationExampleViewController.m (100%) rename Example/{Custom Integration => Custom Integration (Recommended)}/Constants.h (100%) rename Example/{Custom Integration => Custom Integration (Recommended)}/Constants.m (100%) rename Example/{Custom Integration => Custom Integration (Recommended)}/Images.xcassets/AppIcon.appiconset/Contents.json (100%) rename Example/{Custom Integration => Custom Integration (Recommended)}/Images.xcassets/Contents.json (100%) rename Example/{Custom Integration => Custom Integration (Recommended)}/Images.xcassets/LaunchImage.launchimage/Contents.json (100%) rename Example/{Custom Integration => Custom Integration (Recommended)}/Info.plist (100%) rename Example/{Custom Integration => Custom Integration (Recommended)}/README.md (100%) rename Example/{Custom Integration => Custom Integration (Recommended)}/ShippingManager.h (100%) rename Example/{Custom Integration => Custom Integration (Recommended)}/ShippingManager.m (100%) rename Example/{Custom Integration => Custom Integration (Recommended)}/SofortExampleViewController.h (100%) rename Example/{Custom Integration => Custom Integration (Recommended)}/SofortExampleViewController.m (100%) rename Example/{Custom Integration => Custom Integration (Recommended)}/de.lproj/Localizable.strings (100%) rename Example/{Custom Integration => Custom Integration (Recommended)}/en.lproj/Localizable.strings (100%) rename Example/{Custom Integration => Custom Integration (Recommended)}/es.lproj/Localizable.strings (100%) rename Example/{Custom Integration => Custom Integration (Recommended)}/fi.lproj/Localizable.strings (100%) rename Example/{Custom Integration => Custom Integration (Recommended)}/fr.lproj/Localizable.strings (100%) rename Example/{Custom Integration => Custom Integration (Recommended)}/it.lproj/Localizable.strings (100%) rename Example/{Custom Integration => Custom Integration (Recommended)}/ja.lproj/Localizable.strings (100%) rename Example/{Custom Integration => Custom Integration (Recommended)}/main.m (100%) rename Example/{Custom Integration => Custom Integration (Recommended)}/nb.lproj/Localizable.strings (100%) rename Example/{Custom Integration => Custom Integration (Recommended)}/nl.lproj/Localizable.strings (100%) rename Example/{Custom Integration => Custom Integration (Recommended)}/zh-Hans.lproj/Localizable.strings (100%) rename Example/{Standard Integration (Swift) => Standard Integration (Sources Only)}/AppDelegate.swift (100%) rename Example/{Standard Integration (Swift) => Standard Integration (Sources Only)}/BrowseProductsViewController.swift (100%) rename Example/{Standard Integration (Swift) => Standard Integration (Sources Only)}/Buttons.swift (100%) rename Example/{Standard Integration (Swift) => Standard Integration (Sources Only)}/CheckoutRowView.swift (100%) rename Example/{Standard Integration (Swift) => Standard Integration (Sources Only)}/CheckoutViewController.swift (100%) rename Example/{Standard Integration (Swift) => Standard Integration (Sources Only)}/Images.xcassets/AppIcon.appiconset/Contents.json (100%) rename Example/{Standard Integration (Swift) => Standard Integration (Sources Only)}/Images.xcassets/LaunchImage.launchimage/Contents.json (100%) rename Example/{Standard Integration (Swift) => Standard Integration (Sources Only)}/Images.xcassets/llamas.imageset/Contents.json (100%) rename Example/{Standard Integration (Swift) => Standard Integration (Sources Only)}/Images.xcassets/llamas.imageset/llamas.jpg (100%) rename Example/{Standard Integration (Swift) => Standard Integration (Sources Only)}/Images.xcassets/llamas.imageset/llamas@2x.jpg (100%) rename Example/{Standard Integration (Swift) => Standard Integration (Sources Only)}/Info.plist (100%) rename Example/{Standard Integration (Swift) => Standard Integration (Sources Only)}/Localizations/de.lproj/Localizable.strings (100%) rename Example/{Standard Integration (Swift) => Standard Integration (Sources Only)}/Localizations/en.lproj/Localizable.strings (100%) rename Example/{Standard Integration (Swift) => Standard Integration (Sources Only)}/Localizations/es.lproj/Localizable.strings (100%) rename Example/{Standard Integration (Swift) => Standard Integration (Sources Only)}/Localizations/fi.lproj/Localizable.strings (100%) rename Example/{Standard Integration (Swift) => Standard Integration (Sources Only)}/Localizations/fr.lproj/Localizable.strings (100%) rename Example/{Standard Integration (Swift) => Standard Integration (Sources Only)}/Localizations/it.lproj/Localizable.strings (100%) rename Example/{Standard Integration (Swift) => Standard Integration (Sources Only)}/Localizations/ja.lproj/Localizable.strings (100%) rename Example/{Standard Integration (Swift) => Standard Integration (Sources Only)}/Localizations/nb.lproj/Localizable.strings (100%) rename Example/{Standard Integration (Swift) => Standard Integration (Sources Only)}/Localizations/nl.lproj/Localizable.strings (100%) rename Example/{Standard Integration (Swift) => Standard Integration (Sources Only)}/Localizations/zh-Hans.lproj/Localizable.strings (100%) rename Example/{Standard Integration (Swift) => Standard Integration (Sources Only)}/MyAPIClient.swift (100%) rename Example/{Standard Integration (Swift) => Standard Integration (Sources Only)}/PaymentContextFooterView.swift (100%) rename Example/{Standard Integration (Swift) => Standard Integration (Sources Only)}/README.md (100%) rename Example/{Standard Integration (Swift) => Standard Integration (Sources Only)}/SettingsViewController.swift (100%) rename Example/{Standard Integration (Swift) => Standard Integration (Sources Only)}/Standard Integration (Swift).entitlements (100%) diff --git a/Example/Custom Integration/AppDelegate.h b/Example/Custom Integration (Recommended)/AppDelegate.h similarity index 100% rename from Example/Custom Integration/AppDelegate.h rename to Example/Custom Integration (Recommended)/AppDelegate.h diff --git a/Example/Custom Integration/AppDelegate.m b/Example/Custom Integration (Recommended)/AppDelegate.m similarity index 100% rename from Example/Custom Integration/AppDelegate.m rename to Example/Custom Integration (Recommended)/AppDelegate.m diff --git a/Example/Custom Integration/ApplePayExampleViewController.h b/Example/Custom Integration (Recommended)/ApplePayExampleViewController.h similarity index 100% rename from Example/Custom Integration/ApplePayExampleViewController.h rename to Example/Custom Integration (Recommended)/ApplePayExampleViewController.h diff --git a/Example/Custom Integration/ApplePayExampleViewController.m b/Example/Custom Integration (Recommended)/ApplePayExampleViewController.m similarity index 100% rename from Example/Custom Integration/ApplePayExampleViewController.m rename to Example/Custom Integration (Recommended)/ApplePayExampleViewController.m diff --git a/Example/Custom Integration/BrowseExamplesViewController.h b/Example/Custom Integration (Recommended)/BrowseExamplesViewController.h similarity index 100% rename from Example/Custom Integration/BrowseExamplesViewController.h rename to Example/Custom Integration (Recommended)/BrowseExamplesViewController.h diff --git a/Example/Custom Integration/BrowseExamplesViewController.m b/Example/Custom Integration (Recommended)/BrowseExamplesViewController.m similarity index 100% rename from Example/Custom Integration/BrowseExamplesViewController.m rename to Example/Custom Integration (Recommended)/BrowseExamplesViewController.m diff --git a/Example/Custom Integration/CardAutomaticConfirmationViewController.h b/Example/Custom Integration (Recommended)/CardAutomaticConfirmationViewController.h similarity index 100% rename from Example/Custom Integration/CardAutomaticConfirmationViewController.h rename to Example/Custom Integration (Recommended)/CardAutomaticConfirmationViewController.h diff --git a/Example/Custom Integration/CardAutomaticConfirmationViewController.m b/Example/Custom Integration (Recommended)/CardAutomaticConfirmationViewController.m similarity index 100% rename from Example/Custom Integration/CardAutomaticConfirmationViewController.m rename to Example/Custom Integration (Recommended)/CardAutomaticConfirmationViewController.m diff --git a/Example/Custom Integration/CardManualConfirmationExampleViewController.h b/Example/Custom Integration (Recommended)/CardManualConfirmationExampleViewController.h similarity index 100% rename from Example/Custom Integration/CardManualConfirmationExampleViewController.h rename to Example/Custom Integration (Recommended)/CardManualConfirmationExampleViewController.h diff --git a/Example/Custom Integration/CardManualConfirmationExampleViewController.m b/Example/Custom Integration (Recommended)/CardManualConfirmationExampleViewController.m similarity index 100% rename from Example/Custom Integration/CardManualConfirmationExampleViewController.m rename to Example/Custom Integration (Recommended)/CardManualConfirmationExampleViewController.m diff --git a/Example/Custom Integration/Constants.h b/Example/Custom Integration (Recommended)/Constants.h similarity index 100% rename from Example/Custom Integration/Constants.h rename to Example/Custom Integration (Recommended)/Constants.h diff --git a/Example/Custom Integration/Constants.m b/Example/Custom Integration (Recommended)/Constants.m similarity index 100% rename from Example/Custom Integration/Constants.m rename to Example/Custom Integration (Recommended)/Constants.m diff --git a/Example/Custom Integration/Images.xcassets/AppIcon.appiconset/Contents.json b/Example/Custom Integration (Recommended)/Images.xcassets/AppIcon.appiconset/Contents.json similarity index 100% rename from Example/Custom Integration/Images.xcassets/AppIcon.appiconset/Contents.json rename to Example/Custom Integration (Recommended)/Images.xcassets/AppIcon.appiconset/Contents.json diff --git a/Example/Custom Integration/Images.xcassets/Contents.json b/Example/Custom Integration (Recommended)/Images.xcassets/Contents.json similarity index 100% rename from Example/Custom Integration/Images.xcassets/Contents.json rename to Example/Custom Integration (Recommended)/Images.xcassets/Contents.json diff --git a/Example/Custom Integration/Images.xcassets/LaunchImage.launchimage/Contents.json b/Example/Custom Integration (Recommended)/Images.xcassets/LaunchImage.launchimage/Contents.json similarity index 100% rename from Example/Custom Integration/Images.xcassets/LaunchImage.launchimage/Contents.json rename to Example/Custom Integration (Recommended)/Images.xcassets/LaunchImage.launchimage/Contents.json diff --git a/Example/Custom Integration/Info.plist b/Example/Custom Integration (Recommended)/Info.plist similarity index 100% rename from Example/Custom Integration/Info.plist rename to Example/Custom Integration (Recommended)/Info.plist diff --git a/Example/Custom Integration/README.md b/Example/Custom Integration (Recommended)/README.md similarity index 100% rename from Example/Custom Integration/README.md rename to Example/Custom Integration (Recommended)/README.md diff --git a/Example/Custom Integration/ShippingManager.h b/Example/Custom Integration (Recommended)/ShippingManager.h similarity index 100% rename from Example/Custom Integration/ShippingManager.h rename to Example/Custom Integration (Recommended)/ShippingManager.h diff --git a/Example/Custom Integration/ShippingManager.m b/Example/Custom Integration (Recommended)/ShippingManager.m similarity index 100% rename from Example/Custom Integration/ShippingManager.m rename to Example/Custom Integration (Recommended)/ShippingManager.m diff --git a/Example/Custom Integration/SofortExampleViewController.h b/Example/Custom Integration (Recommended)/SofortExampleViewController.h similarity index 100% rename from Example/Custom Integration/SofortExampleViewController.h rename to Example/Custom Integration (Recommended)/SofortExampleViewController.h diff --git a/Example/Custom Integration/SofortExampleViewController.m b/Example/Custom Integration (Recommended)/SofortExampleViewController.m similarity index 100% rename from Example/Custom Integration/SofortExampleViewController.m rename to Example/Custom Integration (Recommended)/SofortExampleViewController.m diff --git a/Example/Custom Integration/de.lproj/Localizable.strings b/Example/Custom Integration (Recommended)/de.lproj/Localizable.strings similarity index 100% rename from Example/Custom Integration/de.lproj/Localizable.strings rename to Example/Custom Integration (Recommended)/de.lproj/Localizable.strings diff --git a/Example/Custom Integration/en.lproj/Localizable.strings b/Example/Custom Integration (Recommended)/en.lproj/Localizable.strings similarity index 100% rename from Example/Custom Integration/en.lproj/Localizable.strings rename to Example/Custom Integration (Recommended)/en.lproj/Localizable.strings diff --git a/Example/Custom Integration/es.lproj/Localizable.strings b/Example/Custom Integration (Recommended)/es.lproj/Localizable.strings similarity index 100% rename from Example/Custom Integration/es.lproj/Localizable.strings rename to Example/Custom Integration (Recommended)/es.lproj/Localizable.strings diff --git a/Example/Custom Integration/fi.lproj/Localizable.strings b/Example/Custom Integration (Recommended)/fi.lproj/Localizable.strings similarity index 100% rename from Example/Custom Integration/fi.lproj/Localizable.strings rename to Example/Custom Integration (Recommended)/fi.lproj/Localizable.strings diff --git a/Example/Custom Integration/fr.lproj/Localizable.strings b/Example/Custom Integration (Recommended)/fr.lproj/Localizable.strings similarity index 100% rename from Example/Custom Integration/fr.lproj/Localizable.strings rename to Example/Custom Integration (Recommended)/fr.lproj/Localizable.strings diff --git a/Example/Custom Integration/it.lproj/Localizable.strings b/Example/Custom Integration (Recommended)/it.lproj/Localizable.strings similarity index 100% rename from Example/Custom Integration/it.lproj/Localizable.strings rename to Example/Custom Integration (Recommended)/it.lproj/Localizable.strings diff --git a/Example/Custom Integration/ja.lproj/Localizable.strings b/Example/Custom Integration (Recommended)/ja.lproj/Localizable.strings similarity index 100% rename from Example/Custom Integration/ja.lproj/Localizable.strings rename to Example/Custom Integration (Recommended)/ja.lproj/Localizable.strings diff --git a/Example/Custom Integration/main.m b/Example/Custom Integration (Recommended)/main.m similarity index 100% rename from Example/Custom Integration/main.m rename to Example/Custom Integration (Recommended)/main.m diff --git a/Example/Custom Integration/nb.lproj/Localizable.strings b/Example/Custom Integration (Recommended)/nb.lproj/Localizable.strings similarity index 100% rename from Example/Custom Integration/nb.lproj/Localizable.strings rename to Example/Custom Integration (Recommended)/nb.lproj/Localizable.strings diff --git a/Example/Custom Integration/nl.lproj/Localizable.strings b/Example/Custom Integration (Recommended)/nl.lproj/Localizable.strings similarity index 100% rename from Example/Custom Integration/nl.lproj/Localizable.strings rename to Example/Custom Integration (Recommended)/nl.lproj/Localizable.strings diff --git a/Example/Custom Integration/zh-Hans.lproj/Localizable.strings b/Example/Custom Integration (Recommended)/zh-Hans.lproj/Localizable.strings similarity index 100% rename from Example/Custom Integration/zh-Hans.lproj/Localizable.strings rename to Example/Custom Integration (Recommended)/zh-Hans.lproj/Localizable.strings diff --git a/Example/README.md b/Example/README.md index fd808d7ba1..57c50f07b7 100644 --- a/Example/README.md +++ b/Example/README.md @@ -3,5 +3,5 @@ There are 3 example apps included in the repository: - [**UI Examples** Example/UI Examples/README.md ](/Example/UI%20Examples/README.md) -- [**Standard Integration (Swift)** Example/Standard Integration (Swift)/README.md](/Example/Standard%20Integration%20%28Swift%29/README.md) -- [**Custom Integration (ObjC)** Example/Custom Integration (Swift)/README.md](/Example/Custom%20Integration%20%28ObjC%29/README.md) +- [**Standard Integration (Sources Only)** Example/Standard Integration (Sources Only)/README.md](/Example/Standard%20Integration%20%28Sources%20Only%29/README.md) +- [**Custom Integration (Recommended)** Example/Custom Integration (Recommended)/README.md](/Example/Custom%20Integration%20%28Recommended%29/README.md) diff --git a/Example/Standard Integration (Swift)/AppDelegate.swift b/Example/Standard Integration (Sources Only)/AppDelegate.swift similarity index 100% rename from Example/Standard Integration (Swift)/AppDelegate.swift rename to Example/Standard Integration (Sources Only)/AppDelegate.swift diff --git a/Example/Standard Integration (Swift)/BrowseProductsViewController.swift b/Example/Standard Integration (Sources Only)/BrowseProductsViewController.swift similarity index 100% rename from Example/Standard Integration (Swift)/BrowseProductsViewController.swift rename to Example/Standard Integration (Sources Only)/BrowseProductsViewController.swift diff --git a/Example/Standard Integration (Swift)/Buttons.swift b/Example/Standard Integration (Sources Only)/Buttons.swift similarity index 100% rename from Example/Standard Integration (Swift)/Buttons.swift rename to Example/Standard Integration (Sources Only)/Buttons.swift diff --git a/Example/Standard Integration (Swift)/CheckoutRowView.swift b/Example/Standard Integration (Sources Only)/CheckoutRowView.swift similarity index 100% rename from Example/Standard Integration (Swift)/CheckoutRowView.swift rename to Example/Standard Integration (Sources Only)/CheckoutRowView.swift diff --git a/Example/Standard Integration (Swift)/CheckoutViewController.swift b/Example/Standard Integration (Sources Only)/CheckoutViewController.swift similarity index 100% rename from Example/Standard Integration (Swift)/CheckoutViewController.swift rename to Example/Standard Integration (Sources Only)/CheckoutViewController.swift diff --git a/Example/Standard Integration (Swift)/Images.xcassets/AppIcon.appiconset/Contents.json b/Example/Standard Integration (Sources Only)/Images.xcassets/AppIcon.appiconset/Contents.json similarity index 100% rename from Example/Standard Integration (Swift)/Images.xcassets/AppIcon.appiconset/Contents.json rename to Example/Standard Integration (Sources Only)/Images.xcassets/AppIcon.appiconset/Contents.json diff --git a/Example/Standard Integration (Swift)/Images.xcassets/LaunchImage.launchimage/Contents.json b/Example/Standard Integration (Sources Only)/Images.xcassets/LaunchImage.launchimage/Contents.json similarity index 100% rename from Example/Standard Integration (Swift)/Images.xcassets/LaunchImage.launchimage/Contents.json rename to Example/Standard Integration (Sources Only)/Images.xcassets/LaunchImage.launchimage/Contents.json diff --git a/Example/Standard Integration (Swift)/Images.xcassets/llamas.imageset/Contents.json b/Example/Standard Integration (Sources Only)/Images.xcassets/llamas.imageset/Contents.json similarity index 100% rename from Example/Standard Integration (Swift)/Images.xcassets/llamas.imageset/Contents.json rename to Example/Standard Integration (Sources Only)/Images.xcassets/llamas.imageset/Contents.json diff --git a/Example/Standard Integration (Swift)/Images.xcassets/llamas.imageset/llamas.jpg b/Example/Standard Integration (Sources Only)/Images.xcassets/llamas.imageset/llamas.jpg similarity index 100% rename from Example/Standard Integration (Swift)/Images.xcassets/llamas.imageset/llamas.jpg rename to Example/Standard Integration (Sources Only)/Images.xcassets/llamas.imageset/llamas.jpg diff --git a/Example/Standard Integration (Swift)/Images.xcassets/llamas.imageset/llamas@2x.jpg b/Example/Standard Integration (Sources Only)/Images.xcassets/llamas.imageset/llamas@2x.jpg similarity index 100% rename from Example/Standard Integration (Swift)/Images.xcassets/llamas.imageset/llamas@2x.jpg rename to Example/Standard Integration (Sources Only)/Images.xcassets/llamas.imageset/llamas@2x.jpg diff --git a/Example/Standard Integration (Swift)/Info.plist b/Example/Standard Integration (Sources Only)/Info.plist similarity index 100% rename from Example/Standard Integration (Swift)/Info.plist rename to Example/Standard Integration (Sources Only)/Info.plist diff --git a/Example/Standard Integration (Swift)/Localizations/de.lproj/Localizable.strings b/Example/Standard Integration (Sources Only)/Localizations/de.lproj/Localizable.strings similarity index 100% rename from Example/Standard Integration (Swift)/Localizations/de.lproj/Localizable.strings rename to Example/Standard Integration (Sources Only)/Localizations/de.lproj/Localizable.strings diff --git a/Example/Standard Integration (Swift)/Localizations/en.lproj/Localizable.strings b/Example/Standard Integration (Sources Only)/Localizations/en.lproj/Localizable.strings similarity index 100% rename from Example/Standard Integration (Swift)/Localizations/en.lproj/Localizable.strings rename to Example/Standard Integration (Sources Only)/Localizations/en.lproj/Localizable.strings diff --git a/Example/Standard Integration (Swift)/Localizations/es.lproj/Localizable.strings b/Example/Standard Integration (Sources Only)/Localizations/es.lproj/Localizable.strings similarity index 100% rename from Example/Standard Integration (Swift)/Localizations/es.lproj/Localizable.strings rename to Example/Standard Integration (Sources Only)/Localizations/es.lproj/Localizable.strings diff --git a/Example/Standard Integration (Swift)/Localizations/fi.lproj/Localizable.strings b/Example/Standard Integration (Sources Only)/Localizations/fi.lproj/Localizable.strings similarity index 100% rename from Example/Standard Integration (Swift)/Localizations/fi.lproj/Localizable.strings rename to Example/Standard Integration (Sources Only)/Localizations/fi.lproj/Localizable.strings diff --git a/Example/Standard Integration (Swift)/Localizations/fr.lproj/Localizable.strings b/Example/Standard Integration (Sources Only)/Localizations/fr.lproj/Localizable.strings similarity index 100% rename from Example/Standard Integration (Swift)/Localizations/fr.lproj/Localizable.strings rename to Example/Standard Integration (Sources Only)/Localizations/fr.lproj/Localizable.strings diff --git a/Example/Standard Integration (Swift)/Localizations/it.lproj/Localizable.strings b/Example/Standard Integration (Sources Only)/Localizations/it.lproj/Localizable.strings similarity index 100% rename from Example/Standard Integration (Swift)/Localizations/it.lproj/Localizable.strings rename to Example/Standard Integration (Sources Only)/Localizations/it.lproj/Localizable.strings diff --git a/Example/Standard Integration (Swift)/Localizations/ja.lproj/Localizable.strings b/Example/Standard Integration (Sources Only)/Localizations/ja.lproj/Localizable.strings similarity index 100% rename from Example/Standard Integration (Swift)/Localizations/ja.lproj/Localizable.strings rename to Example/Standard Integration (Sources Only)/Localizations/ja.lproj/Localizable.strings diff --git a/Example/Standard Integration (Swift)/Localizations/nb.lproj/Localizable.strings b/Example/Standard Integration (Sources Only)/Localizations/nb.lproj/Localizable.strings similarity index 100% rename from Example/Standard Integration (Swift)/Localizations/nb.lproj/Localizable.strings rename to Example/Standard Integration (Sources Only)/Localizations/nb.lproj/Localizable.strings diff --git a/Example/Standard Integration (Swift)/Localizations/nl.lproj/Localizable.strings b/Example/Standard Integration (Sources Only)/Localizations/nl.lproj/Localizable.strings similarity index 100% rename from Example/Standard Integration (Swift)/Localizations/nl.lproj/Localizable.strings rename to Example/Standard Integration (Sources Only)/Localizations/nl.lproj/Localizable.strings diff --git a/Example/Standard Integration (Swift)/Localizations/zh-Hans.lproj/Localizable.strings b/Example/Standard Integration (Sources Only)/Localizations/zh-Hans.lproj/Localizable.strings similarity index 100% rename from Example/Standard Integration (Swift)/Localizations/zh-Hans.lproj/Localizable.strings rename to Example/Standard Integration (Sources Only)/Localizations/zh-Hans.lproj/Localizable.strings diff --git a/Example/Standard Integration (Swift)/MyAPIClient.swift b/Example/Standard Integration (Sources Only)/MyAPIClient.swift similarity index 100% rename from Example/Standard Integration (Swift)/MyAPIClient.swift rename to Example/Standard Integration (Sources Only)/MyAPIClient.swift diff --git a/Example/Standard Integration (Swift)/PaymentContextFooterView.swift b/Example/Standard Integration (Sources Only)/PaymentContextFooterView.swift similarity index 100% rename from Example/Standard Integration (Swift)/PaymentContextFooterView.swift rename to Example/Standard Integration (Sources Only)/PaymentContextFooterView.swift diff --git a/Example/Standard Integration (Swift)/README.md b/Example/Standard Integration (Sources Only)/README.md similarity index 100% rename from Example/Standard Integration (Swift)/README.md rename to Example/Standard Integration (Sources Only)/README.md diff --git a/Example/Standard Integration (Swift)/SettingsViewController.swift b/Example/Standard Integration (Sources Only)/SettingsViewController.swift similarity index 100% rename from Example/Standard Integration (Swift)/SettingsViewController.swift rename to Example/Standard Integration (Sources Only)/SettingsViewController.swift diff --git a/Example/Standard Integration (Swift)/Standard Integration (Swift).entitlements b/Example/Standard Integration (Sources Only)/Standard Integration (Swift).entitlements similarity index 100% rename from Example/Standard Integration (Swift)/Standard Integration (Swift).entitlements rename to Example/Standard Integration (Sources Only)/Standard Integration (Swift).entitlements diff --git a/README.md b/README.md index 041ee4dd4c..73451f6f42 100644 --- a/README.md +++ b/README.md @@ -42,8 +42,8 @@ Please see our [iOS Integration Guide](https://stripe.com/docs/mobile/ios) which There are 3 example apps included in the repository: - [**UI Examples** Example/UI Examples/README.md ](/Example/UI%20Examples/README.md) -- [**Standard Integration (Sources Only)** Example/Standard Integration (Swift)/README.md](/Example/Standard%20Integration%20%28Swift%29/README.md) -- [**Custom Integration (Recommended)** Example/Custom Integration/README.md](/Example/Custom%20Integration%20/README.md) +- [**Standard Integration (Sources Only)** Example/Standard Integration (Sources Only)/README.md](/Example/Standard%20Integration%20%28Sources%20Only%29/README.md) +- [**Custom Integration (Recommended)** Example/Custom Integration (Recommended)/README.md](/Example/Custom%20Integration%20%28Recommended%29/README.md) ## Card IO From 6765d9a945aa52cb3b998dcbe7304dbb622d3f55 Mon Sep 17 00:00:00 2001 From: Yuki Tokuhiro Date: Mon, 13 May 2019 14:25:01 -0700 Subject: [PATCH 2/4] Rename all the other instances of '(Swift)' to '(Sources Only)' --- .../project.pbxproj | 25 ++++++++++--------- .../AppDelegate.swift | 2 +- .../BrowseProductsViewController.swift | 2 +- .../Buttons.swift | 2 +- .../CheckoutRowView.swift | 2 +- .../CheckoutViewController.swift | 2 +- .../MyAPIClient.swift | 2 +- .../PaymentContextFooterView.swift | 2 +- .../README.md | 4 +-- .../SettingsViewController.swift | 2 +- Example/UI Examples/README.md | 2 +- README.md | 2 +- STYLEGUIDE.md | 4 +-- install_cardio.rb | 2 +- setup.sh | 4 +-- 15 files changed, 30 insertions(+), 29 deletions(-) diff --git a/Example/Standard Integration (Sources Only).xcodeproj/project.pbxproj b/Example/Standard Integration (Sources Only).xcodeproj/project.pbxproj index a5d8bdb152..fc6ed8f92e 100644 --- a/Example/Standard Integration (Sources Only).xcodeproj/project.pbxproj +++ b/Example/Standard Integration (Sources Only).xcodeproj/project.pbxproj @@ -42,7 +42,7 @@ 042CA41A1A685E8D00D778E7 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; 04823F781A6849200098400B /* Standard Integration (Sources Only).app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "Standard Integration (Sources Only).app"; sourceTree = BUILT_PRODUCTS_DIR; }; 04BC299F1CD81D3900318357 /* BrowseProductsViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = BrowseProductsViewController.swift; sourceTree = ""; }; - 04D075D91A69B82B00094431 /* Standard Integration (Swift).entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = "Standard Integration (Swift).entitlements"; sourceTree = ""; }; + 04D075D91A69B82B00094431 /* Standard Integration (Sources Only).entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = "Standard Integration (Sources Only).entitlements"; sourceTree = ""; }; 04D076191A69C14700094431 /* Stripe.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = Stripe.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 8BBD79D2207FD44300F85BED /* fi */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.strings; name = fi; path = Localizations/fi.lproj/Localizable.strings; sourceTree = ""; }; 8BBD79D3207FD45A00F85BED /* nb */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.strings; name = nb; path = Localizations/nb.lproj/Localizable.strings; sourceTree = ""; }; @@ -59,7 +59,7 @@ C13C24211D14438700F3765E /* SettingsViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SettingsViewController.swift; sourceTree = ""; }; C186AC331ECD0DDD00497DE3 /* Alamofire.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Alamofire.framework; path = Carthage/Build/iOS/Alamofire.framework; sourceTree = ""; }; C188F2A51CC1A338003A524B /* MyAPIClient.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MyAPIClient.swift; sourceTree = ""; }; - C18A6EE11F1EB78B005600CC /* README.md */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = net.daringfireball.markdown; name = README.md; path = "Standard Integration (Swift)/README.md"; sourceTree = ""; }; + C18A6EE11F1EB78B005600CC /* README.md */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = net.daringfireball.markdown; name = README.md; path = "Standard Integration (Sources Only)/README.md"; sourceTree = ""; }; C1B83CBC1CCE6C0700F0790B /* Buttons.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Buttons.swift; sourceTree = ""; }; F1D12FE61F91721600CE68A7 /* PaymentContextFooterView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PaymentContextFooterView.swift; sourceTree = ""; }; /* End PBXFileReference section */ @@ -77,7 +77,7 @@ /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ - 042CA4131A685E8D00D778E7 /* Standard Integration (Swift) */ = { + 042CA4131A685E8D00D778E7 /* Standard Integration (Sources Only) */ = { isa = PBXGroup; children = ( 042CA4141A685E8D00D778E7 /* AppDelegate.swift */, @@ -90,17 +90,17 @@ F1D12FE61F91721600CE68A7 /* PaymentContextFooterView.swift */, 042CA4191A685E8D00D778E7 /* Images.xcassets */, 042CA41A1A685E8D00D778E7 /* Info.plist */, - 04D075D91A69B82B00094431 /* Standard Integration (Swift).entitlements */, + 04D075D91A69B82B00094431 /* Standard Integration (Sources Only).entitlements */, C13886641F293F9F00380D46 /* Localizable.strings */, ); - path = "Standard Integration (Swift)"; + path = "Standard Integration (Sources Only)"; sourceTree = ""; }; 04823F6F1A6849200098400B = { isa = PBXGroup; children = ( C18A6EE11F1EB78B005600CC /* README.md */, - 042CA4131A685E8D00D778E7 /* Standard Integration (Swift) */, + 042CA4131A685E8D00D778E7 /* Standard Integration (Sources Only) */, 04823F9F1A6849850098400B /* Frameworks */, 04823F791A6849200098400B /* Products */, ); @@ -180,6 +180,7 @@ developmentRegion = English; hasScannedForEncodings = 0; knownRegions = ( + English, en, fr, de, @@ -349,7 +350,7 @@ MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; SDKROOT = iphoneos; - SWIFT_OBJC_BRIDGING_HEADER = "Standard Integration (Swift)/Standard Integration (Swift)-Bridging-Header.h"; + SWIFT_OBJC_BRIDGING_HEADER = "Standard Integration (Sources Only)/Standard Integration (Sources Only)-Bridging-Header.h"; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; }; name = Debug; @@ -397,7 +398,7 @@ IPHONEOS_DEPLOYMENT_TARGET = 9.0; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = iphoneos; - SWIFT_OBJC_BRIDGING_HEADER = "Standard Integration (Swift)/Standard Integration (Swift)-Bridging-Header.h"; + SWIFT_OBJC_BRIDGING_HEADER = "Standard Integration (Sources Only)/Standard Integration (Sources Only)-Bridging-Header.h"; SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; VALIDATE_PRODUCT = YES; }; @@ -408,7 +409,7 @@ buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; - CODE_SIGN_ENTITLEMENTS = "Standard Integration (Swift)/Standard Integration (Swift).entitlements"; + CODE_SIGN_ENTITLEMENTS = "Standard Integration (Sources Only)/Standard Integration (Sources Only).entitlements"; CODE_SIGN_IDENTITY = "iPhone Developer"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; DEFINES_MODULE = YES; @@ -419,7 +420,7 @@ "$(PROJECT_DIR)/Carthage/Build/iOS", ); GCC_TREAT_WARNINGS_AS_ERRORS = YES; - INFOPLIST_FILE = "Standard Integration (Swift)/Info.plist"; + INFOPLIST_FILE = "Standard Integration (Sources Only)/Info.plist"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = com.stripe.SimpleSDKExample; PRODUCT_NAME = "Standard Integration (Sources Only)"; @@ -437,7 +438,7 @@ buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; - CODE_SIGN_ENTITLEMENTS = "Standard Integration (Swift)/Standard Integration (Swift).entitlements"; + CODE_SIGN_ENTITLEMENTS = "Standard Integration (Sources Only)/Standard Integration (Sources Only).entitlements"; CODE_SIGN_IDENTITY = "iPhone Developer"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; DEFINES_MODULE = YES; @@ -448,7 +449,7 @@ "$(PROJECT_DIR)/Carthage/Build/iOS", ); GCC_TREAT_WARNINGS_AS_ERRORS = YES; - INFOPLIST_FILE = "Standard Integration (Swift)/Info.plist"; + INFOPLIST_FILE = "Standard Integration (Sources Only)/Info.plist"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = com.stripe.SimpleSDKExample; PRODUCT_NAME = "Standard Integration (Sources Only)"; diff --git a/Example/Standard Integration (Sources Only)/AppDelegate.swift b/Example/Standard Integration (Sources Only)/AppDelegate.swift index 94588429e4..3bb8cf9bfa 100644 --- a/Example/Standard Integration (Sources Only)/AppDelegate.swift +++ b/Example/Standard Integration (Sources Only)/AppDelegate.swift @@ -1,6 +1,6 @@ // // AppDelegate.swift -// Standard Integration (Swift) +// Standard Integration (Sources Only) // // Created by Jack Flintermann on 1/15/15. // Copyright (c) 2015 Stripe. All rights reserved. diff --git a/Example/Standard Integration (Sources Only)/BrowseProductsViewController.swift b/Example/Standard Integration (Sources Only)/BrowseProductsViewController.swift index dbdec33112..d9e551cf0d 100644 --- a/Example/Standard Integration (Sources Only)/BrowseProductsViewController.swift +++ b/Example/Standard Integration (Sources Only)/BrowseProductsViewController.swift @@ -1,6 +1,6 @@ // // BrowseProductsViewController.swift -// Standard Integration (Swift) +// Standard Integration (Sources Only) // // Created by Jack Flintermann on 5/2/16. // Copyright © 2016 Stripe. All rights reserved. diff --git a/Example/Standard Integration (Sources Only)/Buttons.swift b/Example/Standard Integration (Sources Only)/Buttons.swift index 9710eb6cca..2c373eefe4 100644 --- a/Example/Standard Integration (Sources Only)/Buttons.swift +++ b/Example/Standard Integration (Sources Only)/Buttons.swift @@ -1,6 +1,6 @@ // // Buttons.swift -// Standard Integration (Swift) +// Standard Integration (Sources Only) // // Created by Ben Guo on 4/25/16. // Copyright © 2016 Stripe. All rights reserved. diff --git a/Example/Standard Integration (Sources Only)/CheckoutRowView.swift b/Example/Standard Integration (Sources Only)/CheckoutRowView.swift index ff1f694e44..9c05985f08 100644 --- a/Example/Standard Integration (Sources Only)/CheckoutRowView.swift +++ b/Example/Standard Integration (Sources Only)/CheckoutRowView.swift @@ -1,6 +1,6 @@ // // CheckoutRowView.swift -// Standard Integration (Swift) +// Standard Integration (Sources Only) // // Created by Ben Guo on 4/22/16. // Copyright © 2016 Stripe. All rights reserved. diff --git a/Example/Standard Integration (Sources Only)/CheckoutViewController.swift b/Example/Standard Integration (Sources Only)/CheckoutViewController.swift index 8fa557a297..1006d97876 100644 --- a/Example/Standard Integration (Sources Only)/CheckoutViewController.swift +++ b/Example/Standard Integration (Sources Only)/CheckoutViewController.swift @@ -1,6 +1,6 @@ // // CheckoutViewController.swift -// Standard Integration (Swift) +// Standard Integration (Sources Only) // // Created by Ben Guo on 4/22/16. // Copyright © 2016 Stripe. All rights reserved. diff --git a/Example/Standard Integration (Sources Only)/MyAPIClient.swift b/Example/Standard Integration (Sources Only)/MyAPIClient.swift index 80c77e107d..96e3a24b19 100644 --- a/Example/Standard Integration (Sources Only)/MyAPIClient.swift +++ b/Example/Standard Integration (Sources Only)/MyAPIClient.swift @@ -1,6 +1,6 @@ // // BackendAPIAdapter.swift -// Standard Integration (Swift) +// Standard Integration (Sources Only) // // Created by Ben Guo on 4/15/16. // Copyright © 2016 Stripe. All rights reserved. diff --git a/Example/Standard Integration (Sources Only)/PaymentContextFooterView.swift b/Example/Standard Integration (Sources Only)/PaymentContextFooterView.swift index 957d237a39..4496027043 100644 --- a/Example/Standard Integration (Sources Only)/PaymentContextFooterView.swift +++ b/Example/Standard Integration (Sources Only)/PaymentContextFooterView.swift @@ -1,6 +1,6 @@ // // PaymentContextFooterView.swift -// Standard Integration (Swift) +// Standard Integration (Sources Only) // // Created by Brian Dorfman on 10/13/17. // Copyright © 2017 Stripe. All rights reserved. diff --git a/Example/Standard Integration (Sources Only)/README.md b/Example/Standard Integration (Sources Only)/README.md index 153b8c6a58..f6ea4ba627 100644 --- a/Example/Standard Integration (Sources Only)/README.md +++ b/Example/Standard Integration (Sources Only)/README.md @@ -9,9 +9,9 @@ For a detailed guide, see https://stripe.com/docs/mobile/ios/standard 1. If you haven't already, sign up for a [Stripe account](https://dashboard.stripe.com/register) (it takes seconds). Then go to https://dashboard.stripe.com/account/apikeys. 2. Execute `./setup.sh` from the root of the repository to build the necessary dependencies 3. Open `./Stripe.xcworkspace` (not `./Stripe.xcodeproj`) with Xcode -4. Fill in the `stripePublishableKey` constant in `./Example/Standard Integration (Swift)/CheckoutViewController.swift` with your test "Publishable key" from Stripe. This key should start with `pk_test`. +4. Fill in the `stripePublishableKey` constant in `./Example/Standard Integration (Sources Only)/CheckoutViewController.swift` with your test "Publishable key" from Stripe. This key should start with `pk_test`. 5. Head to [example-ios-backend](https://github.com/stripe/example-ios-backend/tree/v15.0.1) and click "Deploy to Heroku". Provide your Stripe test "Secret key" as the `STRIPE_TEST_SECRET_KEY` environment variable. This key should start with `pk_test`. -6. Fill in the `backendBaseURL` constant in `./Example/Standard Integration (Swift)/CheckoutViewController.swift` with the app URL Heroku provides (e.g. "https://my-example-app.herokuapp.com") +6. Fill in the `backendBaseURL` constant in `./Example/Standard Integration (Sources Only)/CheckoutViewController.swift` with the app URL Heroku provides (e.g. "https://my-example-app.herokuapp.com") After this is done, you can make test payments through the app and see them in your Stripe dashboard. diff --git a/Example/Standard Integration (Sources Only)/SettingsViewController.swift b/Example/Standard Integration (Sources Only)/SettingsViewController.swift index e4c95a107f..52de91c503 100644 --- a/Example/Standard Integration (Sources Only)/SettingsViewController.swift +++ b/Example/Standard Integration (Sources Only)/SettingsViewController.swift @@ -1,6 +1,6 @@ // // SettingsViewController.swift -// Standard Integration (Swift) +// Standard Integration (Sources Only) // // Created by Ben Guo on 6/17/16. // Copyright © 2016 Stripe. All rights reserved. diff --git a/Example/UI Examples/README.md b/Example/UI Examples/README.md index f8974292d6..0552390d7e 100644 --- a/Example/UI Examples/README.md +++ b/Example/UI Examples/README.md @@ -2,7 +2,7 @@ This example app lets you try out the pre-built UI components we provide. -You can run it without any initial setup and it's a great place to start if you're evaluating whether you want to use our [Standard Integration (Swift)](/Example/Standard%20Integration%20%28Swift%29/README.md) or build your own [Custom Integration (Recommended)](/Example/Custom%20Integration%20%28ObjC%29/README.md). +You can run it without any initial setup and it's a great place to start if you're evaluating whether you want to use our [Standard Integration (Sources Only)](/Example/Standard%20Integration%20%28Sources%20Only%29/README.md) or build your own [Custom Integration (Recommended)](/Example/Custom%20Integration%20%28ObjC%29/README.md). 1. Open `./Stripe.xcworkspace` (not `./Stripe.xcodeproj`) with Xcode 2. Build and run the "UI Examples" scheme diff --git a/README.md b/README.md index 73451f6f42..9d15b0b3e3 100644 --- a/README.md +++ b/README.md @@ -49,7 +49,7 @@ There are 3 example apps included in the repository: To add card scanning capabilities to our prebuilt UI components, you can simply [install card.io](https://github.com/card-io/card.io-iOS-SDK#setup) alongside our SDK. You'll also need to set `NSCameraUsageDescription` in your application's plist, and provide a reason for accessing the camera (e.g. "To scan cards"). -To try this out, you can run `./install_cardio.rb`, which will download and install card.io in Standard Integration (Swift). Now, when you run the example app on a device, you'll see a "Scan Card" button when adding a new card. +To try this out, you can run `./install_cardio.rb`, which will download and install card.io in Standard Integration (Sources Only). Now, when you run the example app on a device, you'll see a "Scan Card" button when adding a new card. ## Contributing diff --git a/STYLEGUIDE.md b/STYLEGUIDE.md index c936637085..d335493c71 100644 --- a/STYLEGUIDE.md +++ b/STYLEGUIDE.md @@ -108,8 +108,8 @@ static NSString * const STPSDKVersion = @"11.0.0"; - Save files to the appropriate root level folder. Typical folders include: - `stripe-ios/Stripe/` - `stripe-ios/Tests/Tests/` - - `stripe-ios/Example/Standard Integration (Swift)/` - - `stripe-ios/Example/Custom Integration (ObjC)/` + - `stripe-ios/Example/Standard Integration (Sources Only)/` + - `stripe-ios/Example/Custom Integration (Recommended)/` - Save public header files in `stripe-ios/Stripe/PublicHeaders/` for Cocoapods compatibility diff --git a/install_cardio.rb b/install_cardio.rb index 5645fb1c3b..cc4a1030de 100755 --- a/install_cardio.rb +++ b/install_cardio.rb @@ -17,7 +17,7 @@ open('Example/Cartfile', 'a') { |f| } system('cd Example; carthage update --platform ios') -project_name = 'Standard Integration (Swift)' +project_name = 'Standard Integration (Sources Only)' project_path = "Example/#{project_name}.xcodeproj" project = Xcodeproj::Project.open(project_path) diff --git a/setup.sh b/setup.sh index 676468d8d9..d206d54f81 100755 --- a/setup.sh +++ b/setup.sh @@ -1,6 +1,6 @@ #!/bin/bash -echo '▸ Installing dependencies for Standard Integration (Swift)'; +echo '▸ Installing dependencies for Standard Integration (Sources Only)'; cd Example; @@ -17,4 +17,4 @@ fi carthage bootstrap --platform ios; -echo '▸ Finished installing dependencies for Standard Integration (Swift)'; +echo '▸ Finished installing dependencies for Standard Integration (Sources Only)'; From 3923b7536f426c86d41b0ec50d7309f2a9645198 Mon Sep 17 00:00:00 2001 From: Yuki Tokuhiro Date: Mon, 13 May 2019 15:45:27 -0700 Subject: [PATCH 3/4] Rename entitlement --- ...itlements => Standard Integration (Sources Only).entitlements} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename Example/Standard Integration (Sources Only)/{Standard Integration (Swift).entitlements => Standard Integration (Sources Only).entitlements} (100%) diff --git a/Example/Standard Integration (Sources Only)/Standard Integration (Swift).entitlements b/Example/Standard Integration (Sources Only)/Standard Integration (Sources Only).entitlements similarity index 100% rename from Example/Standard Integration (Sources Only)/Standard Integration (Swift).entitlements rename to Example/Standard Integration (Sources Only)/Standard Integration (Sources Only).entitlements From c2e38a2564d8137002974a81f9d881c784b2974a Mon Sep 17 00:00:00 2001 From: Yuki Tokuhiro Date: Tue, 14 May 2019 10:03:01 -0700 Subject: [PATCH 4/4] Rename Custom Integration (Recommended) things too --- .../project.pbxproj | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/Example/Custom Integration (Recommended).xcodeproj/project.pbxproj b/Example/Custom Integration (Recommended).xcodeproj/project.pbxproj index b35c676170..a46eface15 100644 --- a/Example/Custom Integration (Recommended).xcodeproj/project.pbxproj +++ b/Example/Custom Integration (Recommended).xcodeproj/project.pbxproj @@ -53,7 +53,7 @@ 04533F111A68814100C7E52E /* Security.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Security.framework; path = System/Library/Frameworks/Security.framework; sourceTree = SDKROOT; }; 04533F171A688A0A00C7E52E /* Constants.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Constants.h; sourceTree = ""; }; 04533F181A688A0A00C7E52E /* Constants.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = Constants.m; sourceTree = ""; }; - 366F93AF225FF2A2005CFBF6 /* README.md */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = net.daringfireball.markdown; name = README.md; path = "Custom Integration/README.md"; sourceTree = ""; }; + 366F93AF225FF2A2005CFBF6 /* README.md */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = net.daringfireball.markdown; path = README.md; sourceTree = ""; }; 8BBD79C7207FD2F900F85BED /* en */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/Localizable.strings; sourceTree = ""; }; 8BBD79C9207FD31A00F85BED /* zh-Hans */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.strings; name = "zh-Hans"; path = "zh-Hans.lproj/Localizable.strings"; sourceTree = ""; }; 8BBD79CA207FD32100F85BED /* nl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.strings; name = nl; path = nl.lproj/Localizable.strings; sourceTree = ""; }; @@ -94,7 +94,7 @@ isa = PBXGroup; children = ( 366F93AF225FF2A2005CFBF6 /* README.md */, - 04533E891A687F5D00C7E52E /* Custom Integration */, + 04533E891A687F5D00C7E52E /* Custom Integration (Recommended) */, 04533F0E1A68813100C7E52E /* Frameworks */, 04533E881A687F5D00C7E52E /* Products */, ); @@ -108,7 +108,7 @@ name = Products; sourceTree = ""; }; - 04533E891A687F5D00C7E52E /* Custom Integration */ = { + 04533E891A687F5D00C7E52E /* Custom Integration (Recommended) */ = { isa = PBXGroup; children = ( 04533E8E1A687F5D00C7E52E /* AppDelegate.h */, @@ -131,7 +131,7 @@ C1CACE931E5E3DF6002D0821 /* SofortExampleViewController.m */, 04533E8A1A687F5D00C7E52E /* Supporting Files */, ); - path = "Custom Integration"; + path = "Custom Integration (Recommended)"; sourceTree = ""; }; 04533E8A1A687F5D00C7E52E /* Supporting Files */ = { @@ -194,6 +194,7 @@ developmentRegion = English; hasScannedForEncodings = 0; knownRegions = ( + English, en, "zh-Hans", nl, @@ -401,7 +402,7 @@ "$(inherited)", "$(PROJECT_DIR)/**", ); - INFOPLIST_FILE = "$(SRCROOT)/Custom Integration/Info.plist"; + INFOPLIST_FILE = "$(SRCROOT)/Custom Integration (Recommended)/Info.plist"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = com.stripe.CustomSDKExample; PRODUCT_NAME = "$(TARGET_NAME)"; @@ -425,7 +426,7 @@ "$(inherited)", "$(PROJECT_DIR)/**", ); - INFOPLIST_FILE = "$(SRCROOT)/Custom Integration/Info.plist"; + INFOPLIST_FILE = "$(SRCROOT)/Custom Integration (Recommended)/Info.plist"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = com.stripe.CustomSDKExample; PRODUCT_NAME = "$(TARGET_NAME)";