From 2782318b8cc3212ef4e5e9245d9b8ca45ac54653 Mon Sep 17 00:00:00 2001 From: Charles Lombardo Date: Wed, 15 Feb 2023 19:02:10 -0500 Subject: [PATCH 1/6] Android: Update ndk version to 25.2.9519653 --- Source/Android/app/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Source/Android/app/build.gradle b/Source/Android/app/build.gradle index e265f56068..f9f5a6e33f 100644 --- a/Source/Android/app/build.gradle +++ b/Source/Android/app/build.gradle @@ -13,7 +13,7 @@ task copyProfile (type: Copy) { android { compileSdkVersion 33 - ndkVersion "25.1.8937393" + ndkVersion "25.2.9519653" viewBinding.enabled = true From 805f921b552dbc7c2620e085db2e116a09a72e38 Mon Sep 17 00:00:00 2001 From: Charles Lombardo Date: Wed, 15 Feb 2023 19:25:53 -0500 Subject: [PATCH 2/6] Android: Remove unused benchmark flags --- Source/Android/benchmark/build.gradle | 2 -- 1 file changed, 2 deletions(-) diff --git a/Source/Android/benchmark/build.gradle b/Source/Android/benchmark/build.gradle index 8904b1452e..13a94f5621 100644 --- a/Source/Android/benchmark/build.gradle +++ b/Source/Android/benchmark/build.gradle @@ -45,8 +45,6 @@ android { signingConfig signingConfigs.debug matchingFallbacks = ['release'] debuggable true - applicationIdSuffix ".benchmark" - versionNameSuffix '-benchmark' proguardFiles getDefaultProguardFile( 'proguard-android-optimize.txt'), 'proguard-rules.pro' From 7e84285047c202b9bff2ffccfa5898fb7cf0c23b Mon Sep 17 00:00:00 2001 From: Charles Lombardo Date: Wed, 15 Feb 2023 19:27:28 -0500 Subject: [PATCH 3/6] Android: Upgrade dependencies Desugar JDK 2.0.0 -> 2.0.2 Androidx Appcompat 1.6.0 -> 1.6.1 Androidx Exif Interface 1.3.5 -> 1.3.6 Material Components 1.7.0 -> 1.8.0 Androidx recyclerview 1.2.1 -> 1.3.0 Androidx viewmodel ktx 2.5.1 -> 2.6.0 Androidx viewmodel 2.5.1 -> 2.6.0 --- Source/Android/app/build.gradle | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/Source/Android/app/build.gradle b/Source/Android/app/build.gradle index f9f5a6e33f..bbc5a410fb 100644 --- a/Source/Android/app/build.gradle +++ b/Source/Android/app/build.gradle @@ -128,26 +128,26 @@ android { } dependencies { - coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:2.0.0' + coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:2.0.2' implementation 'androidx.core:core-ktx:1.9.0' - implementation 'androidx.appcompat:appcompat:1.6.0' - implementation 'androidx.exifinterface:exifinterface:1.3.5' + implementation 'androidx.appcompat:appcompat:1.6.1' + implementation 'androidx.exifinterface:exifinterface:1.3.6' implementation 'androidx.cardview:cardview:1.0.0' - implementation 'androidx.recyclerview:recyclerview:1.2.1' + implementation 'androidx.recyclerview:recyclerview:1.3.0' implementation 'androidx.constraintlayout:constraintlayout:2.1.4' - implementation 'androidx.lifecycle:lifecycle-viewmodel:2.5.1' + implementation 'androidx.lifecycle:lifecycle-viewmodel:2.6.0' implementation 'androidx.fragment:fragment:1.5.5' implementation 'androidx.slidingpanelayout:slidingpanelayout:1.2.0' - implementation 'com.google.android.material:material:1.7.0' + implementation 'com.google.android.material:material:1.8.0' implementation 'androidx.core:core-splashscreen:1.0.0' implementation 'androidx.preference:preference:1.2.0' implementation 'androidx.profileinstaller:profileinstaller:1.2.2' // Kotlin extensions for lifecycle components - implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.5.1' - implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.5.1' - implementation 'androidx.lifecycle:lifecycle-livedata-ktx:2.5.1' + implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.6.0' + implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.6.0' + implementation 'androidx.lifecycle:lifecycle-livedata-ktx:2.6.0' // Android TV UI libraries. implementation 'androidx.leanback:leanback:1.0.0' From de34c962d7c0d832dc36272c6cdc35ebeb23d2fc Mon Sep 17 00:00:00 2001 From: Charles Lombardo Date: Wed, 15 Feb 2023 19:27:45 -0500 Subject: [PATCH 4/6] Android: Upgrade AGP to 7.4.2 --- Source/Android/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Source/Android/build.gradle b/Source/Android/build.gradle index 83cab405f0..ed7499dbac 100644 --- a/Source/Android/build.gradle +++ b/Source/Android/build.gradle @@ -1,6 +1,6 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. plugins { - id 'com.android.application' version '7.4.0' apply false - id 'com.android.library' version '7.4.0' apply false + id 'com.android.application' version '7.4.2' apply false + id 'com.android.library' version '7.4.2' apply false id 'org.jetbrains.kotlin.android' version '1.7.20' apply false } From f06c0897abd686944667f6270c17effe8c625dd4 Mon Sep 17 00:00:00 2001 From: Charles Lombardo Date: Wed, 15 Feb 2023 20:22:06 -0500 Subject: [PATCH 5/6] Android: Update gradle to 8.0 --- Source/Android/gradle/wrapper/gradle-wrapper.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Source/Android/gradle/wrapper/gradle-wrapper.properties b/Source/Android/gradle/wrapper/gradle-wrapper.properties index 35fd883a75..cfe4843ea4 100644 --- a/Source/Android/gradle/wrapper/gradle-wrapper.properties +++ b/Source/Android/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ #Thu Dec 08 14:08:30 EST 2022 distributionBase=GRADLE_USER_HOME -distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip distributionPath=wrapper/dists zipStorePath=wrapper/dists zipStoreBase=GRADLE_USER_HOME From a32d66e5ec591a32a42731076c285ea2a7ebb3e1 Mon Sep 17 00:00:00 2001 From: Charles Lombardo Date: Thu, 2 Mar 2023 00:52:44 -0500 Subject: [PATCH 6/6] Android: Upgrade Kotlin to 1.8.10 --- Source/Android/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Source/Android/build.gradle b/Source/Android/build.gradle index ed7499dbac..5b1f7338e2 100644 --- a/Source/Android/build.gradle +++ b/Source/Android/build.gradle @@ -2,5 +2,5 @@ plugins { id 'com.android.application' version '7.4.2' apply false id 'com.android.library' version '7.4.2' apply false - id 'org.jetbrains.kotlin.android' version '1.7.20' apply false + id 'org.jetbrains.kotlin.android' version '1.8.10' apply false }