2
0
mirror of https://github.com/KDE/kdeconnect-android synced 2025-08-31 06:05:12 +00:00

Bump dependencies

This commit is contained in:
Albert Vaca Cintora
2023-09-06 07:43:13 +02:00
parent b01266d654
commit 6b1b12a178
6 changed files with 10 additions and 11 deletions

View File

@@ -8,7 +8,6 @@ SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
package="org.kde.kdeconnect_tp"
android:versionCode="12701"
android:versionName="1.27.1">

View File

@@ -38,7 +38,7 @@ fun String.runCommand(
android {
namespace = "org.kde.kdeconnect_tp"
compileSdk = 33
compileSdk = 34
defaultConfig {
minSdk = 21
targetSdk = 33
@@ -154,7 +154,7 @@ dependencies {
implementation(libs.androidx.compose.material3)
implementation(libs.androidx.compose.ui.tooling.preview)
implementation(libs.androidx.activity.compose)
implementation(libs.accompanist.themeadapter.material3)
implementation(libs.accompanist.themeadapter.material3) // TODO: Remove deprecated library https://google.github.io/accompanist/themeadapter-material3/
implementation(libs.androidx.constraintlayout.compose)
implementation(libs.androidx.compose.ui.tooling.preview)

View File

@@ -1,8 +1,8 @@
[versions]
accompanistThemeadapterMaterial3 = "0.31.0-alpha"
accompanistThemeadapterMaterial3 = "0.33.1-alpha"
activityCompose = "1.7.2"
androidDesugarJdkLibs = "2.0.3"
androidGradlePlugin = "8.1.0"
androidGradlePlugin = "8.1.1"
androidSmsmms = "kdeconnect-1-21-0"
appcompat = "1.6.1"
bcpkixJdk15on = "1.70"
@@ -14,7 +14,7 @@ constraintlayoutCompose = "1.0.1"
coreKtx = "1.10.1"
disklrucache = "2.0.2"
documentfile = "1.0.1"
gradle = "8.1.0"
gradle = "8.1.1"
gridlayout = "1.0.0"
jsonassert = "1.5.1"
junit = "4.13.2"
@@ -30,13 +30,13 @@ media = "1.6.0"
minaCore = "2.0.19"
mockitoCore = "3.12.4"
powermockModuleJunit4 = "2.0.0"
preferenceKtx = "1.2.0"
preferenceKtx = "1.2.1"
reactiveStreams = "1.0.4"
recyclerview = "1.3.1"
rxjava = "2.2.21"
sshdCore = "0.14.0"
swiperefreshlayout = "1.1.0"
uiToolingPreview = "1.4.3"
uiToolingPreview = "1.5.0"
univocityParsers = "2.9.1"
[libraries]

View File

@@ -367,7 +367,7 @@ class MainActivity : AppCompatActivity(), OnSharedPreferenceChangeListener {
}
}
override fun onSharedPreferenceChanged(sharedPreferences: SharedPreferences, key: String) {
override fun onSharedPreferenceChanged(sharedPreferences: SharedPreferences, key: String?) {
if (DeviceHelper.KEY_DEVICE_NAME_PREFERENCE == key) {
mNavViewDeviceName.text = DeviceHelper.getDeviceName(this)
BackgroundService.ForceRefreshConnections(this) //Re-send our identity packet

View File

@@ -150,7 +150,7 @@ public class PluginSettingsActivity
finish();
}
public String getDeviceId() {
public String getSettingsDeviceId() { // Weird name because Activity also has a getDeviceId()
return deviceId;
}
}

View File

@@ -82,7 +82,7 @@ public class PluginSettingsFragment extends PreferenceFragmentCompat {
}
public String getDeviceId() {
return ((PluginSettingsActivity)requireActivity()).getDeviceId();
return ((PluginSettingsActivity)requireActivity()).getSettingsDeviceId();
}
}