Upgraded Gradle, Kotlin and some libraries.

This commit is contained in:
Daan Vanden Bosch 2021-04-18 20:10:10 +02:00
parent 2d56e7830f
commit 5c0b7a20f0
4 changed files with 13 additions and 14 deletions

View File

@ -2,26 +2,26 @@ import org.jetbrains.kotlin.gradle.tasks.Kotlin2JsCompile
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
plugins {
kotlin("js") version "1.4.31" apply false
kotlin("multiplatform") version "1.4.31" apply false
kotlin("plugin.serialization") version "1.4.31" apply false
kotlin("js") version "1.4.32" apply false
kotlin("multiplatform") version "1.4.32" apply false
kotlin("plugin.serialization") version "1.4.32" apply false
}
tasks.wrapper {
gradleVersion = "6.8.2"
gradleVersion = "7.0"
}
subprojects {
project.extra["coroutinesVersion"] = "1.4.2"
project.extra["coroutinesVersion"] = "1.4.3"
project.extra["junitVersion"] = "5.7.1"
project.extra["kotlinLoggingVersion"] = "2.0.2"
project.extra["ktorVersion"] = "1.4.3"
project.extra["log4jVersion"] = "2.14.0"
project.extra["kotlinLoggingVersion"] = "2.0.6"
project.extra["ktorVersion"] = "1.5.3"
project.extra["log4jVersion"] = "2.14.1"
project.extra["serializationVersion"] = "1.1.0"
project.extra["slf4jVersion"] = "1.7.30"
repositories {
jcenter()
mavenCentral()
maven(url = "https://kotlin.bintray.com/kotlinx/")
}

View File

@ -1,10 +1,10 @@
plugins {
kotlin("jvm") version "1.4.31"
kotlin("jvm") version "1.4.32"
`java-gradle-plugin`
}
repositories {
jcenter()
mavenCentral()
}
gradlePlugin {

View File

@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.2-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-7.0-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists

View File

@ -145,8 +145,7 @@ private fun parseAreaObjects(
njMotionOffset = null
}
val slideTextureIdOffset = cursor.int()
val swapTextureIdOffset = cursor.int()
cursor.seek(8) // Skip slide texture ID offset and swap texture ID offset.
val flags = cursor.int()