godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-08 12:40:44 +00:00
Code Releases Wiki Activity

Use current androidx Fragment library instead of legacy libraries

Browse Source 
(cherry picked from commit 23311a6ed3)
This commit is contained in:
Marcel Admiraal
2021-08-31 11:02:59 +01:00
committed by Rémi Verschelde
parent 520b2d822a
commit cce7e6c9d6
3 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
platform/android/java/app/build.gradle
View File

@@ -43,9 +43,8 @@ allprojects {
} }
dependencies { dependencies {
implementation libraries.supportCoreUtils
implementation libraries.kotlinStdLib implementation libraries.kotlinStdLib
implementation libraries.v4Support implementation libraries.androidxFragment
if (rootProject.findProject(":lib")) { if (rootProject.findProject(":lib")) {
implementation project(":lib") implementation project(":lib")

6
platform/android/java/app/config.gradle
View File

@@ -4,9 +4,8 @@ ext.versions = [
minSdk : 19, minSdk : 19,
targetSdk : 30, targetSdk : 30,
buildTools : '30.0.3', buildTools : '30.0.3',
supportCoreUtils : '1.0.0',
kotlinVersion : '1.5.10', kotlinVersion : '1.5.10',
v4Support : '1.0.0', fragmentVersion : '1.3.6',
javaVersion : 1.8, javaVersion : 1.8,
ndkVersion : '21.4.7075529' // Also update 'platform/android/detect.py#get_project_ndk_version()' when this is updated. 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 = [ ext.libraries = [
androidGradlePlugin: "com.android.tools.build:gradle:$versions.androidGradlePlugin", 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", kotlinGradlePlugin : "org.jetbrains.kotlin:kotlin-gradle-plugin:$versions.kotlinVersion",
kotlinStdLib : "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$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 = { -> ext.getExportPackageName = { ->

3
platform/android/java/lib/build.gradle
View File

@@ -2,9 +2,8 @@ apply plugin: 'com.android.library'
apply plugin: 'kotlin-android' apply plugin: 'kotlin-android'
dependencies { dependencies {
implementation libraries.supportCoreUtils
implementation libraries.kotlinStdLib implementation libraries.kotlinStdLib
implementation libraries.v4Support implementation libraries.androidxFragment
} }
def pathToRootDir = "../../../../" def pathToRootDir = "../../../../"