X-Git-Url: http://deadsoftware.ru/gitweb?a=blobdiff_plain;f=build.gradle;h=863d66eb10a8aa2c3a87276927234ef65d9c786c;hb=45774fe0e54d63043d505867137df6b7e60da690;hp=8250a6a7459fe08f1fdef7b77cb08594c41f4d3e;hpb=9e1a0841723054bd45a5e46035876003dfd01886;p=cavedroid.git diff --git a/build.gradle b/build.gradle index 8250a6a..863d66e 100644 --- a/build.gradle +++ b/build.gradle @@ -10,13 +10,13 @@ buildscript { dependencies { classpath 'com.android.tools.build:gradle:8.2.2' - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.6.10" + classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.23" } } allprojects { - version = 'alpha0.4.1' + version = 'alpha0.4.2' ext { appName = "CaveDroid" gdxVersion = '1.12.0' @@ -51,11 +51,16 @@ project(":android") { dependencies { implementation project(":core") + implementation platform("org.jetbrains.kotlin:kotlin-bom:1.9.23") api "com.badlogicgames.gdx:gdx-backend-android:$gdxVersion" 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" + + configurations.implementation { + exclude group: 'org.jetbrains.kotlin', module: 'kotlin-stdlib-jdk8' + } } } @@ -67,7 +72,7 @@ project(":core") { api "com.google.guava:guava:$guavaVersion-android" api 'com.google.dagger:dagger:2.40.1' implementation 'org.jetbrains:annotations:23.1.0' - implementation "org.jetbrains.kotlin:kotlin-stdlib" + implementation "org.jetbrains.kotlin:kotlin-stdlib:1.9.23" annotationProcessor 'com.google.dagger:dagger-compiler:2.40.1' } } \ No newline at end of file