mirrors/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-07-11 00:08:58 +07:00
Code Issues Packages Projects Releases Wiki Activity

Remove source compatibility to java 8, in preparation for Gradle 8.5 upgrade

Browse Source 
See #10740
This commit is contained in:
Yair Morgenstern
2023-12-28 23:06:36 +02:00
parent 7745cd1c88
commit 783f846761
7 changed files with 3 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
android/AndroidManifest.xml
View File

@ -1,7 +1,6 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android" <manifest xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools">
package="com.unciv.app" >
<uses-sdk/> <uses-sdk/>
@ -10,6 +9,7 @@
<!-- See https://developer.android.com/training/tv/start/start --> <!-- See https://developer.android.com/training/tv/start/start -->
<uses-feature android:name="android.software.leanback" android:required="false" /> <uses-feature android:name="android.software.leanback" android:required="false" />
<uses-feature android:name="android.hardware.touchscreen" android:required="false" /> <uses-feature android:name="android.hardware.touchscreen" android:required="false" />
<uses-feature android:glEsVersion="0x00020000" android:required="false" />
<!-- <!--
Known Lint warnings: Known Lint warnings:

3
android/build.gradle.kts
View File

@ -27,6 +27,7 @@ android {
resources.excludes += "DebugProbesKt.bin" resources.excludes += "DebugProbesKt.bin"
} }
defaultConfig { defaultConfig {
namespace = "com.unciv.app"
applicationId = "com.unciv.app" applicationId = "com.unciv.app"
minSdk = 21 minSdk = 21
targetSdk = 33 // See #5044 targetSdk = 33 // See #5044
@ -65,9 +66,7 @@ android {
disable += "MissingTranslation" // see res/values/strings.xml disable += "MissingTranslation" // see res/values/strings.xml
} }
compileOptions { compileOptions {
sourceCompatibility = JavaVersion.VERSION_1_8
targetCompatibility = JavaVersion.VERSION_1_8 targetCompatibility = JavaVersion.VERSION_1_8
isCoreLibraryDesugaringEnabled = true isCoreLibraryDesugaringEnabled = true
} }
androidResources { androidResources {

5
core/build.gradle.kts
View File

@ -3,11 +3,6 @@ plugins {
id("kotlin") id("kotlin")
} }
java {
sourceCompatibility = JavaVersion.VERSION_1_8
}
sourceSets { sourceSets {
main { main {
java.srcDir("src/") java.srcDir("src/")

4
desktop/build.gradle.kts
View File

@ -5,10 +5,6 @@ plugins {
id("kotlin") id("kotlin")
} }
java {
sourceCompatibility = JavaVersion.VERSION_1_8
}
sourceSets { sourceSets {
main { main {
java.srcDir("src/") java.srcDir("src/")

4
ios/build.gradle.kts
View File

@ -7,10 +7,6 @@ sourceSets {
} }
} }
java {
sourceCompatibility = JavaVersion.VERSION_1_8
}
tasks { tasks {
compileJava { compileJava {
options.encoding = "UTF-8" options.encoding = "UTF-8"

4
server/build.gradle.kts
View File

@ -4,10 +4,6 @@ plugins {
id("kotlin") id("kotlin")
} }
java {
sourceCompatibility = JavaVersion.VERSION_1_8
}
sourceSets { sourceSets {
main { main {
java.srcDir("src/") java.srcDir("src/")

9
tests/build.gradle.kts
View File

@ -1,15 +1,6 @@
import com.unciv.build.BuildConfig import com.unciv.build.BuildConfig
import org.gradle.api.tasks.testing.logging.TestLogEvent import org.gradle.api.tasks.testing.logging.TestLogEvent
plugins {
id("java")
}
java {
sourceCompatibility = JavaVersion.VERSION_1_8
targetCompatibility = JavaVersion.VERSION_1_8
}
tasks { tasks {
test { test {
workingDir = file("../android/assets") workingDir = file("../android/assets")