diff --git a/build.gradle.kts b/build.gradle.kts index 1a8b158a..ba7e56c4 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -161,7 +161,6 @@ buildConfig { buildConfigField("boolean", "DEBUG", project.hasProperty("debugApp").toString()) buildConfigField("String", "TACHIDESK_SP_VERSION", "v0.3.7") - buildConfigField("String", "TACHIDESK_IM_VERSION", "r66") } kotlinter { diff --git a/src/main/kotlin/ca/gosyer/data/server/ServerService.kt b/src/main/kotlin/ca/gosyer/data/server/ServerService.kt index 5d2cd232..bfe6e449 100644 --- a/src/main/kotlin/ca/gosyer/data/server/ServerService.kt +++ b/src/main/kotlin/ca/gosyer/data/server/ServerService.kt @@ -77,17 +77,11 @@ class ServerService @Inject constructor( try { val jarVersion = withContext(Dispatchers.IO) { JarInputStream(jarFile.inputStream()).use { jar -> - JarVersion( - jar.manifest?.mainAttributes?.getValue("Specification-Version"), - jar.manifest?.mainAttributes?.getValue("Implementation-Version") - ) + jar.manifest?.mainAttributes?.getValue("Specification-Version") } } - if ( - jarVersion.specification != BuildConfig.TACHIDESK_SP_VERSION || - jarVersion.implementation != BuildConfig.TACHIDESK_IM_VERSION - ) { + if (jarVersion != BuildConfig.TACHIDESK_SP_VERSION) { info { "Updating server file from resources" } copyJar(jarFile) } @@ -143,7 +137,5 @@ class ServerService @Inject constructor( FAILED; } - data class JarVersion(val specification: String?, val implementation: String?) - private companion object : CKLogger({}) }