diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2021-06-24 19:37:13 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-06-24 19:37:13 +0200 |
| commit | a7a923412c58dcedc8b056365965f6a88452148f (patch) | |
| tree | 08bc04af3596f6784a7c24a4a38ae1f9c193b5ed | |
| parent | 40d571a3a2399fbd812eb1f6e315b6fd80d2c027 (diff) | |
| parent | d1a9363c4c8626cd96e521b24d20ee069a4ce375 (diff) | |
Merge pull request #49872 from m4gr3d/update_config_versions
| -rw-r--r-- | platform/android/java/app/build.gradle | 5 | ||||
| -rw-r--r-- | platform/android/java/app/config.gradle | 4 | ||||
| -rw-r--r-- | platform/android/java/build.gradle | 3 | ||||
| -rw-r--r-- | platform/android/java/gradle/wrapper/gradle-wrapper.properties | 6 |
4 files changed, 8 insertions, 10 deletions
diff --git a/platform/android/java/app/build.gradle b/platform/android/java/app/build.gradle index a3a9163491..18e07c3762 100644 --- a/platform/android/java/app/build.gradle +++ b/platform/android/java/app/build.gradle @@ -6,7 +6,7 @@ buildscript { repositories { google() - jcenter() + mavenCentral() } dependencies { classpath libraries.androidGradlePlugin @@ -18,9 +18,8 @@ apply plugin: 'com.android.application' allprojects { repositories { - mavenCentral() google() - jcenter() + mavenCentral() // Godot user plugins custom maven repos String[] mavenRepos = getGodotPluginsMavenRepos() diff --git a/platform/android/java/app/config.gradle b/platform/android/java/app/config.gradle index a2c32552d9..81fc87b7ef 100644 --- a/platform/android/java/app/config.gradle +++ b/platform/android/java/app/config.gradle @@ -1,11 +1,11 @@ ext.versions = [ - androidGradlePlugin: '4.0.1', + androidGradlePlugin: '4.2.1', compileSdk : 29, minSdk : 18, targetSdk : 29, buildTools : '30.0.3', supportCoreUtils : '1.0.0', - kotlinVersion : '1.4.10', + kotlinVersion : '1.5.10', v4Support : '1.0.0', javaVersion : 1.8, ndkVersion : '21.4.7075529' // Also update 'platform/android/detect.py#get_project_ndk_version()' when this is updated. diff --git a/platform/android/java/build.gradle b/platform/android/java/build.gradle index a28888d80d..ee24a46d9f 100644 --- a/platform/android/java/build.gradle +++ b/platform/android/java/build.gradle @@ -5,7 +5,7 @@ buildscript { repositories { google() - jcenter() + mavenCentral() } dependencies { classpath libraries.androidGradlePlugin @@ -16,7 +16,6 @@ buildscript { allprojects { repositories { google() - jcenter() mavenCentral() } } diff --git a/platform/android/java/gradle/wrapper/gradle-wrapper.properties b/platform/android/java/gradle/wrapper/gradle-wrapper.properties index a7d8a0f310..74c5636f8a 100644 --- a/platform/android/java/gradle/wrapper/gradle-wrapper.properties +++ b/platform/android/java/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Mon Sep 02 02:44:30 PDT 2019 +#Wed Jun 23 23:42:22 PDT 2021 distributionBase=GRADLE_USER_HOME +distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-all.zip distributionPath=wrapper/dists -zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-all.zip +zipStoreBase=GRADLE_USER_HOME |