From 054b2219d400e30012bc604451a08708ef11ab3a Mon Sep 17 00:00:00 2001 From: Charles Lombardo Date: Sat, 14 Jan 2023 18:29:39 -0500 Subject: [PATCH 1/5] Android: Upgrade gradle from 7.5.1 to 7.6 --- 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 f3207fb7ca3f..35fd883a7588 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.5.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip distributionPath=wrapper/dists zipStorePath=wrapper/dists zipStoreBase=GRADLE_USER_HOME From 27466fd5f9421ca6680bafdf19d0ee1a187306f5 Mon Sep 17 00:00:00 2001 From: Charles Lombardo Date: Sat, 14 Jan 2023 18:30:07 -0500 Subject: [PATCH 2/5] Android: Upgrade AGP from 7.3.1 to 7.4.0 --- 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 60aeb09a8c31..83cab405f065 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.3.1' apply false - id 'com.android.library' version '7.3.1' apply false + id 'com.android.application' version '7.4.0' apply false + id 'com.android.library' version '7.4.0' apply false id 'org.jetbrains.kotlin.android' version '1.7.20' apply false } From 45cdc7357a20b177017898d433d38c6a839fecc5 Mon Sep 17 00:00:00 2001 From: Charles Lombardo Date: Sat, 14 Jan 2023 18:35:32 -0500 Subject: [PATCH 3/5] Android: Upgrade Java bytecode from 1.8 to 11 --- Source/Android/app/build.gradle | 6 +++--- Source/Android/benchmark/build.gradle | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Source/Android/app/build.gradle b/Source/Android/app/build.gradle index a67131e6dfd6..e804ee6fbb3a 100644 --- a/Source/Android/app/build.gradle +++ b/Source/Android/app/build.gradle @@ -13,12 +13,12 @@ android { // Flag to enable support for the new language APIs coreLibraryDesugaringEnabled true - sourceCompatibility JavaVersion.VERSION_1_8 - targetCompatibility JavaVersion.VERSION_1_8 + sourceCompatibility = "11" + targetCompatibility = "11" } kotlinOptions { - jvmTarget = '1.8' + jvmTarget = '11' } lint { diff --git a/Source/Android/benchmark/build.gradle b/Source/Android/benchmark/build.gradle index 0e3d24ade049..fd99dd196c6a 100644 --- a/Source/Android/benchmark/build.gradle +++ b/Source/Android/benchmark/build.gradle @@ -10,12 +10,12 @@ android { compileSdk 33 compileOptions { - sourceCompatibility = JavaVersion.VERSION_1_8 - targetCompatibility = JavaVersion.VERSION_1_8 + sourceCompatibility = "11" + targetCompatibility = "11" } kotlinOptions { - jvmTarget = "1.8" + jvmTarget = "11" } defaultConfig { From 005d7574aa25cb1cd722b7407db59abc7bff68bb Mon Sep 17 00:00:00 2001 From: Charles Lombardo Date: Sat, 14 Jan 2023 18:39:43 -0500 Subject: [PATCH 4/5] Android: Update app module dependencies Androidx Fragment 1.5.4 -> 1.5.5 Androidx AppCompat 1.5.1 -> 1.6.0 Androidx Profile Installer 1.2.1 -> 1.2.2 Core android library desugaring libraries 1.1.5 -> 2.0.0 --- Source/Android/app/build.gradle | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Source/Android/app/build.gradle b/Source/Android/app/build.gradle index e804ee6fbb3a..c581f94a7d62 100644 --- a/Source/Android/app/build.gradle +++ b/Source/Android/app/build.gradle @@ -116,21 +116,21 @@ android { } dependencies { - coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.1.5' + coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:2.0.0' implementation 'androidx.core:core-ktx:1.9.0' - implementation 'androidx.appcompat:appcompat:1.5.1' + implementation 'androidx.appcompat:appcompat:1.6.0' implementation 'androidx.exifinterface:exifinterface:1.3.5' implementation 'androidx.cardview:cardview:1.0.0' implementation 'androidx.recyclerview:recyclerview:1.2.1' implementation 'androidx.constraintlayout:constraintlayout:2.1.4' implementation 'androidx.lifecycle:lifecycle-viewmodel:2.5.1' - implementation 'androidx.fragment:fragment:1.5.4' + implementation 'androidx.fragment:fragment:1.5.5' implementation 'androidx.slidingpanelayout:slidingpanelayout:1.2.0' implementation 'com.google.android.material:material:1.7.0' implementation 'androidx.core:core-splashscreen:1.0.0' implementation 'androidx.preference:preference:1.2.0' - implementation 'androidx.profileinstaller:profileinstaller:1.2.1' + implementation 'androidx.profileinstaller:profileinstaller:1.2.2' // Force dependency version to solve build conflict with androidx preferences implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.5.1" From 33c5f7a1292494699cb1d6ccb4a2e5335bc2198f Mon Sep 17 00:00:00 2001 From: Charles Lombardo Date: Sat, 14 Jan 2023 18:41:18 -0500 Subject: [PATCH 5/5] Android: Update benchmark module dependencies Androidx JUnit 1.1.4 -> 1.1.5 Androidx Espresso 3.5.0 -> 3.5.1 --- Source/Android/benchmark/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Source/Android/benchmark/build.gradle b/Source/Android/benchmark/build.gradle index fd99dd196c6a..8904b1452e80 100644 --- a/Source/Android/benchmark/build.gradle +++ b/Source/Android/benchmark/build.gradle @@ -60,8 +60,8 @@ android { } dependencies { - implementation 'androidx.test.ext:junit:1.1.4' - implementation 'androidx.test.espresso:espresso-core:3.5.0' + implementation 'androidx.test.ext:junit:1.1.5' + implementation 'androidx.test.espresso:espresso-core:3.5.1' implementation 'androidx.test.uiautomator:uiautomator:2.2.0' implementation 'androidx.benchmark:benchmark-macro-junit4:1.1.1' }