godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #49872 from m4gr3d/update_config_versions

This commit is contained in:
Rémi Verschelde 2021-06-24 19:37:13 +02:00 committed by GitHub
parent 40d571a3a2 d1a9363c4c
commit a7a923412c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -6,7 +6,7 @@ buildscript {
repositories { repositories {
google() google()
jcenter() mavenCentral()
} }
dependencies { dependencies {
classpath libraries.androidGradlePlugin classpath libraries.androidGradlePlugin
@ -18,9 +18,8 @@ apply plugin: 'com.android.application'
allprojects { allprojects {
repositories { repositories {
mavenCentral()
google() google()
jcenter() mavenCentral()
// Godot user plugins custom maven repos // Godot user plugins custom maven repos
String[] mavenRepos = getGodotPluginsMavenRepos() String[] mavenRepos = getGodotPluginsMavenRepos()

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

@ -1,11 +1,11 @@
ext.versions = [ ext.versions = [
androidGradlePlugin: '4.0.1', androidGradlePlugin: '4.2.1',
compileSdk : 29, compileSdk : 29,
minSdk : 18, minSdk : 18,
targetSdk : 29, targetSdk : 29,
buildTools : '30.0.3', buildTools : '30.0.3',
supportCoreUtils : '1.0.0', supportCoreUtils : '1.0.0',
kotlinVersion : '1.4.10', kotlinVersion : '1.5.10',
v4Support : '1.0.0', v4Support : '1.0.0',
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.

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

@ -5,7 +5,7 @@ buildscript {
repositories { repositories {
google() google()
jcenter() mavenCentral()
} }
dependencies { dependencies {
classpath libraries.androidGradlePlugin classpath libraries.androidGradlePlugin
@ -16,7 +16,6 @@ buildscript {
allprojects { allprojects {
repositories { repositories {
google() google()
jcenter()
mavenCentral() mavenCentral()
} }
} }

6
platform/android/java/gradle/wrapper/gradle-wrapper.properties vendored
View File

@ -1,6 +1,6 @@
#Mon Sep 02 02:44:30 PDT 2019 #Wed Jun 23 23:42:22 PDT 2021
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-all.zip
distributionPath=wrapper/dists distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-all.zip zipStoreBase=GRADLE_USER_HOME