diff options
| author | Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> | 2022-10-23 14:56:40 +0200 |
|---|---|---|
| committer | Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> | 2022-10-30 13:21:02 +0100 |
| commit | a43da4165bd4b37bf0b5c6fa8fd3f7e44539895a (patch) | |
| tree | 453d599f8ec8b85df3fe32d2bfb0dcac949752db | |
| parent | 0f924c7badf437b8bf63b91e9947bfb1e70e2304 (diff) | |
update dependencies to current version
latest libs require compliation with compileSDK version 32, so just bump
that along with the target version to 32 as well
Change-Id: I5d8b0c1874608f7d1e20d2d0fa795da4f8a73ece
| -rw-r--r-- | android/sdremote/build.gradle | 4 | ||||
| -rw-r--r-- | android/sdremote/mobile/build.gradle | 13 | ||||
| -rw-r--r-- | android/sdremote/wear/build.gradle | 10 |
3 files changed, 14 insertions, 13 deletions
diff --git a/android/sdremote/build.gradle b/android/sdremote/build.gradle index c62a4ce..efd0ba4 100644 --- a/android/sdremote/build.gradle +++ b/android/sdremote/build.gradle @@ -17,9 +17,9 @@ subprojects { afterEvaluate {project -> if (project.hasProperty("android")) { android { - compileSdkVersion 31 + compileSdkVersion 32 defaultConfig { - targetSdkVersion 31 + targetSdkVersion 32 namespace 'org.libreoffice.impressremote' versionName '2.5.2' // prevent having android studio create PNGs from the vectors diff --git a/android/sdremote/mobile/build.gradle b/android/sdremote/mobile/build.gradle index f03aac0..5629521 100644 --- a/android/sdremote/mobile/build.gradle +++ b/android/sdremote/mobile/build.gradle @@ -19,10 +19,13 @@ android { } dependencies { - implementation 'androidx.preference:preference:1.1.1' - implementation 'androidx.localbroadcastmanager:localbroadcastmanager:1.0.0' - implementation 'com.google.android.material:material:1.2.1' - //noinspection GradleDependency - fullImplementation 'com.google.android.gms:play-services-wearable:6.5.87' + // workaround for https://issuetracker.google.com/issues/238425626 - otherwise you get duplicate + // class errors due to mismatch between preferences and material versions, drop with next update + // of the preferences package + api "androidx.lifecycle:lifecycle-viewmodel-ktx:2.5.1" + implementation 'androidx.preference:preference:1.2.0' + implementation 'androidx.localbroadcastmanager:localbroadcastmanager:1.1.0' + implementation 'com.google.android.material:material:1.7.0' + fullImplementation 'com.google.android.gms:play-services-wearable:18.0.0' fullWearApp project(':wear') } diff --git a/android/sdremote/wear/build.gradle b/android/sdremote/wear/build.gradle index b0ef4db..0edbd38 100644 --- a/android/sdremote/wear/build.gradle +++ b/android/sdremote/wear/build.gradle @@ -8,10 +8,8 @@ android { } dependencies { - implementation 'androidx.localbroadcastmanager:localbroadcastmanager:1.0.0' - // KitKat (20) wear-emulator doesn't have anything newer - //noinspection GradleDependency - implementation 'com.google.android.gms:play-services-wearable:6.5.87' - implementation 'com.google.android.support:wearable:2.8.1' - compileOnly 'com.google.android.wearable:wearable:2.8.1' + implementation 'androidx.localbroadcastmanager:localbroadcastmanager:1.1.0' + implementation 'com.google.android.gms:play-services-wearable:18.0.0' + implementation 'com.google.android.support:wearable:2.9.0' + compileOnly 'com.google.android.wearable:wearable:2.9.0' } |