Skip to content

Commit d2868f6

Browse files
committed
test version update logic
1 parent 0c5372b commit d2868f6

File tree

6 files changed

+30
-9
lines changed

6 files changed

+30
-9
lines changed

build.gradle.kts

Lines changed: 18 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ plugins {
1616

1717
//val appVersionCode = 1
1818
val appVersion = (project.properties["tag"] as? String)?.substringAfter("v")
19-
?: "0.0.1"
19+
?: "0.1.0"
2020
logger.lifecycle("appVersion: $appVersion")
2121

2222
repositories {
@@ -38,7 +38,7 @@ kotlin {
3838
implementation(compose.materialIconsExtended)
3939
// implementation(compose.material3AdaptiveNavigationSuite)
4040

41-
implementation("org.jetbrains.compose.material3.adaptive:adaptive-layout-desktop:_")
41+
// implementation("org.jetbrains.compose.material3.adaptive:adaptive-layout-desktop:_")
4242
// implementation("androidx.compose.material3:material3-adaptive-navigation-suite-desktop:_") {
4343
//// exclude("", "")
4444
// }
@@ -47,6 +47,11 @@ kotlin {
4747
implementation(compose.components.resources)
4848
implementation(compose.components.uiToolingPreview)
4949
}
50+
commonMain {
51+
kotlin.srcDirs(
52+
layout.buildDirectory.dir("generated/main")
53+
)
54+
}
5055

5156
desktopMain.dependencies {
5257
implementation(compose.desktop.currentOs)
@@ -106,6 +111,17 @@ kotlin {
106111
}
107112
}
108113

114+
afterEvaluate {
115+
val constFile = layout.buildDirectory.file("generated/main/Constants.kt").get().asFile
116+
constFile.parentFile!!.mkdirs()
117+
constFile.writeText("""
118+
object Constants {
119+
val APP_VERSION: String = "$appVersion"
120+
val isRelease: Boolean = ${project.properties.contains("tag")}
121+
}
122+
""".trimIndent())
123+
}
124+
109125
stacktraceDecoroutinator {
110126
enabled = false
111127
addAndroidRuntimeDependency = false

gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.10-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
44
networkTimeout=10000
55
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME

src/desktopMain/kotlin/ui/App.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ fun App() {
8888

8989
Column(horizontalAlignment = Alignment.CenterHorizontally) {
9090

91-
UpdateCheckerUI(GitHubReleaseFetcher(owner = "nikkyai", repo = "nestctrl"))
91+
UpdateCheckerUI(GitHubReleaseFetcher(owner = "nikkyai", repo = "nest-ctrl"))
9292

9393
androidx.compose.material3.Text(
9494
"O.S. : " + getOperatingSystem().name.lowercase()

src/desktopMain/kotlin/ui/UpdateCheckerUI.kt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ import io.github.kdroidfilter.platformtools.permissionhandler.hasInstallPermissi
1111
import io.github.kdroidfilter.platformtools.permissionhandler.requestInstallPermission
1212
import io.github.kdroidfilter.platformtools.releasefetcher.downloader.Downloader
1313
import io.github.kdroidfilter.platformtools.releasefetcher.github.GitHubReleaseFetcher
14+
import io.github.oshai.kotlinlogging.KotlinLogging
1415
import kotlinx.coroutines.CoroutineScope
1516
import kotlinx.coroutines.Dispatchers
1617
import kotlinx.coroutines.launch
@@ -48,6 +49,8 @@ import kotlin.system.exitProcess
4849
// }
4950
//}
5051

52+
private val logger = KotlinLogging.logger {}
53+
5154
@Composable
5255
fun UpdateCheckerUI(fetcher: GitHubReleaseFetcher) {
5356

@@ -75,6 +78,7 @@ fun UpdateCheckerUI(fetcher: GitHubReleaseFetcher) {
7578

7679
CoroutineScope(Dispatchers.IO).launch {
7780
fetcher.checkForUpdate { version, notes ->
81+
// logger.info { "updateChecker: $version, $notes" }
7882
isChecking = false
7983
latestVersion = version
8084
changelog = notes

src/desktopMain/kotlin/ui/screens/QueueControlScreen.kt

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -339,7 +339,7 @@ fun QueueControlScreen() {
339339
horizontalArrangement = Arrangement.End
340340
) {
341341

342-
WithTooltipAtPointer(
342+
WithTooltipAbove(
343343
tooltip = {
344344
Text(queue.type.name)
345345
}
@@ -390,7 +390,8 @@ fun QueueControlScreen() {
390390
Text("${(beats / queue.beatMultiplier).roundToInt()} Beats")
391391
Text("(x${queue.beatMultiplier})")
392392
}
393-
WithTooltipAtPointer(
393+
394+
WithTooltipAbove(
394395
tooltip = { Text("slower") }
395396
) {
396397

@@ -404,11 +405,11 @@ fun QueueControlScreen() {
404405
}
405406
},
406407
) {
407-
408408
Icon(Icons.Outlined.KeyboardDoubleArrowDown, "slower")
409409
}
410410
}
411-
WithTooltipAtPointer(
411+
412+
WithTooltipAbove(
412413
tooltip = { Text("faster") }
413414
) {
414415
IconButton(

versions.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ version.io.github.pdvrieze.xmlutil..serialization=0.91.0
4949

5050
version.io.github.xn32..json5k=0.3.0
5151

52-
version.kotlinx.coroutines=1.10.1
52+
version.kotlinx.coroutines=1.10.2
5353

5454
version.kotlinx.datetime=0.6.2
5555

0 commit comments

Comments
 (0)