mirror of
https://github.com/Suwayomi/TachideskJUI.git
synced 2025-12-10 06:42:05 +01:00
Migrate to a newer BuildConfig plugin, update gradle
This commit is contained in:
@@ -12,7 +12,7 @@ plugins {
|
|||||||
kotlin("kapt") version "1.5.21"
|
kotlin("kapt") version "1.5.21"
|
||||||
kotlin("plugin.serialization") version "1.5.21"
|
kotlin("plugin.serialization") version "1.5.21"
|
||||||
id("org.jetbrains.compose") version "1.0.0-alpha4-build310"
|
id("org.jetbrains.compose") version "1.0.0-alpha4-build310"
|
||||||
id("de.fuerstenau.buildconfig") version "1.1.8"
|
id("com.github.gmazzo.buildconfig") version "3.0.2"
|
||||||
id("org.jmailen.kotlinter") version "3.5.0"
|
id("org.jmailen.kotlinter") version "3.5.0"
|
||||||
id("com.github.ben-manes.versions") version "0.39.0"
|
id("com.github.ben-manes.versions") version "0.39.0"
|
||||||
}
|
}
|
||||||
@@ -183,15 +183,17 @@ compose.desktop {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
fun String.wrap() = """"$this""""
|
||||||
buildConfig {
|
buildConfig {
|
||||||
appName = project.name
|
className("BuildConfig")
|
||||||
version = project.version.toString()
|
packageName(project.group.toString())
|
||||||
|
useKotlinOutput { internalVisibility = true }
|
||||||
|
|
||||||
clsName = "BuildConfig"
|
buildConfigField("String", "NAME", project.name.wrap())
|
||||||
packageName = project.group.toString()
|
buildConfigField("String", "VERSION", project.version.toString().wrap())
|
||||||
|
|
||||||
buildConfigField("boolean", "DEBUG", project.hasProperty("debugApp").toString())
|
buildConfigField("boolean", "DEBUG", project.hasProperty("debugApp").toString())
|
||||||
buildConfigField("String", "TACHIDESK_SP_VERSION", tachideskVersion)
|
buildConfigField("String", "TACHIDESK_SP_VERSION", tachideskVersion.wrap())
|
||||||
buildConfigField("int", "SERVER_CODE", serverCode.toString())
|
buildConfigField("int", "SERVER_CODE", serverCode.toString())
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -2,6 +2,7 @@ import org.gradle.api.JavaVersion
|
|||||||
|
|
||||||
object Config {
|
object Config {
|
||||||
const val tachideskVersion = "v0.4.5"
|
const val tachideskVersion = "v0.4.5"
|
||||||
|
// Bump this when updating the Tachidesk version or Preview commit
|
||||||
const val serverCode = 1
|
const val serverCode = 1
|
||||||
const val preview = true
|
const val preview = true
|
||||||
const val previewCommit = "8a986383fe0550d190090f14a9ac2fa0ddace448"
|
const val previewCommit = "8a986383fe0550d190090f14a9ac2fa0ddace448"
|
||||||
|
|||||||
2
gradle/wrapper/gradle-wrapper.properties
vendored
2
gradle/wrapper/gradle-wrapper.properties
vendored
@@ -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.3-bin.zip
|
distributionUrl=https\://services.gradle.org/distributions/gradle-7.1.1-bin.zip
|
||||||
zipStoreBase=GRADLE_USER_HOME
|
zipStoreBase=GRADLE_USER_HOME
|
||||||
zipStorePath=wrapper/dists
|
zipStorePath=wrapper/dists
|
||||||
|
|||||||
Reference in New Issue
Block a user