Skip to content

Commit f48e5d1

Browse files
committed
fixed android 11 bugs
1 parent 0ddb761 commit f48e5d1

File tree

11 files changed

+32
-140
lines changed

11 files changed

+32
-140
lines changed

.idea/compiler.xml

-22
This file was deleted.

.idea/gradle.xml

-22
This file was deleted.

.idea/misc.xml

-60
This file was deleted.

.idea/modules.xml

-12
This file was deleted.

build.gradle

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,15 @@ buildscript {
77
google()
88
}
99
dependencies {
10-
classpath 'com.android.tools.build:gradle:3.3.2'
10+
classpath 'com.android.tools.build:gradle:4.1.2'
1111

1212
// NOTE: Do not place your application dependencies here; they belong
1313
// in the individual module build.gradle files
1414
}
1515
}
1616

1717
plugins {
18-
id "com.jfrog.bintray" version "1.7.3"
18+
id "com.jfrog.bintray" version "1.8.5"
1919
id "com.github.dcendents.android-maven" version "2.0"
2020
}
2121

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
#Fri Mar 08 12:20:11 CET 2019
1+
#Wed Jan 27 10:07:18 CET 2021
22
distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.1-all.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-bin.zip

sample/build.gradle

+7-7
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
apply plugin: 'com.android.application'
22

33
android {
4-
compileSdkVersion 28
5-
buildToolsVersion "28.0.3"
4+
compileSdkVersion 30
5+
buildToolsVersion "30.0.2"
66

77
dataBinding {
88
enabled = true
@@ -11,7 +11,7 @@ android {
1111
defaultConfig {
1212
applicationId "com.example.satispayintent"
1313
minSdkVersion 15
14-
targetSdkVersion 28
14+
targetSdkVersion 30
1515
versionCode 1
1616
versionName "1.0"
1717
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
@@ -28,13 +28,13 @@ dependencies {
2828
implementation fileTree(dir: 'libs', include: ['*.jar'])
2929

3030
// implementation project(':satispayintent')
31-
implementation 'com.satispay:satispayintent:1.0.5'
31+
implementation 'com.satispay:satispayintent:1.0.6'
3232

3333
androidTestImplementation('androidx.test.espresso:espresso-core:3.1.0-alpha4', {
3434
exclude group: 'com.android.support', module: 'support-annotations'
3535
})
36-
implementation 'androidx.appcompat:appcompat:1.0.2'
37-
implementation 'com.google.android.material:material:1.0.0'
36+
implementation 'androidx.appcompat:appcompat:1.2.0'
37+
implementation 'com.google.android.material:material:1.2.1'
3838
implementation 'androidx.cardview:cardview:1.0.0'
39-
testImplementation 'junit:junit:4.12'
39+
testImplementation 'junit:junit:4.13.1'
4040
}

satispayintent/bintray.gradle

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
apply plugin: 'com.jfrog.bintray'
22

33
task sourcesJar(type: Jar) {
4-
classifier = 'sources'
4+
archiveClassifier.set('sources')
55
from android.sourceSets.main.java.srcDirs
66
}
77

@@ -11,7 +11,7 @@ task javadoc(type: Javadoc) {
1111
}
1212

1313
task javadocJar(type: Jar, dependsOn: javadoc) {
14-
classifier = 'javadoc'
14+
archiveClassifier.set('javadoc')
1515
from javadoc.destinationDir
1616
}
1717

@@ -35,10 +35,10 @@ bintray {
3535
licenses = ['Apache-2.0']
3636
vcsUrl = 'https://github.com/satispay/satispayintent-android-sdk.git'
3737
version {
38-
name = '1.0.5'
38+
name = '1.0.6'
3939
// desc = 'Satispay for third-party apps'
4040
released = new Date()
41-
vcsTag = '1.0.5'
41+
vcsTag = '1.0.6'
4242
}
4343
}
4444
}

satispayintent/build.gradle

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
apply plugin: 'com.android.library'
22

33
android {
4-
compileSdkVersion 28
5-
buildToolsVersion "28.0.3"
4+
compileSdkVersion 30
5+
buildToolsVersion "30.0.2"
66

77
defaultConfig {
88
minSdkVersion 15
9-
targetSdkVersion 28
9+
targetSdkVersion 30
1010
versionCode 1
11-
versionName "1.0.4"
11+
versionName "1.0.6"
1212

1313
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
1414

@@ -22,12 +22,12 @@ android {
2222
}
2323

2424
dependencies {
25-
implementation 'androidx.annotation:annotation:1.0.2'
25+
implementation 'androidx.annotation:annotation:1.1.0'
2626

2727
androidTestImplementation('androidx.test.espresso:espresso-core:3.1.0-alpha4', {
2828
exclude group: 'com.android.support', module: 'support-annotations'
2929
})
30-
testImplementation 'junit:junit:4.12'
30+
testImplementation 'junit:junit:4.13.1'
3131
}
3232

3333
apply from: 'install.gradle'

satispayintent/install.gradle

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
apply plugin: 'com.github.dcendents.android-maven'
22

3-
version = '1.0.5'
3+
version = '1.0.6'
44
group = 'com.satispay'
55
// archivesBaseName = 'satispayintent'
66

@@ -15,7 +15,7 @@ install {
1515
packaging 'aar'
1616
groupId 'com.satispay'
1717
artifactId 'satispayintent'
18-
version '1.0.5'
18+
version '1.0.6'
1919

2020
licenses {
2121
license {
+9-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,12 @@
1-
<manifest package="com.satispay.satispayintent">
1+
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
2+
package="com.satispay.satispayintent">
3+
4+
<queries>
5+
<package android:name="com.satispay.customer" />
6+
<package android:name="com.satispay.customer.staging.debug" />
7+
<package android:name="com.satispay.customer.dev.debug" />
8+
</queries>
9+
210
<application/>
311
</manifest>
412

0 commit comments

Comments
 (0)