diff options
| author | Fredia Huya-Kouadio <fhuyakou@gmail.com> | 2021-09-08 04:06:13 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-09-08 04:06:13 -0700 |
| commit | 844d690c854bc49345d1c40f17a7acd7761fd81a (patch) | |
| tree | 28b0691aa8f4e2b91472d362bd7b5f5f3207fd34 /platform/android | |
| parent | f05b449562ca3fdbd1eb486d9fe0059d26fd4a11 (diff) | |
| parent | 23311a6ed3b9fc5bdddaeaf77a05a6d82692a779 (diff) | |
Merge pull request #52489 from madmiraal/fix-android-libraries
Use current androidx Fragment library instead of legacy libraries
Diffstat (limited to 'platform/android')
| -rw-r--r-- | platform/android/java/app/build.gradle | 3 | ||||
| -rw-r--r-- | platform/android/java/app/config.gradle | 6 | ||||
| -rw-r--r-- | platform/android/java/lib/build.gradle | 3 |
3 files changed, 4 insertions, 8 deletions
diff --git a/platform/android/java/app/build.gradle b/platform/android/java/app/build.gradle index 18e07c3762..9640887399 100644 --- a/platform/android/java/app/build.gradle +++ b/platform/android/java/app/build.gradle @@ -34,9 +34,8 @@ allprojects { } dependencies { - implementation libraries.supportCoreUtils implementation libraries.kotlinStdLib - implementation libraries.v4Support + implementation libraries.androidxFragment if (rootProject.findProject(":lib")) { implementation project(":lib") diff --git a/platform/android/java/app/config.gradle b/platform/android/java/app/config.gradle index fad64c675f..fcee54e493 100644 --- a/platform/android/java/app/config.gradle +++ b/platform/android/java/app/config.gradle @@ -4,9 +4,8 @@ ext.versions = [ minSdk : 19, targetSdk : 30, buildTools : '30.0.3', - supportCoreUtils : '1.0.0', kotlinVersion : '1.5.10', - v4Support : '1.0.0', + fragmentVersion : '1.3.6', javaVersion : 1.8, ndkVersion : '21.4.7075529' // Also update 'platform/android/detect.py#get_project_ndk_version()' when this is updated. @@ -14,10 +13,9 @@ ext.versions = [ ext.libraries = [ androidGradlePlugin: "com.android.tools.build:gradle:$versions.androidGradlePlugin", - supportCoreUtils : "androidx.legacy:legacy-support-core-utils:$versions.supportCoreUtils", kotlinGradlePlugin : "org.jetbrains.kotlin:kotlin-gradle-plugin:$versions.kotlinVersion", kotlinStdLib : "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$versions.kotlinVersion", - v4Support : "androidx.legacy:legacy-support-v4:$versions.v4Support" + androidxFragment : "androidx.fragment:fragment:$versions.fragmentVersion", ] ext.getExportPackageName = { -> diff --git a/platform/android/java/lib/build.gradle b/platform/android/java/lib/build.gradle index 663ba73d40..fbed4ed078 100644 --- a/platform/android/java/lib/build.gradle +++ b/platform/android/java/lib/build.gradle @@ -2,9 +2,8 @@ apply plugin: 'com.android.library' apply plugin: 'kotlin-android' dependencies { - implementation libraries.supportCoreUtils implementation libraries.kotlinStdLib - implementation libraries.v4Support + implementation libraries.androidxFragment } def pathToRootDir = "../../../../" |