diff --git a/build.gradle.kts b/build.gradle.kts index 2d1be98815..ac628aa8a2 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -26,7 +26,7 @@ buildscript { dependencies { classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:${com.unciv.build.BuildConfig.kotlinVersion}") classpath("de.richsource.gradle.plugins:gwt-gradle-plugin:0.6") - classpath("com.android.tools.build:gradle:7.0.1") + classpath("com.android.tools.build:gradle:7.0.2") classpath("com.mobidevelop.robovm:robovm-gradle-plugin:2.3.1") // This is for wrapping the .jar file into a standalone executable @@ -132,12 +132,5 @@ project(":core") { "testImplementation"("com.badlogicgames.gdx:gdx:$gdxVersion") "testImplementation"("com.badlogicgames.gdx:gdx-platform:$gdxVersion:natives-desktop") } - }} - -tasks { - "eclipse" { - doLast { - delete(".project") - } } } diff --git a/changelog.md b/changelog.md index 0d2ada6475..fa27bf7868 100644 --- a/changelog.md +++ b/changelog.md @@ -4,7 +4,6 @@ By xlenstra: - From the industrial era onwards, things change in religion - Fixed bugs with unit movement, renamed units, and default starting era - Unique additions for modding -- Fixes #5113 By SomeTroglodyte: - New game is more wrap and shape aware diff --git a/core/build.gradle.kts b/core/build.gradle.kts index d9b365e5fe..36cac4ab2c 100644 --- a/core/build.gradle.kts +++ b/core/build.gradle.kts @@ -5,7 +5,7 @@ plugins { } java { - sourceCompatibility = JavaVersion.VERSION_1_7 + sourceCompatibility = JavaVersion.VERSION_1_8 } @@ -13,8 +13,4 @@ sourceSets { main { java.srcDir("src/") } -} - -eclipse.project { - name = "${BuildConfig.appName}-core" -} +} \ No newline at end of file diff --git a/desktop/build.gradle.kts b/desktop/build.gradle.kts index 67cce9156c..df55498bf5 100644 --- a/desktop/build.gradle.kts +++ b/desktop/build.gradle.kts @@ -8,7 +8,7 @@ plugins { } java { - sourceCompatibility = JavaVersion.VERSION_1_7 + sourceCompatibility = JavaVersion.VERSION_1_8 } sourceSets {