From 97c3403eeed6d9bf9beba1f2c0a8873e776e994b Mon Sep 17 00:00:00 2001
From: lipengwei <lipengwei@nianben.com>
Date: Thu, 10 Oct 2019 15:13:19 +0800
Subject: [PATCH] 1.3.0
---
frameworks/WAApImpl.framework/Headers/WAAPPaymentTransactionHandler.h | 2 +-
WAApImpl_CN/1.3.0/WAApImpl_CN.podspec | 25 +++++++++++++++++++++++++
frameworks/WAApImpl.framework/Headers/WAApImpl.h | 2 +-
frameworks/WAApImpl.framework/Headers/WAAPPaymentTransaction.h | 2 +-
WAApImpl_CN.podspec | 6 +++---
frameworks/WAApImpl.framework/Info.plist | 0
frameworks/WAApImpl.framework/WAApImpl | 0
frameworks/WAApImpl.framework/Headers/StoreObserver.h | 2 +-
config/wa_sdk_impl_config_apple.xml | 2 +-
9 files changed, 33 insertions(+), 8 deletions(-)
diff --git a/WAApImpl_CN.podspec b/WAApImpl_CN.podspec
index e925c2f..8df9d93 100644
--- a/WAApImpl_CN.podspec
+++ b/WAApImpl_CN.podspec
@@ -9,7 +9,7 @@
Pod::Spec.new do |s|
s.name = 'WAApImpl_CN'
-s.version = '1.2.1'
+s.version = '1.3.0'
s.summary = 'WAApImpl_CN framework in testing environment.'
s.license = 'MIT'
s.author = { "Hank" => "hank.zhang@gamehollywood.com" }
@@ -19,7 +19,7 @@
s.ios.deployment_target = "7.0"
s.vendored_frameworks = 'frameworks/WAApImpl.framework'
s.resources = ['config/*.xml']
-s.dependency 'WASdkIntf_CN', '~> 1.2.1' #
-s.dependency 'WASdkImpl_CN', '~> 1.2.1'
+s.dependency 'WASdkIntf_CN', '~> 1.3.0' #
+s.dependency 'WASdkImpl_CN', '~> 1.3.0'
s.requires_arc = true
end
\ No newline at end of file
diff --git a/WAApImpl_CN/1.3.0/WAApImpl_CN.podspec b/WAApImpl_CN/1.3.0/WAApImpl_CN.podspec
new file mode 100644
index 0000000..8df9d93
--- /dev/null
+++ b/WAApImpl_CN/1.3.0/WAApImpl_CN.podspec
@@ -0,0 +1,25 @@
+#
+# Be sure to run `pod spec lint WAApImpl_CN.podspec' to ensure this is a
+# valid spec and to remove all comments including this before submitting the spec.
+#
+# To learn more about Podspec attributes see http://docs.cocoapods.org/specification.html
+# To see working Podspecs in the CocoaPods repo see https://github.com/CocoaPods/Specs/
+#
+
+Pod::Spec.new do |s|
+
+s.name = 'WAApImpl_CN'
+s.version = '1.3.0'
+s.summary = 'WAApImpl_CN framework in testing environment.'
+s.license = 'MIT'
+s.author = { "Hank" => "hank.zhang@gamehollywood.com" }
+s.homepage = 'http://repo.wingsdk.cn:8082/summary/WAApImpl_CN.git'
+s.source = { :git => "http://admin@repo.wingsdk.cn:8082/r/WAApImpl_CN.git" , :tag => s.version}
+s.platform = :ios
+s.ios.deployment_target = "7.0"
+s.vendored_frameworks = 'frameworks/WAApImpl.framework'
+s.resources = ['config/*.xml']
+s.dependency 'WASdkIntf_CN', '~> 1.3.0' #
+s.dependency 'WASdkImpl_CN', '~> 1.3.0'
+s.requires_arc = true
+end
\ No newline at end of file
diff --git a/config/wa_sdk_impl_config_apple.xml b/config/wa_sdk_impl_config_apple.xml
index d445595..ff1b23e 100644
--- a/config/wa_sdk_impl_config_apple.xml
+++ b/config/wa_sdk_impl_config_apple.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<config>
- <version val="AP1.2.1"/>
+ <version val="AP1.3.0"/>
<comps>
<!-- 用户模块 -->
<comp module="USR" plaf="APPLE" mandatory="YES" value="WAAPUser" desc="APPLE用户账户"/>
diff --git a/frameworks/WAApImpl.framework/Headers/StoreObserver.h b/frameworks/WAApImpl.framework/Headers/StoreObserver.h
index 8e6ab20..174d8ee 100755
--- a/frameworks/WAApImpl.framework/Headers/StoreObserver.h
+++ b/frameworks/WAApImpl.framework/Headers/StoreObserver.h
@@ -97,6 +97,6 @@
* @param skPaymentTransaction
* @param pStatus
*/
--(void)postPayNotifyServer:(SKPaymentTransaction*) skPaymentTransaction withStatus:(int)pStatus isRetry:(BOOL)isRetry;
+-(void)postPayNotifyServer:(SKPaymentTransaction*) skPaymentTransaction withStatus:(NSInteger)pStatus isRetry:(BOOL)isRetry;
@end
diff --git a/frameworks/WAApImpl.framework/Headers/WAAPPaymentTransaction.h b/frameworks/WAApImpl.framework/Headers/WAAPPaymentTransaction.h
index 2580d79..31089c8 100644
--- a/frameworks/WAApImpl.framework/Headers/WAAPPaymentTransaction.h
+++ b/frameworks/WAApImpl.framework/Headers/WAAPPaymentTransaction.h
@@ -10,5 +10,5 @@
#import <StoreKit/StoreKit.h>
@interface WAAPPaymentTransaction : NSObject<NSCoding,NSCopying>
@property(strong,nonatomic)SKPaymentTransaction* skPaymentTransaction;
-@property(nonatomic)int status;
+@property(nonatomic)NSInteger status;
@end
diff --git a/frameworks/WAApImpl.framework/Headers/WAAPPaymentTransactionHandler.h b/frameworks/WAApImpl.framework/Headers/WAAPPaymentTransactionHandler.h
index 2208524..62647de 100644
--- a/frameworks/WAApImpl.framework/Headers/WAAPPaymentTransactionHandler.h
+++ b/frameworks/WAApImpl.framework/Headers/WAAPPaymentTransactionHandler.h
@@ -19,7 +19,7 @@
* @param skPaymentTransaction
* @param status
*/
-+(void)saveCacheWithPaymentTransaction:(SKPaymentTransaction*)skPaymentTransaction andStatus:(int)status;
++(void)saveCacheWithPaymentTransaction:(SKPaymentTransaction*)skPaymentTransaction andStatus:(NSInteger)status;
/**
diff --git a/frameworks/WAApImpl.framework/Headers/WAApImpl.h b/frameworks/WAApImpl.framework/Headers/WAApImpl.h
index 4efc2a0..6d55d7f 100644
--- a/frameworks/WAApImpl.framework/Headers/WAApImpl.h
+++ b/frameworks/WAApImpl.framework/Headers/WAApImpl.h
@@ -19,4 +19,4 @@
#import <WAApImpl/WAAPUser.h>
#import <WAApImpl/WAAPLogin.h>
-//time:2018/10/26 11:46 ver:1.2.1
+//time:2019/10/09 10:20 ver:1.3.0
diff --git a/frameworks/WAApImpl.framework/Info.plist b/frameworks/WAApImpl.framework/Info.plist
index 1af0829..7d6693e 100644
--- a/frameworks/WAApImpl.framework/Info.plist
+++ b/frameworks/WAApImpl.framework/Info.plist
Binary files differ
diff --git a/frameworks/WAApImpl.framework/WAApImpl b/frameworks/WAApImpl.framework/WAApImpl
index 4a17b97..6ff9449 100644
--- a/frameworks/WAApImpl.framework/WAApImpl
+++ b/frameworks/WAApImpl.framework/WAApImpl
Binary files differ
--
Gitblit v1.8.0