Skip to content

Commit 403f6a8

Browse files
committed
Fix the build errors
1 parent 188282d commit 403f6a8

File tree

9 files changed

+77
-12
lines changed

9 files changed

+77
-12
lines changed

.idea/compiler.xml

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/deploymentTargetSelector.xml

Lines changed: 10 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/kotlinc.xml

Lines changed: 6 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/migrations.xml

Lines changed: 10 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/misc.xml

Lines changed: 2 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/runConfigurations.xml

Lines changed: 17 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

app/build.gradle

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,13 @@ plugins {
77

88
android {
99
namespace "com.github.poad.test.deviceflowexample"
10-
compileSdkVersion 34
11-
buildToolsVersion = "34.0.0"
10+
buildToolsVersion = "35.0.0"
1211

1312
defaultConfig {
1413
applicationId "com.github.poad.test.deviceflowexample"
15-
minSdkVersion 29
16-
targetSdkVersion 34
14+
minSdkVersion 35
15+
compileSdk 35
16+
targetSdkVersion 35
1717
versionCode 1
1818
versionName "1.0"
1919

@@ -30,8 +30,12 @@ android {
3030
}
3131
compileOptions {
3232
coreLibraryDesugaringEnabled true
33-
sourceCompatibility JavaVersion.VERSION_17
34-
targetCompatibility JavaVersion.VERSION_17
33+
sourceCompatibility JavaVersion.VERSION_1_8
34+
targetCompatibility JavaVersion.VERSION_1_8
35+
}
36+
37+
kotlinOptions {
38+
jvmTarget = "1.8"
3539
}
3640
}
3741

@@ -50,8 +54,8 @@ dependencies {
5054
implementation 'com.squareup.okhttp3:logging-interceptor:5.0.0-alpha.14'
5155

5256
implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.3-native-mt'
53-
implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.3-native-mt'
54-
implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.8.6'
57+
implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.9.0'
58+
implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.8.7'
5559
implementation 'androidx.activity:activity-ktx:1.9.3'
5660

5761
// https://mvnrepository.com/artifact/com.github.bumptech.glide/glide
@@ -71,7 +75,7 @@ dependencies {
7175
// https://mvnrepository.com/artifact/com.amplifyframework/core
7276
implementation "com.amplifyframework:core:${amplify_version}"
7377
// https://mvnrepository.com/artifact/com.amplifyframework/aws-api
74-
implementation "com.amplifyframework:aws-api:${amplify_version}"
78+
implementation "com.amplifyframework:aws-api:$amplify_version"
7579
// https://mvnrepository.com/artifact/com.amplifyframework/aws-auth-cognito
7680
implementation "com.amplifyframework:aws-auth-cognito:${amplify_version}"
7781

app/src/main/AndroidManifest.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212

1313
<application
1414
android:allowBackup="false"
15+
android:dataExtractionRules="@xml/data_extraction_rules"
1516
android:icon="@mipmap/ic_launcher"
1617
android:label="@string/app_name"
1718
android:networkSecurityConfig="@xml/network_security_config"
@@ -23,7 +24,6 @@
2324
android:name=".MainActivity"
2425
android:banner="@drawable/app_icon_your_company"
2526
android:icon="@drawable/app_icon_your_company"
26-
android:label="@string/app_name"
2727
android:logo="@drawable/app_icon_your_company"
2828
android:screenOrientation="landscape"
2929
android:exported="true">
Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<data-extraction-rules>
3+
<cloud-backup>
4+
<exclude domain="root" />
5+
<exclude domain="file" />
6+
<exclude domain="database" />
7+
<exclude domain="sharedpref" />
8+
<exclude domain="external" />
9+
</cloud-backup>
10+
<device-transfer>
11+
<exclude domain="root" />
12+
<exclude domain="file" />
13+
<exclude domain="database" />
14+
<exclude domain="sharedpref" />
15+
<exclude domain="external" />
16+
</device-transfer>
17+
</data-extraction-rules>

0 commit comments

Comments
 (0)