Merge branch 'master' into mindapps_develop

* master:
  Remove meta in dep
  fix for hyochan#230 (hyochan#231)
  Release 2.3.1
  Release 2.3.0
  iOS Promotional Offers Fix (hyochan#220)
  Adding introductoryPriceNumberIOS (hyochan#214)
  IAPItem deserialization fix (hyochan#212)
  Fix a typo (eneabled -> enabled) (hyochan#216)
  Fix typo (hyochan#210)

# Conflicts:
#	lib/modules.dart

CHANGELOG.md

@@ -1,3 +1,11 @@
+## 2.3.1
+Republishing since sourcode seems not merged correctly.
+
+## 2.3.0
++ Bugfix IAPItem deserialization [#212](https://github.com/dooboolab/flutter_inapp_purchase/pull/212)
++ Add introductoryPriceNumberIOS [#214](https://github.com/dooboolab/flutter_inapp_purchase/pull/214)
++ Fix iOS promotional offers [#220](https://github.com/dooboolab/flutter_inapp_purchase/pull/220)
+
 ## 2.2.0
 + Implement `endConnection` method to declaratively finish observer in iOS.
 + Remove `addTransactionObserver` in IAPPromotionObserver.m for dup observer problems.

README.md

@@ -59,7 +59,7 @@ For help on editing plugin code, view the [documentation](https://flutter.io/dev
 Purchase flow in `[email protected]+
 -----------------
 ![purchase-flow-sequence](https://github.com/dooboolab/react-native-iap/blob/master/docs/react-native-iapv3.svg)
-> When you've successfully received result from `purchaseUpdated` listener, you'll have to `verify` the purchase either by `acknowledgePurchaseAndroid`, `consumePurchaseAndroid`, `finishTransactionIOS` depending on the purchase types or platforms. You'll have to use `consumePurchasAndroid` for `consumable` products and `android` and `acknowledgePurchaseAndroid` for `non-consumable` products either `subscription`. For `ios`, there is no differences in `verifying` purchases. You can just call `finishTransaction`. If you do not verify the purchase, it will be refunded within 3 days to users. We recommend you to `verifyReceipt` first before actually finishing transaction. Lastly, if you want to abstract three different methods into one, consider using `finishTransaction` method.
+> When you've successfully received result from `purchaseUpdated` listener, you'll have to `verify` the purchase either by `acknowledgePurchaseAndroid`, `consumePurchaseAndroid`, `finishTransactionIOS` depending on the purchase types or platforms. You'll have to use `consumePurchaseAndroid` for `consumable` products and `android` and `acknowledgePurchaseAndroid` for `non-consumable` products either `subscription`. For `ios`, there is no differences in `verifying` purchases. You can just call `finishTransaction`. If you do not verify the purchase, it will be refunded within 3 days to users. We recommend you to `verifyReceipt` first before actually finishing transaction. Lastly, if you want to abstract three different methods into one, consider using `finishTransaction` method.
 
 ## Data Types
 * IAPItem
@@ -232,7 +232,7 @@ void checkForAppStoreInitiatedProducts() async {
 Direct to [example readme](example/README.md) which is just a `cp` from example project. You can test this in real example project.
 
 ## ProGuard
-If you have eneabled proguard you will need to add the following rules to your `proguard-rules.pro`
+If you have enabled proguard you will need to add the following rules to your `proguard-rules.pro`
 
 ```
 #In app Purchase

example/android/gradle.properties

@@ -1,3 +1,4 @@
 android.enableJetifier=true
 android.useAndroidX=true
 org.gradle.jvmargs=-Xmx1536M
+android.enableR8=true

lib/modules.dart

@@ -69,7 +69,7 @@ class IAPItem {
         signatureAndroid = json['signatureAndroid'] as String,
         iconUrl = json['iconUrl'] as String,
         originalJson = json['originalJson'] as String,
-        originalPrice = json['originalJson'] as String,
+        originalPrice = json['originalPrice'].toString(),
         discountsIOS = _extractDiscountIOS(json['discounts']);
 
   /// wow, i find if i want to save a IAPItem, there is not "toJson" to cast it into String...

pubspec.yaml

@@ -1,17 +1,16 @@
 name: flutter_inapp_purchase
 description: In App Purchase plugin for flutter. This project has been forked by react-native-iap and we are willing to share same experience with that on react-native.
-version: 2.2.0
-author: dooboolab<[email protected]>
+version: 2.3.1
 homepage: https://github.com/dooboolab/flutter_inapp_purchase/blob/master/pubspec.yaml
 environment:
-  sdk: ">=2.0.0 <3.0.0"
+  sdk: ">=2.1.0 <3.0.0"
+  flutter: ">=1.12.0 <2.0.0"
 dependencies:
   http: '>=0.11.0 <1.0.0'
   flutter:
     sdk: flutter
 
   platform: ^2.2.1
-  meta: '>=1.0.0 <2.0.0'
 
 dev_dependencies:
   test: '>=1.0.0 <2.0.0'
@@ -26,8 +25,12 @@ dev_dependencies:
 # The following section is specific to Flutter.
 flutter:
   plugin:
-    androidPackage: com.dooboolab.flutterinapppurchase
-    pluginClass: FlutterInappPurchasePlugin
+    platforms:
+      android:
+        package: com.dooboolab.flutterinapppurchase
+        pluginClass: FlutterInappPurchasePlugin
+      ios:
+        pluginClass: FlutterInappPurchasePlugin
 
   # To add assets to your plugin package, add an assets section, like this:
   # assets: