Skip to content

Commit 9cacf61

Browse files
dependabot[bot]YuKongA
dependabot[bot]
and
YuKongA
authored
build(deps): bump top.yukonga.miuix.kmp:miuix from 0.6.1 to 0.7.2 (#226)
* build(deps): bump top.yukonga.miuix.kmp:miuix from 0.6.1 to 0.7.2 Bumps [top.yukonga.miuix.kmp:miuix](https://github.com/compose-miuix-ui/miuix) from 0.6.1 to 0.7.2. - [Release notes](https://github.com/compose-miuix-ui/miuix/releases) - [Commits](compose-miuix-ui/miuix@v0.6.1...v0.7.2) --- updated-dependencies: - dependency-name: top.yukonga.miuix.kmp:miuix dependency-version: 0.7.2 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> * Fix build --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: YuKongA <70465933+YuKongA@users.noreply.github.com>
1 parent ff48b57 commit 9cacf61

14 files changed

Lines changed: 116 additions & 39 deletions

File tree

‎.run/desktop.run.xml‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
<component name="ProjectRunConfigurationManager">
2+
<configuration default="false" name="desktop" type="GradleRunConfiguration" factoryName="Gradle">
3+
<ExternalSystemSettings>
4+
<option name="executionName" />
5+
<option name="externalProjectPath" value="$PROJECT_DIR$/composeApp" />
6+
<option name="externalSystemIdString" value="GRADLE" />
7+
<option name="scriptParameters" value="-DmainClass=Main_desktopKt --quiet" />
8+
<option name="taskDescriptions">
9+
<list />
10+
</option>
11+
<option name="taskNames">
12+
<list>
13+
<option value="desktopRun" />
14+
</list>
15+
</option>
16+
<option name="vmOptions" />
17+
</ExternalSystemSettings>
18+
<ExternalSystemDebugServerProcess>false</ExternalSystemDebugServerProcess>
19+
<ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
20+
<DebugAllEnabled>false</DebugAllEnabled>
21+
<RunAsTest>false</RunAsTest>
22+
<method v="2" />
23+
</configuration>
24+
</component>

‎.run/js.run.xml‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
<component name="ProjectRunConfigurationManager">
2+
<configuration default="false" name="js" type="GradleRunConfiguration" factoryName="Gradle">
3+
<ExternalSystemSettings>
4+
<option name="executionName" />
5+
<option name="externalProjectPath" value="$PROJECT_DIR$/composeApp" />
6+
<option name="externalSystemIdString" value="GRADLE" />
7+
<option name="scriptParameters" value="" />
8+
<option name="taskDescriptions">
9+
<list />
10+
</option>
11+
<option name="taskNames">
12+
<list>
13+
<option value="jsBrowserDevelopmentRun" />
14+
</list>
15+
</option>
16+
<option name="vmOptions" />
17+
</ExternalSystemSettings>
18+
<ExternalSystemDebugServerProcess>true</ExternalSystemDebugServerProcess>
19+
<ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
20+
<DebugAllEnabled>false</DebugAllEnabled>
21+
<RunAsTest>false</RunAsTest>
22+
<method v="2" />
23+
</configuration>
24+
</component>

‎.run/macos.run.xml‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
<component name="ProjectRunConfigurationManager">
2+
<configuration default="false" name="macos" type="GradleRunConfiguration" factoryName="Gradle">
3+
<ExternalSystemSettings>
4+
<option name="executionName" />
5+
<option name="externalProjectPath" value="$PROJECT_DIR$/composeApp" />
6+
<option name="externalSystemIdString" value="GRADLE" />
7+
<option name="scriptParameters" value="" />
8+
<option name="taskDescriptions">
9+
<list />
10+
</option>
11+
<option name="taskNames">
12+
<list>
13+
<option value="runDebugExecutableMacosArm64" />
14+
</list>
15+
</option>
16+
<option name="vmOptions" />
17+
</ExternalSystemSettings>
18+
<ExternalSystemDebugServerProcess>true</ExternalSystemDebugServerProcess>
19+
<ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
20+
<DebugAllEnabled>false</DebugAllEnabled>
21+
<RunAsTest>false</RunAsTest>
22+
<method v="2" />
23+
</configuration>
24+
</component>

‎.run/wasmJs.run.xml‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
<component name="ProjectRunConfigurationManager">
2+
<configuration default="false" name="wasmJs" type="GradleRunConfiguration" factoryName="Gradle">
3+
<ExternalSystemSettings>
4+
<option name="executionName" />
5+
<option name="externalProjectPath" value="$PROJECT_DIR$/composeApp" />
6+
<option name="externalSystemIdString" value="GRADLE" />
7+
<option name="scriptParameters" value="" />
8+
<option name="taskDescriptions">
9+
<list />
10+
</option>
11+
<option name="taskNames">
12+
<list>
13+
<option value="wasmJsBrowserDevelopmentRun" />
14+
</list>
15+
</option>
16+
<option name="vmOptions" />
17+
</ExternalSystemSettings>
18+
<ExternalSystemDebugServerProcess>true</ExternalSystemDebugServerProcess>
19+
<ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
20+
<DebugAllEnabled>false</DebugAllEnabled>
21+
<RunAsTest>false</RunAsTest>
22+
<method v="2" />
23+
</configuration>
24+
</component>

‎composeApp/build.gradle.kts‎

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,6 @@ val verName = "1.6.1"
2727
val verCode = getVersionCode()
2828
val generatedSrcDir = layout.buildDirectory.dir("generated").get().asFile.resolve("updater")
2929

30-
java {
31-
toolchain.languageVersion = JavaLanguageVersion.of(21)
32-
}
33-
3430
kotlin {
3531
jvmToolchain(21)
3632

@@ -46,18 +42,16 @@ kotlin {
4642
binaries.framework {
4743
baseName = "shared"
4844
isStatic = true
49-
}
50-
compilerOptions {
51-
freeCompilerArgs.add("-Xbinary=preCodegenInlineThreshold=40")
45+
binaryOption("smallBinary", "true")
46+
binaryOption("preCodegenInlineThreshold", "40")
5247
}
5348
}
5449

5550
macosArm64 {
5651
binaries.executable {
5752
entryPoint = "main"
58-
}
59-
compilerOptions {
60-
freeCompilerArgs.add("-Xbinary=preCodegenInlineThreshold=40")
53+
binaryOption("smallBinary", "true")
54+
binaryOption("preCodegenInlineThreshold", "40")
6155
}
6256
}
6357

@@ -135,10 +129,15 @@ kotlin {
135129

136130
android {
137131
namespace = pkgName
132+
compileSdk = 36
133+
compileSdkMinor = 1
134+
buildToolsVersion = "36.1.0"
138135
defaultConfig {
139136
applicationId = pkgName
140137
versionCode = verCode
141138
versionName = verName
139+
targetSdk = 36
140+
minSdk = 26
142141
}
143142
val properties = Properties()
144143
runCatching { properties.load(project.rootProject.file("local.properties").inputStream()) }
@@ -155,7 +154,6 @@ android {
155154
keyPassword = pwd
156155
enableV2Signing = true
157156
enableV3Signing = true
158-
enableV4Signing = true
159157
}
160158
}
161159
}
@@ -325,7 +323,7 @@ tasks.withType<AbstractNativeMacApplicationPackageAppDirTask>().configureEach {
325323
val appDir = destinationDir.resolve("$packageName.app")
326324
val resourcesDir = appDir.resolve("Contents/Resources")
327325
val currentMacosTarget = kotlin.targets.withType<KotlinNativeTarget>()
328-
.find { it.konanTarget == KonanTarget.MACOS_ARM64 || it.konanTarget == KonanTarget.MACOS_X64 }?.targetName
326+
.find { it.konanTarget == KonanTarget.MACOS_ARM64 }?.targetName
329327
val composeResourcesDir = project.rootDir
330328
.resolve("composeApp/build/bin/$currentMacosTarget/releaseExecutable/compose-resources")
331329
if (composeResourcesDir.exists()) {

‎composeApp/src/commonMain/kotlin/App.kt‎

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@ import androidx.compose.ui.input.nestedscroll.nestedScroll
3737
import androidx.compose.ui.platform.LocalFocusManager
3838
import androidx.compose.ui.platform.LocalLayoutDirection
3939
import androidx.compose.ui.unit.dp
40-
import androidx.compose.ui.util.lerp
4140
import data.DataHelper
4241
import data.DeviceInfoHelper
4342
import dev.chrisbanes.haze.HazeState
@@ -139,16 +138,11 @@ fun App(
139138

140139
val scrollBehavior = MiuixScrollBehavior(rememberTopAppBarState())
141140
val focusManager = LocalFocusManager.current
142-
val hazeState = remember { HazeState() }
143141

142+
val hazeState = remember { HazeState() }
144143
val hazeStyle = HazeStyle(
145-
backgroundColor = MiuixTheme.colorScheme.background,
146-
tint = HazeTint(
147-
MiuixTheme.colorScheme.background.copy(
148-
if (scrollBehavior.state.collapsedFraction <= 0f) 1f
149-
else lerp(1f, 0.67f, (scrollBehavior.state.collapsedFraction))
150-
)
151-
)
144+
backgroundColor = MiuixTheme.colorScheme.surface,
145+
tint = HazeTint(MiuixTheme.colorScheme.surface.copy(0.8f))
152146
)
153147

154148
val showMenuPopup = remember { mutableStateOf(false) }

‎composeApp/src/commonMain/kotlin/ui/BasicViews.kt‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@ import top.yukonga.miuix.kmp.basic.TextField
3333
import top.yukonga.miuix.kmp.extra.SpinnerEntry
3434
import top.yukonga.miuix.kmp.extra.SuperDropdown
3535
import top.yukonga.miuix.kmp.extra.SuperSpinner
36-
import top.yukonga.miuix.kmp.theme.MiuixTheme
3736
import ui.components.AutoCompleteTextField
3837
import updater.composeapp.generated.resources.Res
3938
import updater.composeapp.generated.resources.android_version
@@ -169,7 +168,6 @@ fun BasicViews(
169168
onValueChange = { systemVersion.value = it },
170169
label = stringResource(Res.string.system_version),
171170
singleLine = true,
172-
backgroundColor = MiuixTheme.colorScheme.surface,
173171
keyboardOptions = KeyboardOptions(imeAction = ImeAction.Search),
174172
keyboardActions = KeyboardActions(onSearch = {
175173
focusManager.clearFocus()

‎composeApp/src/commonMain/kotlin/ui/components/AutoCompleteTextField.kt‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,6 @@ fun AutoCompleteTextField(
8585
},
8686
singleLine = true,
8787
label = label,
88-
backgroundColor = MiuixTheme.colorScheme.surface,
8988
keyboardOptions = KeyboardOptions(imeAction = ImeAction.Done),
9089
keyboardActions = KeyboardActions(onDone = {
9190
focusManager.clearFocus()

‎gradle.properties‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
org.gradle.jvmargs=-Xmx8g -Dfile.encoding=UTF-8
33
org.gradle.parallel=true
44
org.gradle.caching=true
5-
org.gradle.configureondemand=true
65
# Android
76
android.useAndroidX=true
87
android.nonTransitiveRClass=true

‎gradle/libs.versions.toml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[versions]
2-
android-gradle-plugin = "8.13.0"
3-
androidx-activity-compose = "1.11.0"
4-
compose-hotReload = "1.0.0-rc03"
2+
android-gradle-plugin = "8.13.2"
3+
androidx-activity-compose = "1.12.2"
4+
compose-hotReload = "1.0.0"
55
compose-plugin = "1.9.3"
66
cryptography = "0.5.0"
77
haze = "1.7.1"
@@ -11,7 +11,7 @@ kotlin = "2.2.21"
1111
kotlinx-serialization-json = "1.9.0"
1212
kotlinx-datetime = "0.7.1"
1313
ktor-client = "3.3.3"
14-
miuix = "0.6.1"
14+
miuix = "0.7.2"
1515

1616
[libraries]
1717
androidx-activity-compose = { module = "androidx.activity:activity-compose", version.ref = "androidx-activity-compose" }

0 commit comments

Comments
 (0)