mirrors/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2024-12-22 10:34:25 +07:00
Code Issues Packages Projects Releases Wiki Activity

Gradle 8.2->8.7, AGP 8.2.2->8.5.0 (#12325)

Browse Source 
* Gradle 8.2->8.7, AGP 8.2.2->8.5.0

* *Conditionally* add android project only if ANDROID_HOME is set
This commit is contained in:
Yair Morgenstern 2024-10-22 21:53:30 +03:00 committed by GitHub
parent 591805b26b
commit a999ba8f28
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 20 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
build.gradle.kts
View File

@ -19,7 +19,7 @@ buildscript {
}
dependencies {
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:${com.unciv.build.BuildConfig.kotlinVersion}")
classpath("com.android.tools.build:gradle:8.2.2")
classpath("com.android.tools.build:gradle:8.5.0")
}
}
@ -90,22 +90,24 @@ project(":server") {
}
project(":android") {
apply(plugin = "com.android.application")
apply(plugin = "kotlin-android")
if (System.getenv("ANDROID_HOME") != null) {
project(":android") {
apply(plugin = "com.android.application")
apply(plugin = "kotlin-android")
val natives by configurations.creating
val natives by configurations.creating
dependencies {
"implementation"(project(":core"))
// Not sure why I had to add this in for the upgrade to 1.12.1 to work, we can probably remove this later since it's contained in core
"implementation"("com.badlogicgames.gdx:gdx:$gdxVersion")
"implementation"("com.badlogicgames.gdx:gdx-backend-android:$gdxVersion")
"implementation"("org.jetbrains.kotlinx:kotlinx-coroutines-android:$coroutinesVersion")
natives("com.badlogicgames.gdx:gdx-platform:$gdxVersion:natives-armeabi-v7a")
natives("com.badlogicgames.gdx:gdx-platform:$gdxVersion:natives-arm64-v8a")
natives("com.badlogicgames.gdx:gdx-platform:$gdxVersion:natives-x86")
natives("com.badlogicgames.gdx:gdx-platform:$gdxVersion:natives-x86_64")
dependencies {
"implementation"(project(":core"))
// Not sure why I had to add this in for the upgrade to 1.12.1 to work, we can probably remove this later since it's contained in core
"implementation"("com.badlogicgames.gdx:gdx:$gdxVersion")
"implementation"("com.badlogicgames.gdx:gdx-backend-android:$gdxVersion")
"implementation"("org.jetbrains.kotlinx:kotlinx-coroutines-android:$coroutinesVersion")
natives("com.badlogicgames.gdx:gdx-platform:$gdxVersion:natives-armeabi-v7a")
natives("com.badlogicgames.gdx:gdx-platform:$gdxVersion:natives-arm64-v8a")
natives("com.badlogicgames.gdx:gdx-platform:$gdxVersion:natives-x86")
natives("com.badlogicgames.gdx:gdx-platform:$gdxVersion:natives-x86_64")
}
}
}

2
gradle/wrapper/gradle-wrapper.properties vendored
View File

@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME

3
settings.gradle.kts
View File

@ -1 +1,2 @@
include("desktop", "android", "core", "tests", "server")
include("desktop", "core", "tests", "server")
if (System.getenv("ANDROID_HOME") != null) include("android")