Merge pull request #8 from TapPay/chris/3_4_4_test

chrischencherricorp · web-flow · commit 4a8619400b1c · 2021-12-17T16:30:53.000+08:00
use 3.4.4 aar and build with targetSdkVersion 31
diff --git a/DirectPayExample/app/build.gradle b/DirectPayExample/app/build.gradle
@@ -1,12 +1,12 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 28
+    compileSdkVersion 31
     buildToolsVersion "28.0.3"
     defaultConfig {
         applicationId 'tech.cherri.directpayexample'
         minSdkVersion 15
-        targetSdkVersion 28
+        targetSdkVersion 31
         versionCode 15
         versionName "2.3.1"
     }
diff --git a/DirectPayExample/app/libs/tpdirect.aar b/DirectPayExample/app/libs/tpdirect.aar
diff --git a/DirectPayExample/app/src/main/AndroidManifest.xml b/DirectPayExample/app/src/main/AndroidManifest.xml
@@ -10,7 +10,8 @@
         android:label="@string/app_name"
         android:supportsRtl="true"
         android:theme="@style/AppTheme">
-        <activity android:name=".MainActivity">
+        <activity android:name=".MainActivity"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
diff --git a/EasyWalletExample/app/build.gradle b/EasyWalletExample/app/build.gradle
@@ -1,12 +1,12 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 28
+    compileSdkVersion 31
     buildToolsVersion "28.0.3"
     defaultConfig {
         applicationId 'tech.cherri.easywalletexample'
         minSdkVersion 15
-        targetSdkVersion 28
+        targetSdkVersion 31
         versionCode 15
         versionName "2.3.1"
     }
diff --git a/EasyWalletExample/app/libs/tpdirect.aar b/EasyWalletExample/app/libs/tpdirect.aar
diff --git a/EasyWalletExample/app/src/main/AndroidManifest.xml b/EasyWalletExample/app/src/main/AndroidManifest.xml
@@ -10,7 +10,8 @@
         android:theme="@style/AppTheme">
         <activity
             android:name=".MainActivity"
-            android:launchMode="singleTask">
+            android:launchMode="singleTask"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
@@ -41,4 +42,8 @@
 
         </activity>
     </application>
+    <queries>
+        <!-- for easy-wallet open -->
+        <package android:name="com.easycard.wallet" />
+    </queries>
 </manifest>
diff --git a/EasyWalletExample/build.gradle b/EasyWalletExample/build.gradle
@@ -6,7 +6,7 @@ buildscript {
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.0.0'
+        classpath 'com.android.tools.build:gradle:3.6.0'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
diff --git a/EasyWalletExample/gradle/wrapper/gradle-wrapper.properties b/EasyWalletExample/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip
diff --git a/GooglePayExample/app/build.gradle b/GooglePayExample/app/build.gradle
@@ -1,12 +1,12 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 28
+    compileSdkVersion 31
     buildToolsVersion "28.0.3"
     defaultConfig {
-        applicationId 'tech.cherri.googlepayexample'
+        applicationId 'tech.cherri.payment.google'
         minSdkVersion 15
-        targetSdkVersion 28
+        targetSdkVersion 31
         versionCode 15
         versionName "2.3.1"
     }
diff --git a/GooglePayExample/app/libs/tpdirect.aar b/GooglePayExample/app/libs/tpdirect.aar
diff --git a/GooglePayExample/app/src/main/AndroidManifest.xml b/GooglePayExample/app/src/main/AndroidManifest.xml
@@ -17,7 +17,8 @@
             android:name="com.google.android.gms.wallet.api.enabled"
             android:value="true" />
 
-        <activity android:name="tech.cherri.googlepayexample.MainActivity">
+        <activity android:name="tech.cherri.googlepayexample.MainActivity"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
diff --git a/GooglePayExample/build.gradle b/GooglePayExample/build.gradle
@@ -10,7 +10,7 @@ buildscript {
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.0.0'
+        classpath 'com.android.tools.build:gradle:3.6.0'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
diff --git a/GooglePayExample/gradle/wrapper/gradle-wrapper.properties b/GooglePayExample/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip
diff --git a/JkosPayExample/app/build.gradle b/JkosPayExample/app/build.gradle
@@ -1,12 +1,12 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 28
+    compileSdkVersion 31
     buildToolsVersion "28.0.3"
     defaultConfig {
         applicationId 'tech.cherri.jkospayexample'
         minSdkVersion 15
-        targetSdkVersion 28
+        targetSdkVersion 31
         versionCode 15
         versionName "2.3.1"
     }
diff --git a/JkosPayExample/app/libs/tpdirect.aar b/JkosPayExample/app/libs/tpdirect.aar
diff --git a/JkosPayExample/app/src/main/AndroidManifest.xml b/JkosPayExample/app/src/main/AndroidManifest.xml
@@ -10,7 +10,8 @@
         android:theme="@style/AppTheme">
         <activity
             android:name=".MainActivity"
-            android:launchMode="singleTask">
+            android:launchMode="singleTask"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
@@ -41,4 +42,8 @@
 
         </activity>
     </application>
+    <queries>
+        <!-- for jko pay open -->
+        <package android:name="com.jkos.app" />
+    </queries>
 </manifest>
diff --git a/JkosPayExample/build.gradle b/JkosPayExample/build.gradle
@@ -10,7 +10,7 @@ buildscript {
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.0.0'
+        classpath 'com.android.tools.build:gradle:3.6.0'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
diff --git a/JkosPayExample/gradle/wrapper/gradle-wrapper.properties b/JkosPayExample/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip
diff --git a/LinePayExample/app/build.gradle b/LinePayExample/app/build.gradle
@@ -1,12 +1,12 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 28
+    compileSdkVersion 31
     buildToolsVersion "28.0.3"
     defaultConfig {
         applicationId 'tech.cherri.linepayexample'
         minSdkVersion 15
-        targetSdkVersion 28
+        targetSdkVersion 31
         versionCode 15
         versionName "2.3.1"
     }
diff --git a/LinePayExample/app/libs/tpdirect.aar b/LinePayExample/app/libs/tpdirect.aar
diff --git a/LinePayExample/app/src/main/AndroidManifest.xml b/LinePayExample/app/src/main/AndroidManifest.xml
@@ -9,7 +9,8 @@
         android:supportsRtl="true"
         android:theme="@style/AppTheme">
         <activity android:name=".MainActivity"
-            android:launchMode="singleTask">
+            android:launchMode="singleTask"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
@@ -28,4 +29,8 @@
             </intent-filter>
         </activity>
     </application>
+    <queries>
+        <!-- for line pay open -->
+        <package android:name="jp.naver.line.android" />
+    </queries>
 </manifest>
diff --git a/SamsungPayExample/app/build.gradle b/SamsungPayExample/app/build.gradle
@@ -1,12 +1,12 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 30
+    compileSdkVersion 31
     buildToolsVersion "28.0.3"
     defaultConfig {
         applicationId "tech.cherri.samsungpayexample"
         minSdkVersion 15
-        targetSdkVersion  30
+        targetSdkVersion  31
         versionCode 15
         versionName "2.3.1"
     }
diff --git a/SamsungPayExample/app/libs/tpdirect.aar b/SamsungPayExample/app/libs/tpdirect.aar
diff --git a/SamsungPayExample/app/src/main/AndroidManifest.xml b/SamsungPayExample/app/src/main/AndroidManifest.xml
@@ -27,7 +27,8 @@
             android:name="spay_debug_api_key"
             android:value="c6482d4523094c25a9a0cadbaaa0b635" />
 
-        <activity android:name=".MainActivity">
+        <activity android:name=".MainActivity"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@ buildscript {`
`6`	`6`	`google()`
`7`	`7`	`}`
`8`	`8`	`dependencies {`
`9`		`- classpath 'com.android.tools.build:gradle:3.0.0'`
	`9`	`+ classpath 'com.android.tools.build:gradle:3.6.0'`
`10`	`10`
`11`	`11`	`// NOTE: Do not place your application dependencies here; they belong`
`12`	`12`	`// in the individual module build.gradle files`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ buildscript {`
`10`	`10`	`google()`
`11`	`11`	`}`
`12`	`12`	`dependencies {`
`13`		`- classpath 'com.android.tools.build:gradle:3.0.0'`
	`13`	`+ classpath 'com.android.tools.build:gradle:3.6.0'`
`14`	`14`
`15`	`15`	`// NOTE: Do not place your application dependencies here; they belong`
`16`	`16`	`// in the individual module build.gradle files`