Skip to content

Commit 78a2183

Browse files
authored
Merge pull request #10 from getzoop/fix_Enabled-core-library-desugaring
Fix abilitar core library desugaring
2 parents edff9ed + 7f64e06 commit 78a2183

4 files changed

Lines changed: 14 additions & 8 deletions

File tree

app/build.gradle

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,9 @@ android {
2828
}
2929

3030
compileOptions {
31-
sourceCompatibility = JavaVersion.VERSION_17
32-
targetCompatibility = JavaVersion.VERSION_17
31+
coreLibraryDesugaringEnabled true
32+
sourceCompatibility JavaVersion.VERSION_17
33+
targetCompatibility JavaVersion.VERSION_17
3334
}
3435

3536
kotlinOptions {
@@ -41,7 +42,7 @@ android {
4142
compose true
4243
}
4344
composeOptions {
44-
kotlinCompilerExtensionVersion '1.4.0'
45+
kotlinCompilerExtensionVersion '1.5.14'
4546
}
4647
packagingOptions {
4748
resources {
@@ -53,6 +54,7 @@ android {
5354
}
5455

5556
dependencies {
57+
coreLibraryDesugaring("com.android.tools:desugar_jdk_libs:1.1.5")
5658
implementation("br.zoop.pos.plugin:mpos:3.3.0")
5759

5860
implementation("androidx.legacy:legacy-support-v4:1.0.0")

app/src/main/AndroidManifest.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@
1111
<uses-permission android:name="android.permission.BLUETOOTH_ADVERTISE" />
1212
<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
1313
<uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
14+
<uses-permission android:name="android.permission.READ_PHONE_STATE" />
15+
<uses-permission android:name="android.permission.READ_PRIVILEGED_PHONE_STATE" />
1416

1517

1618
<uses-feature android:name="android.hardware.bluetooth" android:required="true"/>

app/src/main/java/com/example/mpos/util/PermissionService.kt

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,14 +23,16 @@ fun getPermissions(): List<String> {
2323
Manifest.permission.BLUETOOTH_CONNECT,
2424
Manifest.permission.ACCESS_COARSE_LOCATION,
2525
Manifest.permission.ACCESS_FINE_LOCATION,
26-
Manifest.permission.ACCESS_WIFI_STATE
26+
Manifest.permission.ACCESS_WIFI_STATE,
27+
Manifest.permission.READ_PHONE_STATE,
2728
)
2829
} else {
2930
listOf(
3031
Manifest.permission.BLUETOOTH,
3132
Manifest.permission.BLUETOOTH_ADMIN,
3233
Manifest.permission.ACCESS_COARSE_LOCATION,
33-
Manifest.permission.ACCESS_WIFI_STATE
34+
Manifest.permission.ACCESS_WIFI_STATE,
35+
Manifest.permission.READ_PHONE_STATE
3436
)
3537
}
3638
return permissionsList

build.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,16 +9,16 @@ buildscript {
99
}
1010

1111
dependencies {
12-
classpath('com.android.tools.build:gradle:8.5.0')
13-
classpath('org.jetbrains.kotlin:kotlin-gradle-plugin:1.6.21')
12+
classpath('com.android.tools.build:gradle:8.5.2')
13+
classpath('org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.0')
1414
classpath("com.github.kezong:fat-aar:1.3.8")
1515
classpath('com.google.dagger:hilt-android-gradle-plugin:2.40.1')
1616
classpath("androidx.navigation:navigation-safe-args-gradle-plugin:2.5.3")
1717
}
1818
}
1919

2020
plugins {
21-
id 'org.jetbrains.kotlin.android' version '1.8.0' apply false
21+
id 'org.jetbrains.kotlin.android' version '1.9.24' apply false
2222
}
2323

2424
allprojects {

0 commit comments

Comments
 (0)