Skip to content

Commit 85413db

Browse files
committed
Update AGP to latest version and fix compatibility issues
Related to DEP-571
1 parent 723dd92 commit 85413db

File tree

7 files changed

+19
-12
lines changed

7 files changed

+19
-12
lines changed

app/build.gradle

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@ apply plugin: 'com.android.application'
22
apply plugin: 'kotlin-android'
33

44
android {
5+
namespace "com.yoti.mobile.android.sdk.yotidocscan.sample"
6+
57
compileSdk 33
68
defaultConfig {
79
applicationId "com.yoti.mobile.android.sdk.yotidocscan.sample"
@@ -18,8 +20,8 @@ android {
1820
}
1921

2022
compileOptions {
21-
sourceCompatibility = '1.8'
22-
targetCompatibility = '1.8'
23+
sourceCompatibility = JavaVersion.VERSION_17
24+
targetCompatibility = JavaVersion.VERSION_17
2325
}
2426

2527
buildFeatures {

app/src/main/AndroidManifest.xml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
2-
package="com.yoti.mobile.android.sdk.yotidocscan.sample">
1+
<manifest xmlns:android="http://schemas.android.com/apk/res/android">
32

43
<application
54
android:allowBackup="true"

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ buildscript {
77
mavenCentral()
88
}
99
dependencies {
10-
classpath 'com.android.tools.build:gradle:7.4.2'
10+
classpath 'com.android.tools.build:gradle:8.8.0'
1111
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
1212
// NOTE: Do not place your application dependencies here; they belong
1313
// in the individual module build.gradle files
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#Thu Apr 25 10:22:36 EEST 2024
22
distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
4-
distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip
4+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip
55
zipStoreBase=GRADLE_USER_HOME
66
zipStorePath=wrapper/dists

webapp/build.gradle

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,20 +2,28 @@ apply plugin: 'com.android.application'
22
apply plugin: 'kotlin-android'
33

44
android {
5-
compileSdkVersion 29
5+
namespace "com.yoti.mobile.android.sdk.yotidocscan.websample"
6+
7+
compileSdk 33
68

79
defaultConfig {
810
applicationId "com.yoti.mobile.android.sdk.yotidocscan.websample"
911
minSdkVersion 21
10-
targetSdkVersion 29
12+
targetSdkVersion 33
1113
versionCode 1
1214
versionName "1.0"
1315

1416
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
1517
}
1618

19+
compileOptions {
20+
sourceCompatibility = JavaVersion.VERSION_17
21+
targetCompatibility = JavaVersion.VERSION_17
22+
}
23+
1724
buildFeatures {
1825
viewBinding true
26+
buildConfig true
1927
}
2028

2129
buildTypes {

webapp/src/main/AndroidManifest.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
3-
package="com.yoti.mobile.android.sdk.yotidocscan.websample">
2+
<manifest xmlns:android="http://schemas.android.com/apk/res/android">
43

54
<uses-permission android:name="android.permission.INTERNET" />
65
<uses-permission android:name="android.permission.CAMERA" />
@@ -21,6 +20,7 @@
2120
android:supportsRtl="true"
2221
android:theme="@style/AppTheme">
2322
<activity android:name=".MainActivity"
23+
android:exported="true"
2424
android:screenOrientation="portrait">
2525
<intent-filter>
2626
<action android:name="android.intent.action.MAIN" />

webapp/src/main/java/com/yoti/mobile/android/sdk/yotidocscan/websample/MainActivity.kt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -194,8 +194,6 @@ class MainActivity : AppCompatActivity(), SessionConfigurationListener {
194194
domStorageEnabled = true
195195
javaScriptCanOpenWindowsAutomatically = true
196196
mediaPlaybackRequiresUserGesture = false
197-
setAppCacheEnabled(true)
198-
199197
}
200198
this.webViewClient = YdsWebClient()
201199
this.webChromeClient = YdsWebChromeClient()

0 commit comments

Comments
 (0)