Merge mater

.gitignore

@@ -1,12 +1,47 @@
 .DS_Store
 .atom/
-.idea
+.idea/
+.vscode/
+
 .packages
 .pub/
-build/
-ios/.generated/
-packages
+.dart_tool/
 pubspec.lock
-example/ios/Flutter/
-example/.dart_tool
-example/ios/.symlinks
+flutter_export_environment.sh
+
+examples/all_plugins/pubspec.yaml
+
+Podfile.lock
+Pods/
+.symlinks/
+**/Flutter/App.framework/
+**/Flutter/ephemeral/
+**/Flutter/Flutter.framework/
+**/Flutter/Generated.xcconfig
+**/Flutter/flutter_assets/
+
+ServiceDefinitions.json
+xcuserdata/
+**/DerivedData/
+
+local.properties
+keystore.properties
+.gradle/
+gradlew
+gradlew.bat
+gradle-wrapper.jar
+.flutter-plugins-dependencies
+*.iml
+
+GeneratedPluginRegistrant.h
+GeneratedPluginRegistrant.m
+GeneratedPluginRegistrant.java
+GeneratedPluginRegistrant.swift
+build/
+.flutter-plugins
+
+.project
+.classpath
+.settings
+
+example/ios/Flutter/Flutter.podspec

CHANGELOG.md

@@ -1,3 +1,34 @@
+## [1.1.4]
+- Fix #311
+
+## [1.1.3]
+- Fix #301, #304, #305
+
+## [1.1.1]
+- add information about the plugin being discontinued and its replacement
+
+## [1.1.0]
+- support for null safety
+- Xcode 12.5 is not supported - see this [discussion](https://github.com/jonasbark/flutter_stripe_payment/issues/284#issuecomment-828293850) for a fix
+
+## [1.0.11]
+- fix #258 (by @Trede98)
+
+## [1.0.10]
+- update sdk signature information (by @davidme-stripe)
+
+## [1.0.9]
+- fix issues with Stripe iOS dependency
+
+## [1.0.8]
+- fix errors with shippingMethod for Apple Play (thanks @andhieka)
+- preserve card name on iOS (thanks @brauliolomeli)
+- currency support for CreditCard model (thanks @cis-emp1822)
+
+## [1.0.7]
+- update Stripe iOS dependency to support Xcode 11.4 (#131)
+- bump Android gradle for latest Flutter support (thanks @ened)
+
 ## [1.0.6]
 - fix #97 (thanks @sandeep-at-airlift)
 - support Stripe Connected accounts (thanks @nicowernli)

README.md

@@ -1,3 +1,7 @@
+> **⚠ WARNING: This plugin has been discontinued.**  
+> Head over to [migration.md](migration.md) for migrate to the new flutter_stripe plugin
+
+
 [![pub package](https://img.shields.io/pub/v/stripe_payment.svg)](https://pub.dev/packages/stripe_payment)
 
 # stripe_payment
@@ -6,9 +10,9 @@
 
 ## Quick Glance
 
-- This Flutter plugin is a straight port from tipsi-stripe plugin for React Native - we tried to 
-keep the API as close as possible so the documentation applies this this plugin as well.
-- Collect chargable tokens from users' **Card Input** and **Apple & Google Pay**
+- This Flutter plugin is a straight port from the tipsi-stripe plugin for React Native - we tried to 
+keep the API as close as possible, so the documentation applies this plugin.
+- Collect chargeable tokens from users' **Card Input** and** Apple & Google Pay**.
 - For **SCA** compliant apps, setup payment intents for later confirmation.
 
 ## Supported features:
@@ -57,4 +61,10 @@ As this plugin is a port from tipsi-stripe for React Native you may consult thei
 https://github.com/tipsi/tipsi-stripe/tree/experimental-connect/website/docs-md
 It includes:
 - how to setup Google / Apple Pay
-- method documentations
+- method documentations
+
+## Blog Posts
+- [Build a marketplace in your Flutter app and accept payments using Stripe and Firebase](https://medium.com/flutter-community/build-a-marketplace-in-your-flutter-app-and-accept-payments-using-stripe-and-firebase-72f3f7228625)
+
+## Xcode 12.5 support
+Xcode 12.5 is not supported - see this [discussion](https://github.com/jonasbark/flutter_stripe_payment/issues/284#issuecomment-828293850) for a fix

android/build.gradle

@@ -9,8 +9,8 @@ buildscript {
     }
 
     dependencies {
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.50"
-        classpath 'com.android.tools.build:gradle:3.5.0'
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.70"
+        classpath 'com.android.tools.build:gradle:3.6.1'
     }
 }
 
@@ -68,8 +68,9 @@ android {
 }
 
 dependencies {
-    api 'org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.50'
-    implementation 'com.android.support:support-annotations:28.0.0'
-    implementation 'com.stripe:stripe-android:10.4.6'
+    api 'org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.70'
+    implementation 'androidx.annotation:annotation:1.1.0'
+    implementation 'com.stripe:stripe-android:16.10.0'
+    implementation 'com.android.support:appcompat-v7:28.0.0'
     implementation 'com.google.android.gms:play-services-wallet:18.0.0'
 }