Skip to content

Commit 57d8122

Browse files
committed
DEP-86: move to androidx
1 parent d4b83d1 commit 57d8122

File tree

5 files changed

+8
-6
lines changed

5 files changed

+8
-6
lines changed

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ allprojects {
3030
androidTargetSdkVersion = targetSdkVersion.toInteger()
3131
androidCompileSdkVersion = compileSdkVersion.toInteger()
3232

33-
libAndroidSupportv7 = 'androidx.appcompat:appcompat:1.0.0'
33+
libAndroidSupport = "androidx.appcompat:appcompat:$supportLibraryVersion"
3434

3535
// Testing
3636
libJunit = "junit:junit:${libJunitVersion}"

gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ targetSdkVersion=28
2626
compileSdkVersion=28
2727

2828
yotiCommonUIVersion=0.0.5
29-
supportLibraryVersion=25.3.1
29+
supportLibraryVersion=1.0.2
3030

3131
libJunitVersion=4.12
3232
libMockitoVersion=1.10.19

sample-app-2/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ android {
2525

2626
dependencies {
2727
implementation fileTree(dir: 'libs', include: ['*.jar'])
28-
implementation 'androidx.appcompat:appcompat:1.0.2'
28+
implementation parent.ext.libAndroidSupport
2929
testImplementation 'junit:junit:4.12'
3030
implementation("com.yoti.mobile.android.sdk:yoti-button-sdk:1.1.0")
3131
implementation 'com.google.code.gson:gson:2.8.5'

sample-app/build.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,12 +43,12 @@ android {
4343

4444

4545
dependencies {
46-
implementation parent.ext.libAndroidSupportv7
46+
implementation parent.ext.libAndroidSupport
4747
testImplementation 'junit:junit:4.12'
4848

49-
//implementation project(path: ':yoti-sdk')
49+
implementation project(path: ':yoti-sdk')
5050

5151

5252
// Use this version if you want to point at the dependency published on mavenCentral
53-
implementation("com.yoti.mobile.android.sdk:yoti-button-sdk:1.1.0")
53+
//implementation("com.yoti.mobile.android.sdk:yoti-button-sdk:1.1.0")
5454
}

yoti-sdk/build.gradle

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,5 +32,7 @@ dependencies {
3232
testImplementation parent.ext.libJunit
3333
testImplementation parent.ext.libMockito
3434

35+
implementation parent.ext.libAndroidSupport
36+
3537
api(group: 'com.yoti.mobile.android', name: 'base-commons-ui', version: yotiCommonUIVersion, ext: 'aar')
3638
}

0 commit comments

Comments
 (0)