Sancaros/phantasmal-world
1
0
Fork 0
mirror of https://github.com/DaanVandenBosch/phantasmal-world.git synced 2025-04-05 15:28:29 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Upgraded Gradle, Kotlin and some libraries.

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
build.gradle.kts
View File

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

4
buildSrc/build.gradle.kts
View File

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

2
gradle/wrapper/gradle-wrapper.properties vendored
View File

@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists 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 zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists zipStorePath=wrapper/dists

3
lib/src/commonMain/kotlin/world/phantasmal/lib/fileFormats/AreaRenderGeometry.kt
View File

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