From 2bb00e4458b4a316530fc39ee79f6a0e7353ddea Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 12 Nov 2024 14:02:50 -0500 Subject: [PATCH] all: bump `androidx.core:core-ktx` to 1.15.0 (fixes #2152) (#2147) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Gideon Okuro Co-authored-by: dogi --- app/build.gradle | 4 ++-- .../kotlin/io/treehouses/remote/network/ParseDbService.kt | 2 +- .../main/kotlin/io/treehouses/remote/utils/VersionUtils.kt | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 685a9985b..ae2bed1b4 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -5,7 +5,7 @@ def appVersionName = (System.env.GITHUB_RUN_NUMBER ? Integer.valueOf(System.env. android { namespace 'io.treehouses.remote' - compileSdkVersion 34 + compileSdk 35 defaultConfig { applicationId "io.treehouses.remote" minSdkVersion 21 @@ -89,7 +89,7 @@ dependencies { androidTestImplementation 'androidx.test:runner:1.6.2' implementation 'me.aflak.libraries:bluetooth:1.3.9' implementation 'com.caverock:androidsvg-aar:1.4' - implementation "androidx.core:core-ktx:1.13.1" + implementation "androidx.core:core-ktx:1.15.0" implementation 'com.android.support:multidex:1.0.3' implementation 'me.toptas.fancyshowcase:fancyshowcaseview:1.3.3' implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" diff --git a/app/src/main/kotlin/io/treehouses/remote/network/ParseDbService.kt b/app/src/main/kotlin/io/treehouses/remote/network/ParseDbService.kt index c91b71b5e..e96160038 100644 --- a/app/src/main/kotlin/io/treehouses/remote/network/ParseDbService.kt +++ b/app/src/main/kotlin/io/treehouses/remote/network/ParseDbService.kt @@ -16,7 +16,7 @@ object ParseDbService { testObject.put("description", "Connected to bluetooth") testObject.put("type", "BT Connection") testObject.put("versionCode", getVersionCode(context)) - testObject.put("versionName", getVersionName(context)) + testObject.put("versionName", getVersionName(context) ?: "") testObject.put("deviceName", Build.DEVICE) testObject.put("deviceManufacturer", Build.MANUFACTURER) testObject.put("deviceModel", Build.MODEL) diff --git a/app/src/main/kotlin/io/treehouses/remote/utils/VersionUtils.kt b/app/src/main/kotlin/io/treehouses/remote/utils/VersionUtils.kt index b558d5d35..c4c90e09b 100644 --- a/app/src/main/kotlin/io/treehouses/remote/utils/VersionUtils.kt +++ b/app/src/main/kotlin/io/treehouses/remote/utils/VersionUtils.kt @@ -20,7 +20,7 @@ object VersionUtils { } @JvmStatic - fun getVersionName(context: Context?): String { + fun getVersionName(context: Context?): String? { try { return if (context != null) { val pInfo = context.packageManager.getPackageInfo(context.packageName, 0)