Skip to content

Commit 59a769f

Browse files
Merge pull request #10 from TapPay/chris/3_5_0_test
use sdk 3.5.0 and samsung sdk 2.17
2 parents 93f5ce3 + db6913a commit 59a769f

File tree

21 files changed

+69
-27
lines changed

21 files changed

+69
-27
lines changed

DirectPayExample/app/build.gradle

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,15 @@ apply plugin: 'com.android.application'
33
android {
44
compileSdkVersion 31
55
buildToolsVersion "28.0.3"
6+
7+
compileOptions {
8+
sourceCompatibility JavaVersion.VERSION_1_8
9+
targetCompatibility JavaVersion.VERSION_1_8
10+
}
11+
612
defaultConfig {
713
applicationId 'tech.cherri.directpayexample'
8-
minSdkVersion 15
14+
minSdkVersion 18
915
targetSdkVersion 31
1016
versionCode 15
1117
versionName "2.3.1"
17.6 KB
Binary file not shown.

DirectPayExample/build.gradle

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,9 @@
22

33
buildscript {
44
repositories {
5-
jcenter()
5+
mavenCentral()
66
maven {
77
url 'https://maven.google.com/'
8-
name 'Google'
98
}
109
google()
1110
}
@@ -19,13 +18,13 @@ buildscript {
1918

2019
allprojects {
2120
repositories {
22-
jcenter()
21+
mavenCentral()
22+
google()
2323
flatDir {
2424
dirs 'libs'
2525
}
2626
maven {
2727
url 'https://maven.google.com/'
28-
name 'Google'
2928
}
3029
}
3130
}

EasyWalletExample/app/build.gradle

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,15 @@ apply plugin: 'com.android.application'
33
android {
44
compileSdkVersion 31
55
buildToolsVersion "28.0.3"
6+
7+
compileOptions {
8+
sourceCompatibility JavaVersion.VERSION_1_8
9+
targetCompatibility JavaVersion.VERSION_1_8
10+
}
11+
612
defaultConfig {
713
applicationId 'tech.cherri.easywalletexample'
8-
minSdkVersion 15
14+
minSdkVersion 18
915
targetSdkVersion 31
1016
versionCode 15
1117
versionName "2.3.1"
17.6 KB
Binary file not shown.

EasyWalletExample/build.gradle

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,11 @@
22

33
buildscript {
44
repositories {
5-
jcenter()
5+
mavenCentral()
66
google()
7+
maven {
8+
url "https://maven.google.com"
9+
}
710
}
811
dependencies {
912
classpath 'com.android.tools.build:gradle:3.6.0'
@@ -15,13 +18,14 @@ buildscript {
1518

1619
allprojects {
1720
repositories {
21+
1822
flatDir {
1923
dirs 'libs'
2024
}
2125
maven {
2226
url "https://maven.google.com"
2327
}
24-
jcenter()
28+
mavenCentral()
2529
google()
2630
}
2731
}

GooglePayExample/app/build.gradle

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,20 @@ apply plugin: 'com.android.application'
33
android {
44
compileSdkVersion 31
55
buildToolsVersion "28.0.3"
6+
7+
compileOptions {
8+
sourceCompatibility JavaVersion.VERSION_1_8
9+
targetCompatibility JavaVersion.VERSION_1_8
10+
}
11+
612
defaultConfig {
713
applicationId 'tech.cherri.payment.google'
8-
minSdkVersion 15
14+
minSdkVersion 18
915
targetSdkVersion 31
1016
versionCode 15
1117
versionName "2.3.1"
1218
}
19+
1320
buildTypes {
1421
release {
1522
minifyEnabled false
17.6 KB
Binary file not shown.

GooglePayExample/build.gradle

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,9 @@
22

33
buildscript {
44
repositories {
5-
jcenter()
5+
mavenCentral()
66
maven {
77
url 'https://maven.google.com/'
8-
name 'Google'
98
}
109
google()
1110
}
@@ -25,7 +24,7 @@ allprojects {
2524
maven {
2625
url "https://maven.google.com"
2726
}
28-
jcenter()
27+
mavenCentral()
2928
google()
3029
}
3130
}

JkosPayExample/app/build.gradle

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,16 @@ apply plugin: 'com.android.application'
33
android {
44
compileSdkVersion 31
55
buildToolsVersion "28.0.3"
6+
7+
compileOptions {
8+
sourceCompatibility JavaVersion.VERSION_1_8
9+
targetCompatibility JavaVersion.VERSION_1_8
10+
}
11+
12+
613
defaultConfig {
714
applicationId 'tech.cherri.jkospayexample'
8-
minSdkVersion 15
15+
minSdkVersion 18
916
targetSdkVersion 31
1017
versionCode 15
1118
versionName "2.3.1"

JkosPayExample/app/libs/tpdirect.aar

17.6 KB
Binary file not shown.

JkosPayExample/build.gradle

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,9 @@
22

33
buildscript {
44
repositories {
5-
jcenter()
5+
mavenCentral()
66
maven {
77
url 'https://maven.google.com/'
8-
name 'Google'
98
}
109
google()
1110
}
@@ -19,13 +18,13 @@ buildscript {
1918

2019
allprojects {
2120
repositories {
22-
jcenter()
21+
mavenCentral()
22+
google()
2323
flatDir {
2424
dirs 'libs'
2525
}
2626
maven {
2727
url 'https://maven.google.com/'
28-
name 'Google'
2928
}
3029
}
3130
}

LinePayExample/app/build.gradle

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,15 @@ apply plugin: 'com.android.application'
33
android {
44
compileSdkVersion 31
55
buildToolsVersion "28.0.3"
6+
7+
compileOptions {
8+
sourceCompatibility JavaVersion.VERSION_1_8
9+
targetCompatibility JavaVersion.VERSION_1_8
10+
}
11+
612
defaultConfig {
713
applicationId 'tech.cherri.linepayexample'
8-
minSdkVersion 15
14+
minSdkVersion 18
915
targetSdkVersion 31
1016
versionCode 15
1117
versionName "2.3.1"

LinePayExample/app/libs/tpdirect.aar

17.6 KB
Binary file not shown.

LinePayExample/build.gradle

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,9 @@
22

33
buildscript {
44
repositories {
5-
jcenter()
5+
mavenCentral()
66
maven {
77
url 'https://maven.google.com/'
8-
name 'Google'
98
}
109
google()
1110
}
@@ -19,13 +18,13 @@ buildscript {
1918

2019
allprojects {
2120
repositories {
22-
jcenter()
21+
mavenCentral()
22+
google()
2323
flatDir {
2424
dirs 'libs'
2525
}
2626
maven {
2727
url 'https://maven.google.com/'
28-
name 'Google'
2928
}
3029
}
3130
}

SamsungPayExample/app/build.gradle

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,16 @@ apply plugin: 'com.android.application'
22

33
android {
44
compileSdkVersion 31
5+
6+
compileOptions {
7+
sourceCompatibility JavaVersion.VERSION_1_8
8+
targetCompatibility JavaVersion.VERSION_1_8
9+
}
10+
511
buildToolsVersion "28.0.3"
612
defaultConfig {
713
applicationId "tech.cherri.samsungpayexample"
8-
minSdkVersion 15
14+
minSdkVersion 18
915
targetSdkVersion 31
1016
versionCode 15
1117
versionName "2.3.1"
Binary file not shown.
-308 KB
Binary file not shown.
17.6 KB
Binary file not shown.

SamsungPayExample/app/src/main/AndroidManifest.xml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,4 +37,9 @@
3737
</activity>
3838
</application>
3939

40+
<queries>
41+
<package android:name="com.samsung.android.spay" />
42+
<package android:name="com.samsung.android.samsungpay.gear" />
43+
</queries>
44+
4045
</manifest>

SamsungPayExample/build.gradle

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,9 @@
22

33
buildscript {
44
repositories {
5-
jcenter()
5+
mavenCentral()
66
maven {
77
url 'https://maven.google.com/'
8-
name 'Google'
98
}
109
google()
1110
}
@@ -19,13 +18,13 @@ buildscript {
1918

2019
allprojects {
2120
repositories {
22-
jcenter()
21+
mavenCentral()
22+
google()
2323
flatDir {
2424
dirs 'libs'
2525
}
2626
maven {
2727
url 'https://maven.google.com/'
28-
name 'Google'
2928
}
3029
}
3130
}

0 commit comments

Comments
 (0)