Skip to content

Commit 7b90c48

Browse files
committedFeb 8, 2022
Update dependencies
1 parent 6aa44a8 commit 7b90c48

File tree

5 files changed

+23
-20
lines changed

5 files changed

+23
-20
lines changed
 

‎app/build.gradle

+16-16
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,12 @@ dependencies {
77
implementation 'com.googlecode.json-simple:json-simple:1.1'
88
implementation 'com.koushikdutta.async:androidasync:3.1.0'
99
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
10-
implementation 'androidx.appcompat:appcompat:1.4.0'
11-
implementation 'androidx.preference:preference:1.1.1'
10+
implementation 'androidx.appcompat:appcompat:1.4.1'
11+
implementation 'androidx.preference:preference:1.2.0'
1212
implementation 'androidx.recyclerview:recyclerview:1.2.1'
1313
// implementation 'androidx.activity:activity:1.4.0'
1414
implementation 'androidx.dynamicanimation:dynamicanimation:1.0.0'
15-
implementation 'com.google.android.material:material:1.4.0'
15+
implementation 'com.google.android.material:material:1.5.0'
1616
}
1717

1818
android {
@@ -26,12 +26,12 @@ android {
2626
defaultConfig {
2727
applicationId 'ee.ioc.phon.android.speak'
2828
minSdkVersion 21
29-
targetSdkVersion 31
30-
versionCode 1811
31-
versionName '1.8.11'
29+
targetSdkVersion 32
30+
versionCode 1812
31+
versionName '1.8.12'
3232
vectorDrawables.useSupportLibrary = true
3333
// Keep only en and et resources
34-
resConfigs "en", "et"
34+
resConfigs 'en', 'et'
3535
}
3636

3737
compileOptions {
@@ -42,13 +42,13 @@ android {
4242
kotlinOptions {
4343
jvmTarget = '1.8'
4444
}
45-
4645
packagingOptions {
47-
exclude 'META-INF/DEPENDENCIES'
48-
exclude 'META-INF/LICENSE.txt'
49-
exclude 'META-INF/NOTICE.txt'
46+
resources {
47+
excludes += ['META-INF/DEPENDENCIES', 'META-INF/LICENSE.txt', 'META-INF/NOTICE.txt']
48+
}
5049
}
5150

51+
5252
signingConfigs {
5353
release {
5454
}
@@ -64,15 +64,15 @@ android {
6464
}
6565
}
6666

67-
lintOptions {
68-
// TODO: in the future check for Kotlin-Java interop
69-
//check 'Interoperability'
70-
disable 'ResourceType', 'AppLinkUrlError', 'EllipsizeMaxLines', 'RtlSymmetry', 'Autofill', 'QueryAllPackagesPermission'
71-
}
7267

7368
buildFeatures {
7469
viewBinding true
7570
}
71+
lint {
72+
// TODO: in the future check for Kotlin-Java interop
73+
//check 'Interoperability'
74+
disable 'ResourceType', 'AppLinkUrlError', 'EllipsizeMaxLines', 'RtlSymmetry', 'Autofill', 'QueryAllPackagesPermission'
75+
}
7676

7777
}
7878

‎app/src/main/AndroidManifest.xml

+4-1
Original file line numberDiff line numberDiff line change
@@ -68,11 +68,14 @@
6868
android:permissionGroup="android.permission-group.CHANGE_SETTINGS"
6969
android:protectionLevel="dangerous" />
7070
-->
71+
<!--
72+
TODO: setting the permissionGroup to a non-existent group did not work in Android v12.
73+
android:permissionGroup="android.permission-group.RUN_ACTIVITY"
74+
-->
7175
<permission
7276
android:name="ee.ioc.phon.android.speak.permission.FETCH_URL"
7377
android:description="@string/descriptionPermissionFetchUrl"
7478
android:label="@string/labelPermissionFetchUrl"
75-
android:permissionGroup="android.permission-group.RUN_ACTIVITY"
7679
android:protectionLevel="dangerous" />
7780

7881
<!-- Some Chromebooks don't support touch. Although not essential,

‎build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ buildscript {
55
mavenCentral()
66
}
77
dependencies {
8-
classpath 'com.android.tools.build:gradle:7.0.4'
8+
classpath 'com.android.tools.build:gradle:7.1.1'
99
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
1010
}
1111
}

‎gradle/wrapper/gradle-wrapper.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ 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-7.0.2-bin.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip

0 commit comments

Comments
 (0)
Failed to load comments.