AnarchistGamers/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-09-30 15:30:43 -04:00
Code Issues Packages Projects Releases Wiki Activity

Upgraded BuildTools to 28.0.3, Gradle to 3.2.1 and Kotlin to 1.2.71

Browse Source
This commit is contained in:
Yair Morgenstern 2018-12-02 14:12:47 +02:00
parent a01173261c
commit 9ea9e9f523
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
android/build.gradle
View File

@ -1,5 +1,5 @@
android { android {
buildToolsVersion "26.0.2" buildToolsVersion "28.0.3"
compileSdkVersion 26 compileSdkVersion 26
sourceSets { sourceSets {
main { main {
@ -12,7 +12,7 @@ android {
jniLibs.srcDirs = ['libs'] jniLibs.srcDirs = ['libs']
} }
instrumentTest.setRoot('tests') androidTest.setRoot('tests')
} }
packagingOptions { packagingOptions {
exclude 'META-INF/robovm/ios/robovm.xml' exclude 'META-INF/robovm/ios/robovm.xml'

9
build.gradle
View File

@ -1,6 +1,6 @@
buildscript { buildscript {
ext.kotlinVersion = '1.2.41' ext.kotlinVersion = '1.2.71'
dependencies { dependencies {
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion" classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion"
@ -8,6 +8,7 @@ buildscript {
repositories { repositories {
google()
mavenLocal() mavenLocal()
mavenCentral() mavenCentral()
maven { url "https://oss.sonatype.org/content/repositories/snapshots/" } maven { url "https://oss.sonatype.org/content/repositories/snapshots/" }
@ -15,7 +16,7 @@ buildscript {
} }
dependencies { dependencies {
classpath 'de.richsource.gradle.plugins:gwt-gradle-plugin:0.6' classpath 'de.richsource.gradle.plugins:gwt-gradle-plugin:0.6'
classpath 'com.android.tools.build:gradle:2.3.3' classpath 'com.android.tools.build:gradle:3.2.1'
classpath 'com.mobidevelop.robovm:robovm-gradle-plugin:2.3.1' classpath 'com.mobidevelop.robovm:robovm-gradle-plugin:2.3.1'
@ -29,7 +30,7 @@ allprojects {
version = '1.0.1' version = '1.0.1'
ext { ext {
appName = "unciv-game" appName = "unciv-game"
gdxVersion = '1.9.6' gdxVersion = '1.9.9'
roboVMVersion = '2.3.1' roboVMVersion = '2.3.1'
box2DLightsVersion = '1.4' box2DLightsVersion = '1.4'
ashleyVersion = '1.7.0' ashleyVersion = '1.7.0'
@ -62,7 +63,7 @@ project(":desktop") {
project(":android") { project(":android") {
apply plugin: "android" apply plugin: "android"
apply plugin: "kotlin-android" //apply plugin: "kotlin-android"
configurations { natives } configurations { natives }